diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d8a23fd..01c713fb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
-# v3.2.5-alpha1
+# v3.2.5-alpha2
+
+- Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run.
+- Added new import powers for custom import of spreadsheets.
+- Move the setDocument and _prepareDocument above the display in the site view and custom admin view.
+- Update the trashhelper layout to work in Joomla 5.
+- Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
+
+# v3.2.5-alpha
 
 - Add [AllowDynamicProperties] in the base view class for J5
 - Move the _prepareDocument  above the display call in the base view class
diff --git a/README.md b/README.md
index ade7717fa..df404a3b0 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th September, 2024
-+ *Version*: 3.2.5-alpha1
++ *Last Build*: 7th October, 2024
++ *Version*: 3.2.5-alpha2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **853809**
++ *Line count*: **857064**
 + *Field count*: **2098**
-+ *File count*: **5807**
++ *File count*: **5808**
 + *Folder count*: **505**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index ade7717fa..df404a3b0 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th September, 2024
-+ *Version*: 3.2.5-alpha1
++ *Last Build*: 7th October, 2024
++ *Version*: 3.2.5-alpha2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **853809**
++ *Line count*: **857064**
 + *Field count*: **2098**
-+ *File count*: **5807**
++ *File count*: **5808**
 + *Folder count*: **505**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/HtmlView_edit.php b/admin/compiler/joomla_3/HtmlView_edit.php
index eb12a0165..c273c8f67 100644
--- a/admin/compiler/joomla_3/HtmlView_edit.php
+++ b/admin/compiler/joomla_3/HtmlView_edit.php
@@ -113,6 +113,11 @@ class ###Component###View###View### extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_###component###/assets/css/###view###.css", ['version' => 'auto']);###AJAXTOKE######LINKEDVIEWTABLESCRIPTS###
diff --git a/admin/compiler/joomla_3/HtmlView_edit_site.php b/admin/compiler/joomla_3/HtmlView_edit_site.php
index 99c3b9875..d5d413634 100644
--- a/admin/compiler/joomla_3/HtmlView_edit_site.php
+++ b/admin/compiler/joomla_3/HtmlView_edit_site.php
@@ -114,6 +114,11 @@ class ###Component###View###View### extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		// only add the ISIS template css & js if needed (default is 1 = true)
diff --git a/admin/compiler/joomla_3/HtmlView_list.php b/admin/compiler/joomla_3/HtmlView_list.php
index e6371926c..83cc53e0d 100644
--- a/admin/compiler/joomla_3/HtmlView_list.php
+++ b/admin/compiler/joomla_3/HtmlView_list.php
@@ -151,6 +151,11 @@ class ###Component###View###Views### extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
index 94e6fd359..4ce16d9a2 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php
@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  *
  * @since  1.6
  */
-#[AllowDynamicProperties]
+#[\AllowDynamicProperties]
 class HtmlView extends BaseHtmlView
 {
 	/**
@@ -90,9 +90,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// Assign data to the view
 		$this->items = $this->get('Items');
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
index 7dd658664..4cafee33a 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  *
  * @since  1.6
  */
-#[AllowDynamicProperties]
+#[\AllowDynamicProperties]
 class HtmlView extends BaseHtmlView
 {
 	/**
@@ -114,9 +114,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_###component###');
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
index 6257cfd58..a557e3aff 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php
@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  *
  * @since  1.6
  */
-#[AllowDynamicProperties]
+#[\AllowDynamicProperties]
 class HtmlView extends BaseHtmlView
 {
 	/**
@@ -66,9 +66,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// get component params
 		$this->params = ComponentHelper::getParams('com_###component###');
diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
index 748ca2454..4d62671ec 100644
--- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php
@@ -25,7 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  *
  * @since  1.6
  */
-#[AllowDynamicProperties]
+#[\AllowDynamicProperties]
 class HtmlView extends BaseHtmlView
 {
 	/**
@@ -34,9 +34,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// get component params
 		$this->params = ComponentHelper::getParams('com_###component###');
diff --git a/admin/compiler/joomla_4/DASH_VIEW_HTML.php b/admin/compiler/joomla_4/DASH_VIEW_HTML.php
index e25b5dc4f..ec7c59f52 100644
--- a/admin/compiler/joomla_4/DASH_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/DASH_VIEW_HTML.php
@@ -25,14 +25,17 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  *
  * @since  1.6
  */
-#[AllowDynamicProperties]
+#[\AllowDynamicProperties]
 class HtmlView extends BaseHtmlView
 {
 	/**
 	 * View display method
+	 *
 	 * @return void
+	 * @throws \Exception
+	 * @since   1.6
 	 */
-	function display($tpl = null)
+	function display($tpl = null): void
 	{
 		// Assign data to the view
 		$this->icons          = $this->get('Icons');
diff --git a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
index 2776f8bc2..07113d005 100644
--- a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php
@@ -81,9 +81,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// get combined params of both component and menu
 		$this->app ??= Factory::getApplication();
diff --git a/admin/compiler/joomla_4/SITE_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
index 88b335bfd..fc104516c 100644
--- a/admin/compiler/joomla_4/SITE_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_VIEW_HTML.php
@@ -65,9 +65,10 @@ class HtmlView extends BaseHtmlView
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
 	 * @return  void
+	 * @throws \Exception
 	 * @since  1.6
 	 */
-	public function display($tpl = null)
+	public function display($tpl = null): void
 	{
 		// get combined params of both component and menu
 		$this->app ??= Factory::getApplication();
diff --git a/admin/config.xml b/admin/config.xml
index c65bebaa7..9a371501d 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -57,7 +57,7 @@
 			buttons="add,remove,move"
 			description="COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_DESCRIPTION"
 			icon="list"
-			max="9"
+			max="10"
 			min="1">
 			<form hidden="true" name="list_subform_layouts_modal" repeat="true">
 				<!-- View_field Field. Type: List. (joomla) -->
@@ -73,6 +73,8 @@
 					<!-- Option Set. -->
 					<option value="default">
 						COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+					<option value="admin_view.ajax_input">
+						COM_COMPONENTBUILDER_CONFIG_ADMIN_VIEWS_AJAX_INPUT</option>
 					<option value="admin_custom_tabs.tabs">
 						COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS</option>
 					<option value="admin_fields.addfields">
@@ -93,6 +95,8 @@
 						COM_COMPONENTBUILDER_CONFIG_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS</option>
 					<option value="component_site_views.addsite_views">
 						COM_COMPONENTBUILDER_CONFIG_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS</option>
+					<option value="custom_admin_view.ajax_input">
+						COM_COMPONENTBUILDER_CONFIG_CUSTOM_ADMIN_VIEWS_AJAX_INPUT</option>
 					<option value="dynamic_get.join_db_table">
 						COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_DB_TABLE</option>
 					<option value="dynamic_get.join_view_table">
@@ -103,6 +107,8 @@
 						COM_COMPONENTBUILDER_CONFIG_JOOMLA_MODULE_UPDATES_VERSION_UPDATE</option>
 					<option value="joomla_plugin_updates.version_update">
 						COM_COMPONENTBUILDER_CONFIG_JOOMLA_PLUGIN_UPDATES_VERSION_UPDATE</option>
+					<option value="site_view.ajax_input">
+						COM_COMPONENTBUILDER_CONFIG_SITE_VIEWS_AJAX_INPUT</option>
 				</field>
 				<!-- Layout Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php
index 8bf46a20c..9906f9770 100644
--- a/admin/controllers/snippets.php
+++ b/admin/controllers/snippets.php
@@ -136,7 +136,7 @@ class ComponentbuilderControllerSnippets extends AdminController
 			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// check if there is any selections
 			if (!UtilitiesArrayHelper::check($pks))
 			{
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 0b932f3a5..c8b1f3530 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3298,6 +3298,7 @@ COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS="Admin Custom Tabs (tabs)"
 COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_ADDFIELDS="Admin Fields (addfields)"
 COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS="Admin Fields Conditions (addconditions)"
 COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_RELATIONS_ADDRELATIONS="Admin Fields Relations (addrelations)"
+COM_COMPONENTBUILDER_CONFIG_ADMIN_VIEWS_AJAX_INPUT="Admin Views (ajax_input)"
 COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
 COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
 COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT="Alphanumeric+dot"
@@ -3364,6 +3365,7 @@ COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION="Select your backu
 COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL="Cronjob Backup Server"
 COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION="Select how you would like to backup JCB"
 COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL="Cronjob Backup type"
+COM_COMPONENTBUILDER_CONFIG_CUSTOM_ADMIN_VIEWS_AJAX_INPUT="Custom Admin Views (ajax_input)"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION="Here you can set the path to the custom folder"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT="/home/user/custom"
 COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
@@ -3565,6 +3567,7 @@ COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_LABEL="Browser Storage"
 COM_COMPONENTBUILDER_CONFIG_SHOW="Show"
 COM_COMPONENTBUILDER_CONFIG_SHOW_ALL="Show All"
 COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS="SimpleXMLElement Class"
+COM_COMPONENTBUILDER_CONFIG_SITE_VIEWS_AJAX_INPUT="Site Views (ajax_input)"
 COM_COMPONENTBUILDER_CONFIG_SMTP="SMTP"
 COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_DESCRIPTION="Select yes if your SMTP host requires SMTP Authentication."
 COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_LABEL="SMTP Authentication"
@@ -7610,7 +7613,6 @@ COM_COMPONENTBUILDER_ONLY_ONE_COMPONENT_CAN_BE_CLONED_AT_A_TIME_PLEASE_SELECT_ON
 COM_COMPONENTBUILDER_ONLY_SZIP_FILE_WAS_REMOVED_THE_FROM_TMP_FOLDER_DURING_INSTALLATION="Only (%s.zip) file was removed the from tmp folder during installation!"
 COM_COMPONENTBUILDER_ONLY_USE_THE_BNONE_DBB_OPTION_IF_YOU_ARE_PLANNING_ON_TARGETING_THIS_FIELD_WITH_JAVASCRIPTCUSTOM_PHP_TO_MOVE_ITS_VALUE_INTO_ANOTHER_FIELD_THAT_DOES_GET_SAVED_TO_THE_DATABASE="Only use the <b>None DB</b> option if you are planning on targeting this field with JavaScript/Custom PHP to move its value into another field that does get saved to the database."
 COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS="Open Library Snippets"
-COM_COMPONENTBUILDER_OPTIONS="Options"
 COM_COMPONENTBUILDER_ORDER_BEFORE="Order Before"
 COM_COMPONENTBUILDER_ORDER_IN_EDIT="Order in Edit"
 COM_COMPONENTBUILDER_ORDER_IN_LIST_VIEWS="Order in list views"
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 17661752e..5003d9b16 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -799,6 +799,9 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 			}
 		}
 
+		// update the ajax_input (sub form) layout
+		$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('admin_view', 'ajax_input'));
+
 		// update all editors to use this components global editor
 		$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		// now get all the editor fields
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index 866871a40..2ef739b4f 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -21,6 +21,10 @@ use Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Helper\Compiler;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\JsonHelper;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Installer\InstallerHelper;
+use Joomla\CMS\Installer\Installer;
 
 /**
  * Componentbuilder List Model for Compiler
@@ -162,7 +166,7 @@ class ComponentbuilderModelCompiler extends ListModel
 		jimport('joomla.filesystem.folder');
 		jimport('joomla.filesystem.file');
 		
-		if (JFolder::exists($dir))
+		if (is_dir($dir))
 		{
 			$it = new RecursiveDirectoryIterator($dir);
 			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
@@ -171,19 +175,19 @@ class ComponentbuilderModelCompiler extends ListModel
 				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
 				if ($file->isDir())
 				{
-					JFolder::delete($file->getPathname());	
+					Folder::delete($file->getPathname());	
 				}
 				else
 				{
 					if ($file->getBasename() !== 'index.html')
 					{
-						JFile::delete($file->getPathname());
+						File::delete($file->getPathname());
 					}
 				}
 			}
 			if ($removeDir)
 			{
-				if (JFolder::delete($dir))
+				if (Folder::delete($dir))
 				{
 					return true;
 				}
@@ -228,7 +232,7 @@ class ComponentbuilderModelCompiler extends ListModel
 		$tmp_dest = $config->get('tmp_path');
 
 		// Unpack the downloaded package file.
-		$package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
+		$package = InstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
 
 		// insure the install type is folder (JCB zip file is in the folder)
 		$installType = 'folder';
@@ -253,7 +257,7 @@ class ComponentbuilderModelCompiler extends ListModel
 		}
 
 		// Get an installer instance.
-		$installer = JInstaller::getInstance();
+		$installer = Installer::getInstance();
 
 		// Install the package.
 		if (!$installer->install($package['dir']))
@@ -290,7 +294,7 @@ class ComponentbuilderModelCompiler extends ListModel
 			$package['packagefile'] = $config->get('tmp_path') . '/' . $package['packagefile'];
 		}
 
-		JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+		InstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
 
 		// Clear the cached extension data and menu cache
 		$this->cleanCache('_system', 0);
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index d87c94af6..026ec2d2c 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -503,6 +503,9 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 			}
 		}
 
+		// update the ajax_input (sub form) layout
+		$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('custom_admin_view', 'ajax_input'));
+
 		// update all editors to use this components global editor
 		$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		// now get all the editor fields
diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php
index f499158b8..09eab5c70 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -15,6 +15,7 @@ defined('_JEXEC') or die('Restricted access');
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Filesystem\Folder;
 
 // import the list field type
 jimport('joomla.form.helper');
@@ -44,12 +45,12 @@ class JFormFieldCustomfilelist extends JFormFieldList
 		// set the default
 		$options[] = Html::_('select.option', '', Text::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FILES_TO_S',$localfolder));
 		// setup the folder if it does not exist
-		if (!\JFolder::exists($localfolder))
+		if (!is_dir($localfolder))
 		{
-			\JFolder::create($localfolder);
+			Folder::create($localfolder);
 		}
 		// now check if there are files in the folder
-		if ($files = \JFolder::files($localfolder))
+		if ($files = Folder::files($localfolder))
 		{
 			$options = array();
 			foreach ($files as $file)
diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php
index b899a7f60..36c21e9e2 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -201,7 +201,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 							// set auto loader
 							ComponentbuilderHelper::autoLoader('smart');
 							// get install folder
-							$dir = JFile::stripExt($package['dir']);
+							$dir = File::stripExt($package['dir']);
 							// remove unziped folder
 							ComponentbuilderHelper::removeFolder($dir);
 						}
@@ -307,7 +307,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 			// set auto loader
 			ComponentbuilderHelper::autoLoader('smart');
 			// extract the package
-			if (JFile::exists($package['dir']))
+			if (is_file($package['dir']))
 			{
 				// does this package pass a checksum
 				$checksum = false;
@@ -355,12 +355,12 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				// get the zip adapter
 				$zip = JArchive::getAdapter('zip');
 				// set the directory name
-				$this->dir = JFile::stripExt($package['dir']);
+				$this->dir = File::stripExt($package['dir']);
 				// unzip the package
 				$zip->extract($package['dir'], $this->dir);
 				// check for database file
 				$infoFile = $this->dir . '/info.vdm';
-				if (JFile::exists($infoFile))
+				if (is_file($infoFile))
 				{
 					// load the data
 					if ($info = FileHelper::getContent($infoFile))
@@ -631,13 +631,13 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				// set auto loader
 				ComponentbuilderHelper::autoLoader('smart');
 				// extract the package
-				if (JFile::exists($package['dir']))
+				if (is_file($package['dir']))
 				{
 					// set the directory name
-					$this->dir = JFile::stripExt($package['dir']);
+					$this->dir = File::stripExt($package['dir']);
 					// check for database file
 					$dbFile = $this->dir . '/db.vdm';
-					if (!JFile::exists($dbFile))
+					if (!is_file($dbFile))
 					{
 						// get the zip adapter
 						$zip = JArchive::getAdapter('zip');
@@ -645,7 +645,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 						$zip->extract($package['dir'], $this->dir);
 					}
 					// check again
-					if (JFile::exists($dbFile))
+					if (is_file($dbFile))
 					{
 						// load the data
 						if ($data = FileHelper::getContent($dbFile))
@@ -938,10 +938,10 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 		$success = true;
 		// check if we have custom files
 		$customDir = str_replace('//', '/', $this->dir . '/custom');
-		if (JFolder::exists($customDir))
+		if (is_dir($customDir))
 		{
 			// great we have some custom stuff lets move it
-			if (!JFolder::copy($customDir, $customPath,'',true))
+			if (!Folder::copy($customDir, $customPath,'',true))
 			{
 				$this->app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVED_TO_CORRECT_LOCATION'), 'error');
 				$success = false;
@@ -954,10 +954,10 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 		}
 		// check if we have images
 		$imageDir = str_replace('//', '/', $this->dir . '/images');
-		if (JFolder::exists($imageDir))
+		if (is_dir($imageDir))
 		{
 			// great we have some images lets move them
-			if (!JFolder::copy($imageDir, $imagesPath,'',true))
+			if (!Folder::copy($imageDir, $imagesPath,'',true))
 			{
 				$this->app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVED_TO_CORRECT_LOCATION'), 'error');
 				$success = false;
@@ -970,10 +970,10 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 		}
 		// now move the dynamic files if found
 		$dynamicDir = str_replace('//', '/', $this->dir . '/dynamic');
-		if (JFolder::exists($dynamicDir))
+		if (is_dir($dynamicDir))
 		{
 			// get a list of folders
-			$folders = JFolder::folders($dynamicDir);
+			$folders = Folder::folders($dynamicDir);
 			// check if we have files
 			if(UtilitiesArrayHelper::check($folders))
 			{
@@ -981,7 +981,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				{
 					$destination = $this->setDynamicPath($folder);
 					$fullPath = str_replace('//', '/', $dynamicDir . '/' . $folder);
-					if (!JFolder::exists($fullPath) || !JFolder::copy($fullPath, $destination,'',true))
+					if (!is_dir($fullPath) || !Folder::copy($fullPath, $destination,'',true))
 					{
 						$this->app->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVED_TO_BSB', $folder, $destination), 'error');
 						$success = false;
@@ -994,7 +994,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				}
 			}
 			// get a list of files
-			$files = JFolder::files($dynamicDir);
+			$files = Folder::files($dynamicDir);
 			// check if we have files
 			if(UtilitiesArrayHelper::check($files))
 			{
@@ -1002,7 +1002,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				{
 					$destination = $this->setDynamicPath($file);
 					$fullPath = str_replace('//', '/', $dynamicDir . '/' . $file);
-					if (!JFile::exists($fullPath) || !JFile::copy($fullPath, $destination))
+					if (!is_file($fullPath) || !File::copy($fullPath, $destination))
 					{
 						$this->app->enqueueMessage(Text::sprintf('COM_COMPONENTBUILDER_FILE_BSB_WAS_NOT_MOVED_TO_BSB', $file, $destination), 'error');
 						$success = false;
@@ -1037,7 +1037,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 			{
 				$subPath = str_replace('//', '/', $this->dir . '/' . $folder);
 				// go to the package sub folder if found
-				if (JFolder::exists($subPath))
+				if (is_dir($subPath))
 				{
 					$this->unLockFile($subPath);
 				}
@@ -1057,7 +1057,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 		// we are changing the working directory to the tmp path (important)
 		chdir($tmpPath);
 		// get a list of files in the current directory tree (all)
-		$files = JFolder::files('.', '.', true, true);
+		$files = Folder::files('.', '.', true, true);
 		// read in the file content
 		foreach ($files as $file)
 		{
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index c38433fb9..8a8fd3e47 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -28,6 +28,8 @@ use VDM\Joomla\Utilities\Base64Helper;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\FOF\Encrypt\AES;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Filesystem\File;
 
 /**
  * Joomla_components List Model
@@ -205,7 +207,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 			}
 
 			// create the folders
-			JFolder::create($this->packagePath);
+			Folder::create($this->packagePath);
 
 			// update $pks with returned IDs
 			$pks = array();
@@ -1347,10 +1349,10 @@ class ComponentbuilderModelJoomla_components extends ListModel
 			$this->lockFiles();
 
 			// remove old zip files with the same name
-			if (JFile::exists($this->zipPath))
+			if (is_file($this->zipPath))
 			{
 				// remove file if found
-				JFile::delete($this->zipPath);
+				File::delete($this->zipPath);
 			}
 
 			// zip the folder
@@ -1372,7 +1374,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 				}
 
 				// remove the local file
-				JFile::delete($this->zipPath);
+				File::delete($this->zipPath);
 			}
 
 			// remove the folder
@@ -1431,7 +1433,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 		chdir($tmpPath);
 
 		// get a list of files in the current directory tree (all)
-		$files = JFolder::files('.', '.', true, true);
+		$files = Folder::files('.', '.', true, true);
 
 		// read in the file content
 		foreach ($files as $file)
@@ -1486,7 +1488,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 		if (!FileHelper::exists($tmpPath))
 		{
 			// create the folders if not found
-			JFolder::create($tmpPath);
+			Folder::create($tmpPath);
 		}
 
 		// now move it
@@ -1510,10 +1512,10 @@ class ComponentbuilderModelJoomla_components extends ListModel
 						$customFilePath = str_replace('//', '/', $this->customPath.'/'.$item);
 					}
 					// now check if file exist
-					if (!JFile::exists($tmpFilePath) && JFile::exists($customFilePath))
+					if (!is_file($tmpFilePath) && is_file($customFilePath))
 					{
 						// move the file to its place
-						JFile::copy($customFilePath, $tmpFilePath);
+						File::copy($customFilePath, $tmpFilePath);
 					}
 				}
 
@@ -1528,14 +1530,14 @@ class ComponentbuilderModelJoomla_components extends ListModel
 					if (!FileHelper::exists($imageFolderPath))
 					{
 						// create the folders if not found
-						JFolder::create($imageFolderPath);
+						Folder::create($imageFolderPath);
 					}
 					$tmpImagePath = str_replace('//', '/', $this->packagePath.'/'.$item);
 					$customImagePath = str_replace('//', '/', JPATH_ROOT.'/'.$item);
-					if (!JFile::exists($tmpImagePath) && JFile::exists($customImagePath))
+					if (!is_file($tmpImagePath) && is_file($customImagePath))
 					{
 						// move the file to its place
-						JFile::copy($customImagePath, $tmpImagePath);
+						File::copy($customImagePath, $tmpImagePath);
 					}
 				}
 
@@ -1557,7 +1559,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 					if (!FileHelper::exists($tmpFolderPath) && FileHelper::exists($customFolderPath))
 					{
 						// move the folder to its place
-						JFolder::copy($customFolderPath, $tmpFolderPath,'',true);
+						Folder::copy($customFolderPath, $tmpFolderPath,'',true);
 					}
 				}
 			}
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index e5a340150..d44b22a9d 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -524,6 +524,9 @@ class ComponentbuilderModelSite_view extends AdminModel
 			}
 		}
 
+		// update the ajax_input (sub form) layout
+		$form->setFieldAttribute('ajax_input', 'layout', ComponentbuilderHelper::getSubformLayout('site_view', 'ajax_input'));
+
 		// update all editors to use this components global editor
 		$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		// now get all the editor fields
diff --git a/admin/models/snippets.php b/admin/models/snippets.php
index 1030c0c34..02d7f7464 100644
--- a/admin/models/snippets.php
+++ b/admin/models/snippets.php
@@ -22,6 +22,8 @@ use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Filesystem\File;
 
 /**
  * Snippets List Model
@@ -112,20 +114,20 @@ class ComponentbuilderModelSnippets extends ListModel
 					// get the shared paths
 					$this->fullPath = rtrim(ComponentbuilderHelper::getFolderPath('path', 'sharepath', Factory::getConfig()->get('tmp_path')), '/') . '/snippets';
 					// remove old folder with the same name
-					if (JFolder::exists($this->fullPath))
+					if (is_dir($this->fullPath))
 					{
 						// remove if old folder is found
 						ComponentbuilderHelper::removeFolder($this->fullPath);
 					}
 					// create the full path
-					JFolder::create($this->fullPath);
+					Folder::create($this->fullPath);
 					// set zip path
 					$this->zipPath = $this->fullPath .'.zip';
 					// remove old zip files with the same name
-					if (JFile::exists($this->zipPath))
+					if (is_file($this->zipPath))
 					{
 						// remove file if found
-						JFile::delete($this->zipPath);
+						File::delete($this->zipPath);
 					}
 					// prep the item
 					foreach($items as $item)
diff --git a/admin/sql/updates/mysql/3.2.5-alpha.sql b/admin/sql/updates/mysql/3.2.5-alpha.sql
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/admin/sql/updates/mysql/3.2.5-alpha.sql
@@ -0,0 +1 @@
+
diff --git a/admin/views/admin_custom_tabs/view.html.php b/admin/views/admin_custom_tabs/view.html.php
index a154c9097..03e72d8dc 100644
--- a/admin/views/admin_custom_tabs/view.html.php
+++ b/admin/views/admin_custom_tabs/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_custom_tabs extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/admin_custom_tabs.css", ['version' => 'auto']);
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php
index 1d4df2c4c..8eb7cc3ea 100644
--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_fields extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/admin_fields.css", ['version' => 'auto']);
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php
index aa8c8baae..fad115a66 100644
--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_fields_conditions extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css", ['version' => 'auto']);
diff --git a/admin/views/admin_fields_relations/view.html.php b/admin/views/admin_fields_relations/view.html.php
index 9bd8dbf0f..b614d21be 100644
--- a/admin/views/admin_fields_relations/view.html.php
+++ b/admin/views/admin_fields_relations/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_fields_relations extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/admin_fields_relations.css", ['version' => 'auto']);
@@ -209,9 +214,9 @@ class ComponentbuilderViewAdmin_fields_relations extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit.min.js', ['version' => 'auto']);
 
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php
index 4a40a61d4..2dde58566 100644
--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_view extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/admin_view.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewAdmin_view extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index 6494dc138..2b042ac70 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -301,6 +301,11 @@ class ComponentbuilderViewAdmin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/admins_custom_tabs/view.html.php b/admin/views/admins_custom_tabs/view.html.php
index 81fad938b..9380107ae 100644
--- a/admin/views/admins_custom_tabs/view.html.php
+++ b/admin/views/admins_custom_tabs/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewAdmins_custom_tabs extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php
index a82ddace4..a7908aeaa 100644
--- a/admin/views/admins_fields/view.html.php
+++ b/admin/views/admins_fields/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewAdmins_fields extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php
index 0a52672e2..f5a227f1c 100644
--- a/admin/views/admins_fields_conditions/view.html.php
+++ b/admin/views/admins_fields_conditions/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewAdmins_fields_conditions extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php
index 6ec1827f8..e6e473614 100644
--- a/admin/views/admins_fields_relations/view.html.php
+++ b/admin/views/admins_fields_relations/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewAdmins_fields_relations extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/class_extendings/view.html.php b/admin/views/class_extendings/view.html.php
index 2484854d8..d0d4b41f0 100644
--- a/admin/views/class_extendings/view.html.php
+++ b/admin/views/class_extendings/view.html.php
@@ -211,6 +211,11 @@ class ComponentbuilderViewClass_extendings extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/class_extends/view.html.php b/admin/views/class_extends/view.html.php
index 88f5c637b..fc6bbfb79 100644
--- a/admin/views/class_extends/view.html.php
+++ b/admin/views/class_extends/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewClass_extends extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_EXTENDS_NEW' : 'COM_COMPONENTBUILDER_CLASS_EXTENDS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/class_extends.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewClass_extends extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/class_method/view.html.php b/admin/views/class_method/view.html.php
index 3717c2714..5da3c7e96 100644
--- a/admin/views/class_method/view.html.php
+++ b/admin/views/class_method/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewClass_method extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_METHOD_NEW' : 'COM_COMPONENTBUILDER_CLASS_METHOD_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/class_method.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewClass_method extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/class_methods/view.html.php b/admin/views/class_methods/view.html.php
index 19661341b..b8ea713a3 100644
--- a/admin/views/class_methods/view.html.php
+++ b/admin/views/class_methods/view.html.php
@@ -241,6 +241,11 @@ class ComponentbuilderViewClass_methods extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/class_properties/view.html.php b/admin/views/class_properties/view.html.php
index f7ad3cbee..7ff058397 100644
--- a/admin/views/class_properties/view.html.php
+++ b/admin/views/class_properties/view.html.php
@@ -241,6 +241,11 @@ class ComponentbuilderViewClass_properties extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/class_property/view.html.php b/admin/views/class_property/view.html.php
index 5eaac3d72..225467922 100644
--- a/admin/views/class_property/view.html.php
+++ b/admin/views/class_property/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewClass_property extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_CLASS_PROPERTY_NEW' : 'COM_COMPONENTBUILDER_CLASS_PROPERTY_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/class_property.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewClass_property extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php
index 9eb78072c..f12614c2a 100644
--- a/admin/views/component_admin_views/view.html.php
+++ b/admin/views/component_admin_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_admin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_admin_views.css", ['version' => 'auto']);
diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php
index 76a7bc984..089a3766d 100644
--- a/admin/views/component_config/view.html.php
+++ b/admin/views/component_config/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_config extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_config.css", ['version' => 'auto']);
diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php
index 8f90c499d..6dbcccb9f 100644
--- a/admin/views/component_custom_admin_menus/view.html.php
+++ b/admin/views/component_custom_admin_menus/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_custom_admin_menus extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_custom_admin_menus.css", ['version' => 'auto']);
diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php
index 1415e7ab4..2dcf49f7d 100644
--- a/admin/views/component_custom_admin_views/view.html.php
+++ b/admin/views/component_custom_admin_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_custom_admin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_custom_admin_views.css", ['version' => 'auto']);
diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php
index ed46cc9d5..2e1c20705 100644
--- a/admin/views/component_dashboard/view.html.php
+++ b/admin/views/component_dashboard/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_dashboard extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_dashboard.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewComponent_dashboard extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php
index 2583b1d8f..e9eeb6676 100644
--- a/admin/views/component_files_folders/view.html.php
+++ b/admin/views/component_files_folders/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_files_folders extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_files_folders.css", ['version' => 'auto']);
diff --git a/admin/views/component_modules/view.html.php b/admin/views/component_modules/view.html.php
index bbbc45dc5..df27c328c 100644
--- a/admin/views/component_modules/view.html.php
+++ b/admin/views/component_modules/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_modules extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MODULES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MODULES_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_modules.css", ['version' => 'auto']);
diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php
index c35d1a4e4..d3206e528 100644
--- a/admin/views/component_mysql_tweaks/view.html.php
+++ b/admin/views/component_mysql_tweaks/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_mysql_tweaks extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_mysql_tweaks.css", ['version' => 'auto']);
diff --git a/admin/views/component_placeholders/view.html.php b/admin/views/component_placeholders/view.html.php
index e22b78199..90e5e490e 100644
--- a/admin/views/component_placeholders/view.html.php
+++ b/admin/views/component_placeholders/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_placeholders extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_placeholders.css", ['version' => 'auto']);
diff --git a/admin/views/component_plugins/view.html.php b/admin/views/component_plugins/view.html.php
index 653cb3241..0119e9551 100644
--- a/admin/views/component_plugins/view.html.php
+++ b/admin/views/component_plugins/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_plugins extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_plugins.css", ['version' => 'auto']);
diff --git a/admin/views/component_router/view.html.php b/admin/views/component_router/view.html.php
index a76662356..82ea95d7b 100644
--- a/admin/views/component_router/view.html.php
+++ b/admin/views/component_router/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_router extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ROUTER_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ROUTER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_router.css", ['version' => 'auto']);
diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php
index 765dbe150..4a98a2c51 100644
--- a/admin/views/component_site_views/view.html.php
+++ b/admin/views/component_site_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_site_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_site_views.css", ['version' => 'auto']);
diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php
index 4e5eb6b9a..734027329 100644
--- a/admin/views/component_updates/view.html.php
+++ b/admin/views/component_updates/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewComponent_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/component_updates.css", ['version' => 'auto']);
diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php
index b939f1bc3..a05e1d7f0 100644
--- a/admin/views/components_admin_views/view.html.php
+++ b/admin/views/components_admin_views/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_admin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php
index dd7ffbfe0..ade5385eb 100644
--- a/admin/views/components_config/view.html.php
+++ b/admin/views/components_config/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_config extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php
index 2132d7725..0694e9217 100644
--- a/admin/views/components_custom_admin_menus/view.html.php
+++ b/admin/views/components_custom_admin_menus/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_custom_admin_menus extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php
index bdc014aa5..355957b3e 100644
--- a/admin/views/components_custom_admin_views/view.html.php
+++ b/admin/views/components_custom_admin_views/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_custom_admin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php
index 205833e44..b3c87133a 100644
--- a/admin/views/components_dashboard/view.html.php
+++ b/admin/views/components_dashboard/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_dashboard extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php
index 5278fa84c..5aa71e4dc 100644
--- a/admin/views/components_files_folders/view.html.php
+++ b/admin/views/components_files_folders/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_files_folders extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_modules/view.html.php b/admin/views/components_modules/view.html.php
index c99139c22..72f2c7c5a 100644
--- a/admin/views/components_modules/view.html.php
+++ b/admin/views/components_modules/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_modules extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php
index 841924736..c0fe5140e 100644
--- a/admin/views/components_mysql_tweaks/view.html.php
+++ b/admin/views/components_mysql_tweaks/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_mysql_tweaks extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_placeholders/view.html.php b/admin/views/components_placeholders/view.html.php
index 59a713b28..7a6685cc5 100644
--- a/admin/views/components_placeholders/view.html.php
+++ b/admin/views/components_placeholders/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_placeholders extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_plugins/view.html.php b/admin/views/components_plugins/view.html.php
index 844325e0c..eaaffe586 100644
--- a/admin/views/components_plugins/view.html.php
+++ b/admin/views/components_plugins/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_plugins extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_routers/view.html.php b/admin/views/components_routers/view.html.php
index 61e1ccd6f..d756e204d 100644
--- a/admin/views/components_routers/view.html.php
+++ b/admin/views/components_routers/view.html.php
@@ -251,6 +251,11 @@ class ComponentbuilderViewComponents_routers extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php
index a85ece515..f439b9fc4 100644
--- a/admin/views/components_site_views/view.html.php
+++ b/admin/views/components_site_views/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_site_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php
index 899084fcf..17ec704a8 100644
--- a/admin/views/components_updates/view.html.php
+++ b/admin/views/components_updates/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewComponents_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index 5674b1fac..998a82299 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -315,40 +315,27 @@ jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 
 
 
-jQuery(function() {
-	jQuery('#open-libraries').html('<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo JText::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>');
-});
+document.addEventListener("DOMContentLoaded", function() {
+    document.querySelector('#open-libraries').innerHTML = '<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>';
+});
+
 jQuery('#jform_snippet').closest('.input-append').addClass('jform_snippet_input_width');
 jQuery('#jform_main_get').closest('.input-append').addClass('jform_main_get_input_width');
 jQuery('#jform_dynamic_get').closest('.input-append').addClass('jform_dynamic_get_input_width');
 jQuery(function() {
-    jQuery("code").click(function() {
-        jQuery(this).selText().addClass("selected");
-    });
+	// make sure the code bocks are active
+	document.querySelectorAll("code").forEach(function(codeBlock) {
+		codeBlock.addEventListener("click", function() {
+			codeBlock.selText(); // Call the custom selText function
+			codeBlock.classList.add("selected"); // Add the "selected" class
+		});
+	});
 });
+
 jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	e.preventDefault();
 	getSnippets();
 });
-
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
-    return this;
-}
 
 jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
 	e.preventDefault();
@@ -384,6 +371,22 @@ jQuery(document).ready(function() {
 // some lang strings
 var select_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
+
+
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
 
 document.addEventListener("DOMContentLoaded", function() {
 	document.querySelectorAll(".loading-dots").forEach(function(loading_dots) {
diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php
index 5be6aa06a..45c6a24bc 100644
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewCustom_admin_view extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewCustom_admin_view extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 314a5dfb1..2a0eb5622 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -266,6 +266,11 @@ class ComponentbuilderViewCustom_admin_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php
index 6bed28de9..f20ffaeb1 100644
--- a/admin/views/custom_code/view.html.php
+++ b/admin/views/custom_code/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewCustom_code extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/custom_code.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewCustom_code extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_FUNCTION_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_FUNCTION_NAME');
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index e017d565c..58bf46613 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -286,6 +286,11 @@ class ComponentbuilderViewCustom_codes extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php
index 0b56e0b28..bfab34907 100644
--- a/admin/views/dynamic_get/view.html.php
+++ b/admin/views/dynamic_get/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewDynamic_get extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/dynamic_get.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewDynamic_get extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index aca5c1fbc..2af38847a 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -241,6 +241,11 @@ class ComponentbuilderViewDynamic_gets extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index f1b62ad39..945ad52ca 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -286,32 +286,16 @@ jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function
 jQuery(function() {
 	setTimeout(
 		function() {
-			// load the on click event
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
+			// make sure the code bocks are active
+			document.querySelectorAll("code").forEach(function(codeBlock) {
+				codeBlock.addEventListener("click", function() {
+					codeBlock.selText();
+					codeBlock.classList.add("selected");
+				});
 			});
 		}, 2000);
 });
 
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
-    return this;
-}
-
 jQuery('#adminForm').on('change', '#jform_fieldtype',function (e) {
 	e.preventDefault();
 	// get type value
@@ -324,6 +308,21 @@ jQuery('#adminForm').on('change', '#jform_fieldtype',function (e) {
 });
 
 
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
+
 <?php
 	$app = Factory::getApplication();
 ?>
diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php
index 7db2c844a..a56ed3695 100644
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewField extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/field.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewField extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// add the libs for subform (since not adding it via xml but ajax)
  		Html::_('jquery.ui', array('core', 'sortable'));
  		Html::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index f78dfde46..4e662e427 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -311,6 +311,11 @@ class ComponentbuilderViewFields extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index a5031d708..59c3f1d2c 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -208,6 +208,11 @@ class ComponentbuilderViewFieldtype extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_FIELDTYPE_NEW' : 'COM_COMPONENTBUILDER_FIELDTYPE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/fieldtype.css", ['version' => 'auto']);
@@ -276,9 +281,9 @@ class ComponentbuilderViewFieldtype extends HtmlView
 			Html::_('script', 'media/com_componentbuilder/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']);
 		}
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index a11b55610..031c15a08 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -226,6 +226,11 @@ class ComponentbuilderViewFieldtypes extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php
index 25979a110..bc7397d01 100644
--- a/admin/views/get_snippets/view.html.php
+++ b/admin/views/get_snippets/view.html.php
@@ -177,20 +177,20 @@ class ComponentbuilderViewGet_snippets extends HtmlView
 			$expire = 30000; // only 30 seconds
 		}
 		// Set the Time To Live To JavaScript
-		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
+		$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
 		// set snippet path
-		$this->document->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
-		$this->document->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
+		$this->getDocument()->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
+		$this->getDocument()->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
 		// token
-		$this->document->addScriptDeclaration("var token = '". Session::getFormToken() ."';");
+		$this->getDocument()->addScriptDeclaration("var token = '". Session::getFormToken() ."';");
 		// add some global items buckets for bulk updating
-		$this->document->addScriptDeclaration("var bulkItems = {};");
-		$this->document->addScriptDeclaration("bulkItems.new = [];");
-		$this->document->addScriptDeclaration("bulkItems.diverged = [];");
-		$this->document->addScriptDeclaration("bulkItems.ahead = [];");
-		$this->document->addScriptDeclaration("bulkItems.behind = [];");
+		$this->getDocument()->addScriptDeclaration("var bulkItems = {};");
+		$this->getDocument()->addScriptDeclaration("bulkItems.new = [];");
+		$this->getDocument()->addScriptDeclaration("bulkItems.diverged = [];");
+		$this->getDocument()->addScriptDeclaration("bulkItems.ahead = [];");
+		$this->getDocument()->addScriptDeclaration("bulkItems.behind = [];");
 		// set an error message if needed
-		$this->document->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".Text::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".Text::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
+		$this->getDocument()->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".Text::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".Text::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS');
 		Text::script('COM_COMPONENTBUILDER_SNIPPETS');
@@ -225,7 +225,7 @@ class ComponentbuilderViewGet_snippets extends HtmlView
 		Text::script('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES');
 		Text::script('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS');
 		// add some lang verfy messages
-		$this->document->addScriptDeclaration("
+		$this->getDocument()->addScriptDeclaration("
 			// set the snippet from gitHub
 			function getConfirmUpdate(status) {
 				switch(status) {
@@ -251,7 +251,7 @@ class ComponentbuilderViewGet_snippets extends HtmlView
 		if (ArrayHelper::check($this->items))
 		{
 			// Set the local snippets array
-			$this->document->addScriptDeclaration("var local_snippets = ". json_encode($local_snippets).";");
+			$this->getDocument()->addScriptDeclaration("var local_snippets = ". json_encode($local_snippets).";");
 		}
 		// add the document default css file
 		Html::_('stylesheet', 'administrator/components/com_componentbuilder/assets/css/get_snippets.css', ['version' => 'auto']);
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 7663f41bb..6c1098102 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewHelp_document extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW' : 'COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/help_document.css", ['version' => 'auto']);
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 0188f601e..f8d845d6d 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -271,6 +271,11 @@ class ComponentbuilderViewHelp_documents extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php
index 8e5b012c4..a9a0fa675 100644
--- a/admin/views/import_joomla_components/view.html.php
+++ b/admin/views/import_joomla_components/view.html.php
@@ -163,10 +163,10 @@ class ComponentbuilderViewImport_joomla_components extends HtmlView
 		}
 
 		// Set the Time To Live To JavaScript
-		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
-		$this->document->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';"); 
+		$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
+		$this->getDocument()->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';"); 
 		// add a token on the page for javascript
-		$this->document->addScriptDeclaration("var token = '".Session::getFormToken()."';"); 
+		$this->getDocument()->addScriptDeclaration("var token = '".Session::getFormToken()."';"); 
 
 
 		// add the Uikit v2 style sheets
diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php
index 395fbf07d..3e267a795 100644
--- a/admin/views/joomla_component/view.html.php
+++ b/admin/views/joomla_component/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_component extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_component.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index 581ed47b6..0d5a5994e 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -266,6 +266,11 @@ class ComponentbuilderViewJoomla_components extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_module/tmpl/edit.php b/admin/views/joomla_module/tmpl/edit.php
index 5be5f408b..a1b19dd81 100644
--- a/admin/views/joomla_module/tmpl/edit.php
+++ b/admin/views/joomla_module/tmpl/edit.php
@@ -379,9 +379,13 @@ jQuery('#adminForm').on('change', '#jform_add_update_server',function (e)
 
 jQuery('#jform_snippet').closest('.input-append').addClass('jform_snippet_input_width');
 jQuery(function() {
-    jQuery("code").click(function() {
-        jQuery(this).selText().addClass("selected");
-    });
+	// make sure the code bocks are active
+	document.querySelectorAll("code").forEach(function(codeBlock) {
+		codeBlock.addEventListener("click", function() {
+			codeBlock.selText(); // Call the custom selText function
+			codeBlock.classList.add("selected"); // Add the "selected" class
+		});
+	});
 });
 jQuery('#adminForm').on('change', '#jform_custom_get',function (e) {
 	e.preventDefault();
@@ -400,25 +404,6 @@ jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	// load the dynamic media placeholders if needed
 	setModuleCode();
 });
-
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
-    return this;
-}
 
 jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
 	e.preventDefault();
@@ -435,6 +420,22 @@ jQuery(document).ready(function() {
 // some lang strings
 var select_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
+
+
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
 
 <?php
 	$app = Factory::getApplication();
diff --git a/admin/views/joomla_module/view.html.php b/admin/views/joomla_module/view.html.php
index f10bf587a..29d6738d1 100644
--- a/admin/views/joomla_module/view.html.php
+++ b/admin/views/joomla_module/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_module extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_module.css", ['version' => 'auto']);
@@ -219,9 +224,9 @@ class ComponentbuilderViewJoomla_module extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/js/jstorage.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/js/strtotime.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// check if we should use browser storage
 		$setBrowserStorage = $this->params->get('set_browser_storage', null);
 		if ($setBrowserStorage)
@@ -252,7 +257,7 @@ class ComponentbuilderViewJoomla_module extends HtmlView
 			$expire = 30000; // only 30 seconds
 		}
 		// Set the Time To Live To JavaScript
-		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
+		$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/joomla_module_files_folders_urls/view.html.php b/admin/views/joomla_module_files_folders_urls/view.html.php
index 00be0b441..ddd37de8b 100644
--- a/admin/views/joomla_module_files_folders_urls/view.html.php
+++ b/admin/views/joomla_module_files_folders_urls/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_module_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_module_files_folders_urls.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_module_updates/view.html.php b/admin/views/joomla_module_updates/view.html.php
index c6e962f58..443daecf4 100644
--- a/admin/views/joomla_module_updates/view.html.php
+++ b/admin/views/joomla_module_updates/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_module_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_module_updates.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_modules/view.html.php b/admin/views/joomla_modules/view.html.php
index 9af4bd86c..88130720c 100644
--- a/admin/views/joomla_modules/view.html.php
+++ b/admin/views/joomla_modules/view.html.php
@@ -226,6 +226,11 @@ class ComponentbuilderViewJoomla_modules extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_modules_files_folders_urls/view.html.php b/admin/views/joomla_modules_files_folders_urls/view.html.php
index 4dda2bfb6..7df405745 100644
--- a/admin/views/joomla_modules_files_folders_urls/view.html.php
+++ b/admin/views/joomla_modules_files_folders_urls/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewJoomla_modules_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_modules_updates/view.html.php b/admin/views/joomla_modules_updates/view.html.php
index fc0801ebd..1a29f8559 100644
--- a/admin/views/joomla_modules_updates/view.html.php
+++ b/admin/views/joomla_modules_updates/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewJoomla_modules_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_plugin/view.html.php b/admin/views/joomla_plugin/view.html.php
index b68542231..331fd8300 100644
--- a/admin/views/joomla_plugin/view.html.php
+++ b/admin/views/joomla_plugin/view.html.php
@@ -196,6 +196,11 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_plugin.css", ['version' => 'auto']);
@@ -220,9 +225,9 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/js/jstorage.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/js/strtotime.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');
@@ -259,8 +264,8 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 			$expire = 30000; // only 30 seconds
 		}
 		// Set the Time To Live To JavaScript
-		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
-		$this->document->addScriptDeclaration("selectionArray = {'property':{},'method':{}};");
+		$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
+		$this->getDocument()->addScriptDeclaration("selectionArray = {'property':{},'method':{}};");
 		// add a few field options via PHP
 		\JFormHelper::addFieldPath(JPATH_COMPONENT . '/models/fields');
 		$tmp_ = \JFormHelper::loadFieldType('joomlaplugingroups')->options;
@@ -272,7 +277,7 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 				$_tmp[$item->value] = $item->text;
 			}
 			// Set the values to JavaScript
-			$this->document->addScriptDeclaration("selectionArray['joomla_plugin_group'] = ". json_encode($_tmp) . ";");
+			$this->getDocument()->addScriptDeclaration("selectionArray['joomla_plugin_group'] = ". json_encode($_tmp) . ";");
 		}
 		$tmp_ = \JFormHelper::loadFieldType('pluginsclassproperties')->options;
 		if (ArrayHelper::check($tmp_))
@@ -283,7 +288,7 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 				$_tmp[$item->value] = $item->text;
 			}
 			// Set the values to JavaScript
-			$this->document->addScriptDeclaration("selectionArray['property'] = ". json_encode($_tmp) . ";");
+			$this->getDocument()->addScriptDeclaration("selectionArray['property'] = ". json_encode($_tmp) . ";");
 		}
 		$tmp_ = \JFormHelper::loadFieldType('pluginsclassmethods')->options;
 		if (ArrayHelper::check($tmp_))
@@ -294,7 +299,7 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView
 				$_tmp[$item->value] = $item->text;
 			}
 			// Set the values to JavaScript
-			$this->document->addScriptDeclaration("selectionArray['method'] = ". json_encode($_tmp) . ";");
+			$this->getDocument()->addScriptDeclaration("selectionArray['method'] = ". json_encode($_tmp) . ";");
 		}
 		Text::script('view not acceptable. Error');
 	}
diff --git a/admin/views/joomla_plugin_files_folders_urls/view.html.php b/admin/views/joomla_plugin_files_folders_urls/view.html.php
index 6a307160a..617c23dc7 100644
--- a/admin/views/joomla_plugin_files_folders_urls/view.html.php
+++ b/admin/views/joomla_plugin_files_folders_urls/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_plugin_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_plugin_files_folders_urls.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_plugin_group/view.html.php b/admin/views/joomla_plugin_group/view.html.php
index 1c57a88a1..d44e23705 100644
--- a/admin/views/joomla_plugin_group/view.html.php
+++ b/admin/views/joomla_plugin_group/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_plugin_group extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_plugin_group.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_plugin_groups/view.html.php b/admin/views/joomla_plugin_groups/view.html.php
index 33169ce65..b879cfe1f 100644
--- a/admin/views/joomla_plugin_groups/view.html.php
+++ b/admin/views/joomla_plugin_groups/view.html.php
@@ -211,6 +211,11 @@ class ComponentbuilderViewJoomla_plugin_groups extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_plugin_updates/view.html.php b/admin/views/joomla_plugin_updates/view.html.php
index 4c2a67781..9afb0ed3a 100644
--- a/admin/views/joomla_plugin_updates/view.html.php
+++ b/admin/views/joomla_plugin_updates/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewJoomla_plugin_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_plugin_updates.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_plugins/view.html.php b/admin/views/joomla_plugins/view.html.php
index f19d57f16..4b61fa042 100644
--- a/admin/views/joomla_plugins/view.html.php
+++ b/admin/views/joomla_plugins/view.html.php
@@ -246,6 +246,11 @@ class ComponentbuilderViewJoomla_plugins extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_plugins_files_folders_urls/view.html.php b/admin/views/joomla_plugins_files_folders_urls/view.html.php
index c61cf818a..dcce16220 100644
--- a/admin/views/joomla_plugins_files_folders_urls/view.html.php
+++ b/admin/views/joomla_plugins_files_folders_urls/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewJoomla_plugins_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_plugins_updates/view.html.php b/admin/views/joomla_plugins_updates/view.html.php
index 45600ec3f..1a96d2621 100644
--- a/admin/views/joomla_plugins_updates/view.html.php
+++ b/admin/views/joomla_plugins_updates/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewJoomla_plugins_updates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/joomla_power/view.html.php b/admin/views/joomla_power/view.html.php
index 429e076b0..35ba5dd67 100644
--- a/admin/views/joomla_power/view.html.php
+++ b/admin/views/joomla_power/view.html.php
@@ -205,6 +205,11 @@ class ComponentbuilderViewJoomla_power extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_POWER_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_POWER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/joomla_power.css", ['version' => 'auto']);
diff --git a/admin/views/joomla_powers/view.html.php b/admin/views/joomla_powers/view.html.php
index 04172e9a6..ddc4160f0 100644
--- a/admin/views/joomla_powers/view.html.php
+++ b/admin/views/joomla_powers/view.html.php
@@ -206,6 +206,11 @@ class ComponentbuilderViewJoomla_powers extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php
index d6604d2a3..45171897d 100644
--- a/admin/views/language/view.html.php
+++ b/admin/views/language/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLanguage extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/language.css", ['version' => 'auto']);
diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php
index 265763456..2d41acbf7 100644
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLanguage_translation extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/language_translation.css", ['version' => 'auto']);
@@ -210,7 +215,7 @@ class ComponentbuilderViewLanguage_translation extends HtmlView
 		Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css', ['version' => 'auto']);
 		Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index 14dde5186..703ee627e 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -201,6 +201,11 @@ class ComponentbuilderViewLanguage_translations extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php
index b0db16a5f..21adf08e5 100644
--- a/admin/views/languages/view.html.php
+++ b/admin/views/languages/view.html.php
@@ -206,6 +206,11 @@ class ComponentbuilderViewLanguages extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index 147ab7697..adc97f2a0 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -146,16 +146,24 @@ jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 
 
 
-jQuery(function() {
-	jQuery('#open-libraries').html('<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo JText::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>');
-});
+document.addEventListener("DOMContentLoaded", function() {
+    document.querySelector('#open-libraries').innerHTML = '<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>';
+});
+
 jQuery('#jform_snippet').closest('.input-append').addClass('jform_snippet_input_width');
 jQuery('#jform_dynamic_get').closest('.input-append').addClass('jform_dynamic_get_input_width');
-jQuery(function() {
-    jQuery("code").click(function() {
-        jQuery(this).selText().addClass("selected");
+// Ensure the DOM is fully loaded before running the code
+document.addEventListener("DOMContentLoaded", function() {
+
+    // Event listener for code blocks
+    document.querySelectorAll("code").forEach(function(codeBlock) {
+        codeBlock.addEventListener("click", function() {
+            codeBlock.selText();  // Call the custom selText function
+            codeBlock.classList.add("selected");  // Add the "selected" class
+        });
     });
 });
+
 jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	e.preventDefault();
 	getSnippets();
@@ -191,24 +199,20 @@ jQuery(document).ready(function() {
 var select_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
 
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
     return this;
-}
+};
 
 <?php
 	$app = Factory::getApplication();
diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php
index c8bc21dcd..cfd85bb74 100644
--- a/admin/views/layout/view.html.php
+++ b/admin/views/layout/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLayout extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LAYOUT_NEW' : 'COM_COMPONENTBUILDER_LAYOUT_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/layout.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewLayout extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php
index 8af410455..162000ff8 100644
--- a/admin/views/layouts/tmpl/default.php
+++ b/admin/views/layouts/tmpl/default.php
@@ -75,26 +75,25 @@ if ($this->saveOrder)
 <script type="text/javascript">
 // layouts footer script
 
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
     return this;
-}
+};
 // make sure the code bocks are active
-jQuery("code").click(function() {
-	jQuery(this).selText().addClass("selected");
+document.querySelectorAll("code").forEach(function(codeBlock) {
+    codeBlock.addEventListener("click", function() {
+        codeBlock.selText(); // Call the custom selText function
+        codeBlock.classList.add("selected"); // Add the "selected" class
+    });
 });
 </script>
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index 50ed87326..f7a1c1f34 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -246,6 +246,11 @@ class ComponentbuilderViewLayouts extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index bf7a83b60..537c3e8d8 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -256,6 +256,11 @@ class ComponentbuilderViewLibraries extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php
index b9a72a9d9..475f8d00f 100644
--- a/admin/views/libraries_config/view.html.php
+++ b/admin/views/libraries_config/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewLibraries_config extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php
index fccf5bdea..b62ede893 100644
--- a/admin/views/libraries_files_folders_urls/view.html.php
+++ b/admin/views/libraries_files_folders_urls/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewLibraries_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/library/view.html.php b/admin/views/library/view.html.php
index 661a7086b..82d1e93a7 100644
--- a/admin/views/library/view.html.php
+++ b/admin/views/library/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLibrary extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/library.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewLibrary extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/library_config/view.html.php b/admin/views/library_config/view.html.php
index a0b4398d5..dbfe3306e 100644
--- a/admin/views/library_config/view.html.php
+++ b/admin/views/library_config/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLibrary_config extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/library_config.css", ['version' => 'auto']);
diff --git a/admin/views/library_files_folders_urls/view.html.php b/admin/views/library_files_folders_urls/view.html.php
index ecb87715b..943dfa7bd 100644
--- a/admin/views/library_files_folders_urls/view.html.php
+++ b/admin/views/library_files_folders_urls/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLibrary_files_folders_urls extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/library_files_folders_urls.css", ['version' => 'auto']);
diff --git a/admin/views/placeholder/view.html.php b/admin/views/placeholder/view.html.php
index 6da6edeb8..027f9f188 100644
--- a/admin/views/placeholder/view.html.php
+++ b/admin/views/placeholder/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewPlaceholder extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_PLACEHOLDER_NEW' : 'COM_COMPONENTBUILDER_PLACEHOLDER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/placeholder.css", ['version' => 'auto']);
@@ -218,9 +223,9 @@ class ComponentbuilderViewPlaceholder extends HtmlView
 		Text::script('COM_COMPONENTBUILDER_PLACEHOLDER_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_PLACEHOLDER');
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/placeholders/view.html.php b/admin/views/placeholders/view.html.php
index 5a9626a3b..df96ae450 100644
--- a/admin/views/placeholders/view.html.php
+++ b/admin/views/placeholders/view.html.php
@@ -201,6 +201,11 @@ class ComponentbuilderViewPlaceholders extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/power/view.html.php b/admin/views/power/view.html.php
index 2e294f45b..1bc0b18bf 100644
--- a/admin/views/power/view.html.php
+++ b/admin/views/power/view.html.php
@@ -205,6 +205,11 @@ class ComponentbuilderViewPower extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_POWER_NEW' : 'COM_COMPONENTBUILDER_POWER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/power.css", ['version' => 'auto']);
@@ -229,9 +234,9 @@ class ComponentbuilderViewPower extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/js/jstorage.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/js/strtotime.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');
@@ -268,8 +273,8 @@ class ComponentbuilderViewPower extends HtmlView
 			$expire = 30000; // only 30 seconds
 		}
 		// Set the Time To Live To JavaScript
-		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
-		$this->document->addScriptDeclaration("selectionArray = {'property':{},'method':{}};");
+		$this->getDocument()->addScriptDeclaration("var expire = ". (int) $expire.";");
+		$this->getDocument()->addScriptDeclaration("selectionArray = {'property':{},'method':{}};");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/powers/view.html.php b/admin/views/powers/view.html.php
index 9bb639c89..0ecb3d42b 100644
--- a/admin/views/powers/view.html.php
+++ b/admin/views/powers/view.html.php
@@ -246,6 +246,11 @@ class ComponentbuilderViewPowers extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/repositories/view.html.php b/admin/views/repositories/view.html.php
index be59f6182..b902441e2 100644
--- a/admin/views/repositories/view.html.php
+++ b/admin/views/repositories/view.html.php
@@ -271,6 +271,11 @@ class ComponentbuilderViewRepositories extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/repository/view.html.php b/admin/views/repository/view.html.php
index 9384271f1..92c4fabb1 100644
--- a/admin/views/repository/view.html.php
+++ b/admin/views/repository/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewRepository extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_REPOSITORY_NEW' : 'COM_COMPONENTBUILDER_REPOSITORY_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/repository.css", ['version' => 'auto']);
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index 4dccb7e7d..1b2d6e768 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewServer extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_SERVER_NEW' : 'COM_COMPONENTBUILDER_SERVER_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/server.css", ['version' => 'auto']);
diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php
index 19b2ac4c6..2145c5413 100644
--- a/admin/views/servers/view.html.php
+++ b/admin/views/servers/view.html.php
@@ -241,6 +241,11 @@ class ComponentbuilderViewServers extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index a6941949f..7e20c4fc6 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -333,40 +333,27 @@ jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 
 
 
-jQuery(function() {
-	jQuery('#open-libraries').html('<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo JText::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>');
-});
+document.addEventListener("DOMContentLoaded", function() {
+    document.querySelector('#open-libraries').innerHTML = '<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>';
+});
+
 jQuery('#jform_snippet').closest('.input-append').addClass('jform_snippet_input_width');
 jQuery('#jform_main_get').closest('.input-append').addClass('jform_main_get_input_width');
 jQuery('#jform_dynamic_get').closest('.input-append').addClass('jform_dynamic_get_input_width');
 jQuery(function() {
-    jQuery("code").click(function() {
-        jQuery(this).selText().addClass("selected");
-    });
+	// make sure the code bocks are active
+	document.querySelectorAll("code").forEach(function(codeBlock) {
+		codeBlock.addEventListener("click", function() {
+			codeBlock.selText(); // Call the custom selText function
+			codeBlock.classList.add("selected"); // Add the "selected" class
+		});
+	});
 });
+
 jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	e.preventDefault();
 	getSnippets();
 });
-
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
-    return this;
-}
 
 jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
 	e.preventDefault();
@@ -402,6 +389,22 @@ jQuery(document).ready(function() {
 // some lang strings
 var select_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
+
+
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
 
 document.addEventListener("DOMContentLoaded", function() {
 	document.querySelectorAll(".loading-dots").forEach(function(loading_dots) {
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php
index 3d8d6ce22..31246c95b 100644
--- a/admin/views/site_view/view.html.php
+++ b/admin/views/site_view/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewSite_view extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/site_view.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewSite_view extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index 5a088f4d5..e0b97c989 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -266,6 +266,11 @@ class ComponentbuilderViewSite_views extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php
index 30b994dff..696e01c11 100644
--- a/admin/views/snippet/tmpl/edit.php
+++ b/admin/views/snippet/tmpl/edit.php
@@ -17,6 +17,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 Html::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 Html::_('behavior.formvalidator');
 Html::_('formbehavior.chosen', 'select');
@@ -111,11 +112,11 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <?php 
 	// setup the return url
-	$uri = (string) JUri::getInstance();
+	$uri = (string) Uri::getInstance();
 	$return = urlencode(base64_encode($uri));
 	$optionsURL = 'index.php?option=com_config&view=component&component=com_componentbuilder&return='.$return;
 ?>
-jQuery(function() {
-	jQuery('#contributor-global-settings').html("<a class='btn btn-small options-link' href='<?php echo $optionsURL;?>'><span class='icon-options'></span><?php echo JText::_('COM_COMPONENTBUILDER_OPTIONS'); ?></a>");
+document.addEventListener("DOMContentLoaded", function() {
+    document.querySelector('#contributor-global-settings').innerHTML = '<a href="<?php echo $optionsURL;?>"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>';
 });
 </script>
diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php
index 7dde699e9..b8bd425f8 100644
--- a/admin/views/snippet/view.html.php
+++ b/admin/views/snippet/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewSnippet extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/snippet.css", ['version' => 'auto']);
diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php
index b8ddc8be7..71574ba0f 100644
--- a/admin/views/snippet_type/view.html.php
+++ b/admin/views/snippet_type/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewSnippet_type extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_TYPE_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_TYPE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/snippet_type.css", ['version' => 'auto']);
diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php
index 58a11ce86..c839baf21 100644
--- a/admin/views/snippet_types/view.html.php
+++ b/admin/views/snippet_types/view.html.php
@@ -191,6 +191,11 @@ class ComponentbuilderViewSnippet_types extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index 20c881619..ee4bf9ce1 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -251,6 +251,11 @@ class ComponentbuilderViewSnippets extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index d2df07bb6..0b76a0ed7 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -146,39 +146,27 @@ jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 
 
 
-jQuery(function() {
-	jQuery('#open-libraries').html('<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo JText::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>');
-});
+document.addEventListener("DOMContentLoaded", function() {
+    document.querySelector('#open-libraries').innerHTML = '<a href="index.php?option=com_componentbuilder&view=libraries"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></a>';
+});
+
 jQuery('#jform_snippet').closest('.input-append').addClass('jform_snippet_input_width');
 jQuery('#jform_dynamic_get').closest('.input-append').addClass('jform_dynamic_get_input_width');
-jQuery(function() {
-    jQuery("code").click(function() {
-        jQuery(this).selText().addClass("selected");
+// Ensure DOM is fully loaded
+document.addEventListener("DOMContentLoaded", function() {
+    // Event listener for code blocks to select text and add "selected" class
+    document.querySelectorAll("code").forEach(function(codeBlock) {
+        codeBlock.addEventListener("click", function() {
+            codeBlock.selText();
+            codeBlock.classList.add("selected");
+        });
     });
 });
+
 jQuery('#adminForm').on('change', '#jform_libraries',function (e) {
 	e.preventDefault();
 	getSnippets();
 });
-
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
-    return this;
-}
 
 jQuery('#adminForm').on('change', '#jform_snippet',function (e) {
 	e.preventDefault();
@@ -211,10 +199,26 @@ jQuery(document).ready(function() {
 	getLayoutDetails(9999);
 	getTemplateDetails(<?php echo ($this->item->id) ? $this->item->id:9999; ?>);
 });
+
 // some lang strings
 var select_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo Text::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
 
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
+    return this;
+};
+
 <?php
 	$app = Factory::getApplication();
 ?>
diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php
index 38309890b..e3191290c 100644
--- a/admin/views/template/view.html.php
+++ b/admin/views/template/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewTemplate extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_TEMPLATE_NEW' : 'COM_COMPONENTBUILDER_TEMPLATE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/template.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewTemplate extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		Text::script('view not acceptable. Error');
 	}
 
diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php
index 46441009e..c19cd8b18 100644
--- a/admin/views/templates/tmpl/default.php
+++ b/admin/views/templates/tmpl/default.php
@@ -75,26 +75,25 @@ if ($this->saveOrder)
 <script type="text/javascript">
 // templates footer script
 
-jQuery.fn.selText = function() {
-    var obj = this[0];
-    if (jQuery.browser.msie) {
-        var range = obj.offsetParent.createTextRange();
-        range.moveToElementText(obj);
-        range.select();
-    } else if (jQuery.browser.mozilla || $.browser.opera) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        var range = obj.ownerDocument.createRange();
-        range.selectNodeContents(obj);
-        selection.removeAllRanges();
-        selection.addRange(range);
-    } else if (jQuery.browser.safari) {
-        var selection = obj.ownerDocument.defaultView.getSelection();
-        selection.setBaseAndExtent(obj, 0, obj, 1);
-    }
+HTMLElement.prototype.selText = function() {
+    var obj = this;
+
+    // For modern browsers, handle the selection
+    var selection = window.getSelection();
+    var range = document.createRange();
+
+    // Select the content of the element
+    range.selectNodeContents(obj);
+    selection.removeAllRanges();  // Clear any previous selections
+    selection.addRange(range);    // Add the new selection range
+
     return this;
-}
+};
 // make sure the code bocks are active
-jQuery("code").click(function() {
-	jQuery(this).selText().addClass("selected");
+document.querySelectorAll("code").forEach(function(codeBlock) {
+    codeBlock.addEventListener("click", function() {
+        codeBlock.selText(); // Call the custom selText function
+        codeBlock.classList.add("selected"); // Add the "selected" class
+    });
 });
 </script>
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index f07de9445..3ef1eebf8 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -246,6 +246,11 @@ class ComponentbuilderViewTemplates extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/admin/views/validation_rule/view.html.php b/admin/views/validation_rule/view.html.php
index 6fbe44aa3..c59bf3f98 100644
--- a/admin/views/validation_rule/view.html.php
+++ b/admin/views/validation_rule/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewValidation_rule extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_COMPONENTBUILDER_VALIDATION_RULE_NEW' : 'COM_COMPONENTBUILDER_VALIDATION_RULE_EDIT'));
 		Html::_('stylesheet', "administrator/components/com_componentbuilder/assets/css/validation_rule.css", ['version' => 'auto']);
@@ -215,9 +220,9 @@ class ComponentbuilderViewValidation_rule extends HtmlView
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', ['version' => 'auto']);
 		Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/notify.min.js', ['version' => 'auto']);
 		// add var key
-		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
+		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_VALIDATION_RULE_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_VALIDATION_RULE_NAME');
diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php
index 0c5cf38b7..80462ac27 100644
--- a/admin/views/validation_rules/view.html.php
+++ b/admin/views/validation_rules/view.html.php
@@ -201,6 +201,11 @@ class ComponentbuilderViewValidation_rules extends HtmlView
 	 */
 	protected function setDocument()
 	{
+		// Load Core
+		Html::_('behavior.core');
+		// Load jQuery
+		Html::_('jquery.framework');
+
 		if (!isset($this->document))
 		{
 			$this->document = Factory::getDocument();
diff --git a/componentbuilder.xml b/componentbuilder.xml
index c18f66373..60e9990ba 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.10" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>29th September, 2024</creationDate>
+	<creationDate>7th October, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.2.5-alpha1</version>
+	<version>3.2.5-alpha2</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.3.2.5-alpha1)</h1>
+		<h1>Component Builder (v.3.2.5-alpha2)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 7aa9fb94d..4635988b8 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -202,10 +202,28 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>3.2.5-alpha1</version>
+		<version>3.2.5-alpha</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha2.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>alpha</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://dev.vdm.io</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>pkg_component_builder</element>
+		<type>package</type>
+		<client>site</client>
+		<version>3.2.5-alpha2</version>
+		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha2.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>alpha</tag>
diff --git a/libraries/phpspreadsheet/vendor/autoload.php b/libraries/phpspreadsheet/vendor/autoload.php
index 4d0fd7429..87a26b01d 100644
--- a/libraries/phpspreadsheet/vendor/autoload.php
+++ b/libraries/phpspreadsheet/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 ComposerAutoloaderInit6afe6fcd54e00add00a5fe0e5fb044f9::getLoader();
diff --git a/libraries/phpspreadsheet/vendor/composer/ClassLoader.php b/libraries/phpspreadsheet/vendor/composer/ClassLoader.php
index fce8549f0..7824d8f7e 100644
--- a/libraries/phpspreadsheet/vendor/composer/ClassLoader.php
+++ b/libraries/phpspreadsheet/vendor/composer/ClassLoader.php
@@ -37,57 +37,126 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * 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 list<string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var string|null */
     private $apcuPrefix;
 
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
     }
 
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return array<string, string> Array of classname => path
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,22 +171,25 @@ class ClassLoader
      * 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 array|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
                 );
             }
 
@@ -126,19 +198,19 @@ class ClassLoader
 
         $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
             );
         }
     }
@@ -147,25 +219,28 @@ class ClassLoader
      * 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 array|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
+     *
+     * @return void
      */
     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])) {
@@ -175,18 +250,18 @@ class ClassLoader
                 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
             );
         }
     }
@@ -195,8 +270,10 @@ class ClassLoader
      * 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 array|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +288,12 @@ class ClassLoader
      * 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 array|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
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +313,8 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +337,8 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +359,8 @@ class ClassLoader
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -296,33 +381,55 @@ class ClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +474,21 @@ class ClassLoader
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -432,14 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-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/libraries/phpspreadsheet/vendor/composer/InstalledVersions.php b/libraries/phpspreadsheet/vendor/composer/InstalledVersions.php
new file mode 100644
index 000000000..51e734a77
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * 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, 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;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @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();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints((string) $constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @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()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @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, 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()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // 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 = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * 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, 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()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @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)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @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()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($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];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // 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') {
+                /** @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();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/composer/LICENSE b/libraries/phpspreadsheet/vendor/composer/LICENSE
index 4b615a383..62ecfd8d0 100644
--- a/libraries/phpspreadsheet/vendor/composer/LICENSE
+++ b/libraries/phpspreadsheet/vendor/composer/LICENSE
@@ -1,56 +1,19 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Composer
-Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
-Source: https://github.com/composer/composer
+Copyright (c) Nils Adermann, Jordi Boggiano
 
-Files: *
-Copyright: 2016, Nils Adermann <naderman@naderman.de>
-           2016, Jordi Boggiano <j.boggiano@seld.be>
-License: Expat
+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:
 
-Files: src/Composer/Util/TlsHelper.php
-Copyright: 2016, Nils Adermann <naderman@naderman.de>
-           2016, Jordi Boggiano <j.boggiano@seld.be>
-           2013, Evan Coury <me@evancoury.com>
-License: Expat and BSD-2-Clause
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-License: BSD-2-Clause
- 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.
- .
- 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.
-
-License: Expat
- 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.
+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/libraries/phpspreadsheet/vendor/composer/autoload_classmap.php b/libraries/phpspreadsheet/vendor/composer/autoload_classmap.php
index b3fec892a..0fb0a2c19 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_classmap.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_classmap.php
@@ -2,239 +2,9 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Complex\\Complex' => $vendorDir . '/markbaker/complex/classes/src/Complex.php',
-    'Complex\\Exception' => $vendorDir . '/markbaker/complex/classes/src/Exception.php',
-    'Matrix\\Builder' => $vendorDir . '/markbaker/matrix/classes/src/Builder.php',
-    'Matrix\\Exception' => $vendorDir . '/markbaker/matrix/classes/src/Exception.php',
-    'Matrix\\Functions' => $vendorDir . '/markbaker/matrix/classes/src/Functions.php',
-    'Matrix\\Matrix' => $vendorDir . '/markbaker/matrix/classes/src/Matrix.php',
-    'Matrix\\Operators\\Addition' => $vendorDir . '/markbaker/matrix/classes/src/Operators/Addition.php',
-    'Matrix\\Operators\\DirectSum' => $vendorDir . '/markbaker/matrix/classes/src/Operators/DirectSum.php',
-    'Matrix\\Operators\\Division' => $vendorDir . '/markbaker/matrix/classes/src/Operators/Division.php',
-    'Matrix\\Operators\\Multiplication' => $vendorDir . '/markbaker/matrix/classes/src/Operators/Multiplication.php',
-    'Matrix\\Operators\\Operator' => $vendorDir . '/markbaker/matrix/classes/src/Operators/Operator.php',
-    'Matrix\\Operators\\Subtraction' => $vendorDir . '/markbaker/matrix/classes/src/Operators/Subtraction.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Calculation' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Category' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Database' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\DateTime' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Engine\\CyclicReferenceStack' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Engine\\Logger' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Engineering' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Exception' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\ExceptionHandler' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Financial' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\FormulaParser' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\FormulaToken' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Functions' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Logical' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\LookupRef' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\MathTrig' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\TextData' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php',
-    'PhpOffice\\PhpSpreadsheet\\Calculation\\Token\\Stack' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\AdvancedValueBinder' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\Cell' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\Coordinate' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\DataType' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\DataValidation' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\DataValidator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\DefaultValueBinder' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\Hyperlink' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\IValueBinder' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php',
-    'PhpOffice\\PhpSpreadsheet\\Cell\\StringValueBinder' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Axis' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Chart' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\DataSeries' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\DataSeriesValues' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Exception' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Exception.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\GridLines' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Layout' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Legend' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\PlotArea' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Properties' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Renderer\\IRenderer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Renderer\\JpGraph' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php',
-    'PhpOffice\\PhpSpreadsheet\\Chart\\Title' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php',
-    'PhpOffice\\PhpSpreadsheet\\Collection\\Cells' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php',
-    'PhpOffice\\PhpSpreadsheet\\Collection\\CellsFactory' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php',
-    'PhpOffice\\PhpSpreadsheet\\Collection\\Memory' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php',
-    'PhpOffice\\PhpSpreadsheet\\Comment' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php',
-    'PhpOffice\\PhpSpreadsheet\\Document\\Properties' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php',
-    'PhpOffice\\PhpSpreadsheet\\Document\\Security' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php',
-    'PhpOffice\\PhpSpreadsheet\\Exception' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php',
-    'PhpOffice\\PhpSpreadsheet\\HashTable' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php',
-    'PhpOffice\\PhpSpreadsheet\\Helper\\Html' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php',
-    'PhpOffice\\PhpSpreadsheet\\Helper\\Migrator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Migrator.php',
-    'PhpOffice\\PhpSpreadsheet\\Helper\\Sample' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php',
-    'PhpOffice\\PhpSpreadsheet\\IComparable' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php',
-    'PhpOffice\\PhpSpreadsheet\\IOFactory' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php',
-    'PhpOffice\\PhpSpreadsheet\\NamedRange' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\BaseReader' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Csv' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\DefaultReadFilter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Exception' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Exception.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Gnumeric' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Html' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\IReadFilter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\IReader' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Ods' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Ods\\Properties' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Security\\XmlScanner' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Slk' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BIFF5' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BIFF8' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BuiltIn' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\ErrorCode' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Escher' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\MD5' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\RC4' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Style\\Border' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Style\\FillPattern' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\AutoFilter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\BaseParserClass' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Chart' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\ColumnAndRowAttributes' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\ConditionalStyles' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\DataValidations' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Hyperlinks' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\PageSetup' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Properties' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\SheetViewOptions' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\SheetViews' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Styles' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Theme' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php',
-    'PhpOffice\\PhpSpreadsheet\\Reader\\Xml' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php',
-    'PhpOffice\\PhpSpreadsheet\\ReferenceHelper' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php',
-    'PhpOffice\\PhpSpreadsheet\\RichText\\ITextElement' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php',
-    'PhpOffice\\PhpSpreadsheet\\RichText\\RichText' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php',
-    'PhpOffice\\PhpSpreadsheet\\RichText\\Run' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php',
-    'PhpOffice\\PhpSpreadsheet\\RichText\\TextElement' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php',
-    'PhpOffice\\PhpSpreadsheet\\Settings' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\CodePage' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Date' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Drawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer\\SpgrContainer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer\\SpgrContainer\\SpContainer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer\\BSE' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer\\BSE\\Blip' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\File' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Font' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\CholeskyDecomposition' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\EigenvalueDecomposition' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\LUDecomposition' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\Matrix' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\QRDecomposition' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\SingularValueDecomposition' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLE' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLERead' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\ChainedBlockStream' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS\\File' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS\\Root' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\PasswordHasher' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\StringHelper' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\TimeZone' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\BestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\ExponentialBestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\LinearBestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\LogarithmicBestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\PolynomialBestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\PowerBestFit' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\Trend' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\XMLWriter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php',
-    'PhpOffice\\PhpSpreadsheet\\Shared\\Xls' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php',
-    'PhpOffice\\PhpSpreadsheet\\Spreadsheet' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Alignment' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Border' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Borders' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Color' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Conditional' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Fill' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Font' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\NumberFormat' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Protection' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Style' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php',
-    'PhpOffice\\PhpSpreadsheet\\Style\\Supervisor' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter\\Column' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter\\Column\\Rule' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\BaseDrawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\CellIterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Column' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnCellIterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnDimension' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnIterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Dimension' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Drawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Drawing\\Shadow' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\HeaderFooter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\HeaderFooterDrawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Iterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\MemoryDrawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\PageMargins' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\PageSetup' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Protection' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Row' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowCellIterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowDimension' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowIterator' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\SheetView' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php',
-    'PhpOffice\\PhpSpreadsheet\\Worksheet\\Worksheet' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\BaseWriter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Csv' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Exception' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Exception.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Html' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\IWriter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Cell\\Comment' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Content' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Meta' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\MetaInf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Mimetype' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Settings' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Styles' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Thumbnails' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\WriterPart' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Dompdf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Mpdf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Tcpdf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\BIFFwriter' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Escher' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Font' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Parser' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Workbook' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Worksheet' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Xf' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Chart' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Comments' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\ContentTypes' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\DocProps' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Drawing' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Rels' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\RelsRibbon' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\RelsVBA' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\StringTable' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Style' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Theme' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Workbook' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Worksheet' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php',
-    'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\WriterPart' => $vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php',
-    'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
-    'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
-    'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 );
diff --git a/libraries/phpspreadsheet/vendor/composer/autoload_files.php b/libraries/phpspreadsheet/vendor/composer/autoload_files.php
index 2101c3539..0a2315f98 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_files.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_files.php
@@ -2,66 +2,9 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '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',
-    '9d8e013a5160a09477beb8e44f8ae97b' => $vendorDir . '/markbaker/matrix/classes/src/functions/adjoint.php',
-    '6e78d1bdea6248d6aa117229efae50f2' => $vendorDir . '/markbaker/matrix/classes/src/functions/antidiagonal.php',
-    '4623d87924d94f5412fe5afbf1cef31d' => $vendorDir . '/markbaker/matrix/classes/src/functions/cofactors.php',
-    '901fd1f6950a637ca85f66b701a45e13' => $vendorDir . '/markbaker/matrix/classes/src/functions/determinant.php',
-    '83057abc0e4acc99ba80154ee5d02a49' => $vendorDir . '/markbaker/matrix/classes/src/functions/diagonal.php',
-    '07b7fd7a434451149b4fd477fca0ce06' => $vendorDir . '/markbaker/matrix/classes/src/functions/identity.php',
-    'c8d43b340583e07ae89f2a3baef2cf89' => $vendorDir . '/markbaker/matrix/classes/src/functions/inverse.php',
-    '499bb10ed7a3aee2ba4c09a31a85e8d1' => $vendorDir . '/markbaker/matrix/classes/src/functions/minors.php',
-    '1cad2e6414d652e8b1c64e8967f6f37d' => $vendorDir . '/markbaker/matrix/classes/src/functions/trace.php',
-    '95a7f134ac17161d07def442b3b737e8' => $vendorDir . '/markbaker/matrix/classes/src/functions/transpose.php',
-    'b3a6bc628377118d4b4b8ba08d1eb949' => $vendorDir . '/markbaker/matrix/classes/src/operations/add.php',
-    '5fef6d0e407f3f8887266dfa4a6c534c' => $vendorDir . '/markbaker/matrix/classes/src/operations/directsum.php',
-    '684ba247e1385946e3babdaa054119de' => $vendorDir . '/markbaker/matrix/classes/src/operations/subtract.php',
-    'aa53dcba601214d17ad405b7c291b7e8' => $vendorDir . '/markbaker/matrix/classes/src/operations/multiply.php',
-    '75c79eb1b25749b05a47976f32b0d8a2' => $vendorDir . '/markbaker/matrix/classes/src/operations/divideby.php',
-    '6ab8ad87a734f276a6bcd5a0fe1289be' => $vendorDir . '/markbaker/matrix/classes/src/operations/divideinto.php',
+    '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
 );
diff --git a/libraries/phpspreadsheet/vendor/composer/autoload_namespaces.php b/libraries/phpspreadsheet/vendor/composer/autoload_namespaces.php
index b7fc0125d..e60f3526a 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_namespaces.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_namespaces.php
@@ -2,8 +2,9 @@
 
 // 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/libraries/phpspreadsheet/vendor/composer/autoload_psr4.php b/libraries/phpspreadsheet/vendor/composer/autoload_psr4.php
index 56ef81077..ba38f4665 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_psr4.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_psr4.php
@@ -2,11 +2,14 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
+    'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
     '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\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
     'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
     'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
diff --git a/libraries/phpspreadsheet/vendor/composer/autoload_real.php b/libraries/phpspreadsheet/vendor/composer/autoload_real.php
index aba32ac6a..31ec8700e 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_real.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_real.php
@@ -13,58 +13,38 @@ class ComposerAutoloaderInit6afe6fcd54e00add00a5fe0e5fb044f9
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInit6afe6fcd54e00add00a5fe0e5fb044f9', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit6afe6fcd54e00add00a5fe0e5fb044f9', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::getInitializer($loader));
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire6afe6fcd54e00add00a5fe0e5fb044f9($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-function composerRequire6afe6fcd54e00add00a5fe0e5fb044f9($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/libraries/phpspreadsheet/vendor/composer/autoload_static.php b/libraries/phpspreadsheet/vendor/composer/autoload_static.php
index 2c24a05bc..9f9b0ec4a 100644
--- a/libraries/phpspreadsheet/vendor/composer/autoload_static.php
+++ b/libraries/phpspreadsheet/vendor/composer/autoload_static.php
@@ -7,70 +7,19 @@ namespace Composer\Autoload;
 class ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9
 {
     public static $files = array (
-        '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',
-        '9d8e013a5160a09477beb8e44f8ae97b' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/adjoint.php',
-        '6e78d1bdea6248d6aa117229efae50f2' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/antidiagonal.php',
-        '4623d87924d94f5412fe5afbf1cef31d' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/cofactors.php',
-        '901fd1f6950a637ca85f66b701a45e13' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/determinant.php',
-        '83057abc0e4acc99ba80154ee5d02a49' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/diagonal.php',
-        '07b7fd7a434451149b4fd477fca0ce06' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/identity.php',
-        'c8d43b340583e07ae89f2a3baef2cf89' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/inverse.php',
-        '499bb10ed7a3aee2ba4c09a31a85e8d1' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/minors.php',
-        '1cad2e6414d652e8b1c64e8967f6f37d' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/trace.php',
-        '95a7f134ac17161d07def442b3b737e8' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/functions/transpose.php',
-        'b3a6bc628377118d4b4b8ba08d1eb949' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/add.php',
-        '5fef6d0e407f3f8887266dfa4a6c534c' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/directsum.php',
-        '684ba247e1385946e3babdaa054119de' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/subtract.php',
-        'aa53dcba601214d17ad405b7c291b7e8' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/multiply.php',
-        '75c79eb1b25749b05a47976f32b0d8a2' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/divideby.php',
-        '6ab8ad87a734f276a6bcd5a0fe1289be' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/operations/divideinto.php',
+        '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     );
 
     public static $prefixLengthsPsr4 = array (
+        'Z' => 
+        array (
+            'ZipStream\\' => 10,
+        ),
         'P' => 
         array (
             'Psr\\SimpleCache\\' => 16,
+            'Psr\\Http\\Message\\' => 17,
+            'Psr\\Http\\Client\\' => 16,
             'PhpOffice\\PhpSpreadsheet\\' => 25,
         ),
         'M' => 
@@ -84,10 +33,23 @@ class ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9
     );
 
     public static $prefixDirsPsr4 = array (
+        'ZipStream\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/maennchen/zipstream-php/src',
+        ),
         'Psr\\SimpleCache\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/simple-cache/src',
         ),
+        'Psr\\Http\\Message\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
+        ),
+        'Psr\\Http\\Client\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-client/src',
+        ),
         'PhpOffice\\PhpSpreadsheet\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet',
@@ -102,238 +64,18 @@ class ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9
         ),
     );
 
+    public static $prefixesPsr0 = array (
+        'H' => 
+        array (
+            'HTMLPurifier' => 
+            array (
+                0 => __DIR__ . '/..' . '/ezyang/htmlpurifier/library',
+            ),
+        ),
+    );
+
     public static $classMap = array (
-        'Complex\\Complex' => __DIR__ . '/..' . '/markbaker/complex/classes/src/Complex.php',
-        'Complex\\Exception' => __DIR__ . '/..' . '/markbaker/complex/classes/src/Exception.php',
-        'Matrix\\Builder' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Builder.php',
-        'Matrix\\Exception' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Exception.php',
-        'Matrix\\Functions' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions.php',
-        'Matrix\\Matrix' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Matrix.php',
-        'Matrix\\Operators\\Addition' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/Addition.php',
-        'Matrix\\Operators\\DirectSum' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/DirectSum.php',
-        'Matrix\\Operators\\Division' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/Division.php',
-        'Matrix\\Operators\\Multiplication' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/Multiplication.php',
-        'Matrix\\Operators\\Operator' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/Operator.php',
-        'Matrix\\Operators\\Subtraction' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operators/Subtraction.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Calculation' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Category' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Database' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\DateTime' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Engine\\CyclicReferenceStack' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Engine\\Logger' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Engineering' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Exception' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\ExceptionHandler' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Financial' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\FormulaParser' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\FormulaToken' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Functions' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Logical' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\LookupRef' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\MathTrig' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Statistical' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\TextData' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php',
-        'PhpOffice\\PhpSpreadsheet\\Calculation\\Token\\Stack' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\AdvancedValueBinder' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\Cell' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\Coordinate' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\DataType' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\DataValidation' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\DataValidator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\DefaultValueBinder' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\Hyperlink' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\IValueBinder' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php',
-        'PhpOffice\\PhpSpreadsheet\\Cell\\StringValueBinder' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Axis' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Chart' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\DataSeries' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\DataSeriesValues' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Exception' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Exception.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\GridLines' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Layout' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Legend' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\PlotArea' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Properties' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Renderer\\IRenderer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Renderer\\JpGraph' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php',
-        'PhpOffice\\PhpSpreadsheet\\Chart\\Title' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php',
-        'PhpOffice\\PhpSpreadsheet\\Collection\\Cells' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php',
-        'PhpOffice\\PhpSpreadsheet\\Collection\\CellsFactory' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php',
-        'PhpOffice\\PhpSpreadsheet\\Collection\\Memory' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php',
-        'PhpOffice\\PhpSpreadsheet\\Comment' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php',
-        'PhpOffice\\PhpSpreadsheet\\Document\\Properties' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php',
-        'PhpOffice\\PhpSpreadsheet\\Document\\Security' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php',
-        'PhpOffice\\PhpSpreadsheet\\Exception' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php',
-        'PhpOffice\\PhpSpreadsheet\\HashTable' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php',
-        'PhpOffice\\PhpSpreadsheet\\Helper\\Html' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php',
-        'PhpOffice\\PhpSpreadsheet\\Helper\\Migrator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Migrator.php',
-        'PhpOffice\\PhpSpreadsheet\\Helper\\Sample' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php',
-        'PhpOffice\\PhpSpreadsheet\\IComparable' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php',
-        'PhpOffice\\PhpSpreadsheet\\IOFactory' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php',
-        'PhpOffice\\PhpSpreadsheet\\NamedRange' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\BaseReader' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Csv' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\DefaultReadFilter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Exception' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Exception.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Gnumeric' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Html' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\IReadFilter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\IReader' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Ods' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Ods\\Properties' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Security\\XmlScanner' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Slk' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BIFF5' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BIFF8' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Color\\BuiltIn' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\ErrorCode' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Escher' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\MD5' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\RC4' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Style\\Border' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xls\\Style\\FillPattern' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\AutoFilter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\BaseParserClass' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Chart' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\ColumnAndRowAttributes' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\ConditionalStyles' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\DataValidations' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Hyperlinks' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\PageSetup' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Properties' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\SheetViewOptions' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\SheetViews' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Styles' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xlsx\\Theme' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php',
-        'PhpOffice\\PhpSpreadsheet\\Reader\\Xml' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php',
-        'PhpOffice\\PhpSpreadsheet\\ReferenceHelper' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php',
-        'PhpOffice\\PhpSpreadsheet\\RichText\\ITextElement' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php',
-        'PhpOffice\\PhpSpreadsheet\\RichText\\RichText' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php',
-        'PhpOffice\\PhpSpreadsheet\\RichText\\Run' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php',
-        'PhpOffice\\PhpSpreadsheet\\RichText\\TextElement' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php',
-        'PhpOffice\\PhpSpreadsheet\\Settings' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\CodePage' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Date' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Drawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer\\SpgrContainer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DgContainer\\SpgrContainer\\SpContainer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer\\BSE' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Escher\\DggContainer\\BstoreContainer\\BSE\\Blip' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\File' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Font' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\CholeskyDecomposition' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\EigenvalueDecomposition' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\LUDecomposition' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\Matrix' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\QRDecomposition' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\SingularValueDecomposition' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLE' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLERead' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\ChainedBlockStream' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS\\File' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\OLE\\PPS\\Root' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\PasswordHasher' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\StringHelper' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\TimeZone' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\BestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\ExponentialBestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\LinearBestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\LogarithmicBestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\PolynomialBestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\PowerBestFit' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Trend\\Trend' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\XMLWriter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php',
-        'PhpOffice\\PhpSpreadsheet\\Shared\\Xls' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php',
-        'PhpOffice\\PhpSpreadsheet\\Spreadsheet' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Alignment' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Border' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Borders' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Color' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Conditional' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Fill' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Font' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\NumberFormat' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Protection' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Style' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php',
-        'PhpOffice\\PhpSpreadsheet\\Style\\Supervisor' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter\\Column' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\AutoFilter\\Column\\Rule' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\BaseDrawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\CellIterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Column' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnCellIterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnDimension' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\ColumnIterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Dimension' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Drawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Drawing\\Shadow' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\HeaderFooter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\HeaderFooterDrawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Iterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\MemoryDrawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\PageMargins' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\PageSetup' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Protection' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Row' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowCellIterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowDimension' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\RowIterator' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\SheetView' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php',
-        'PhpOffice\\PhpSpreadsheet\\Worksheet\\Worksheet' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\BaseWriter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Csv' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Exception' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Exception.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Html' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\IWriter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Cell\\Comment' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Content' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Meta' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\MetaInf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Mimetype' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Settings' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Styles' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\Thumbnails' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Ods\\WriterPart' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Dompdf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Mpdf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Pdf\\Tcpdf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\BIFFwriter' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Escher' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Font' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Parser' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Workbook' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Worksheet' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xls\\Xf' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Chart' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Comments' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\ContentTypes' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\DocProps' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Drawing' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Rels' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\RelsRibbon' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\RelsVBA' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\StringTable' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Style' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Theme' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Workbook' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\Worksheet' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php',
-        'PhpOffice\\PhpSpreadsheet\\Writer\\Xlsx\\WriterPart' => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php',
-        'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
-        'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
-        'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
@@ -341,6 +83,7 @@ class ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit6afe6fcd54e00add00a5fe0e5fb044f9::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/libraries/phpspreadsheet/vendor/composer/installed.json b/libraries/phpspreadsheet/vendor/composer/installed.json
index c24865080..46ae1b852 100644
--- a/libraries/phpspreadsheet/vendor/composer/installed.json
+++ b/libraries/phpspreadsheet/vendor/composer/installed.json
@@ -1,315 +1,598 @@
-[
-    {
-        "name": "markbaker/complex",
-        "version": "1.4.8",
-        "version_normalized": "1.4.8.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/MarkBaker/PHPComplex.git",
-            "reference": "8eaa40cceec7bf0518187530b2e63871be661b72"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72",
-            "reference": "8eaa40cceec7bf0518187530b2e63871be661b72",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.6.0|^7.0.0"
-        },
-        "require-dev": {
-            "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-            "phpcompatibility/php-compatibility": "^9.0",
-            "phpdocumentor/phpdocumentor": "2.*",
-            "phploc/phploc": "2.*",
-            "phpmd/phpmd": "2.*",
-            "phpunit/phpunit": "^4.8.35|^5.4.0",
-            "sebastian/phpcpd": "2.*",
-            "squizlabs/php_codesniffer": "^3.4.0"
-        },
-        "time": "2020-03-11T20:15:49+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": [
-            "MIT"
+{
+        "packages": [
+                {
+                        "name": "ezyang/htmlpurifier",
+                        "version": "v4.17.0",
+                        "version_normalized": "4.17.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/ezyang/htmlpurifier.git",
+                                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+                        },
+                        "require-dev": {
+                                "cerdic/css-tidy": "^1.7 || ^2.0",
+                                "simpletest/simpletest": "dev-master"
+                        },
+                        "suggest": {
+                                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                                "ext-tidy": "Used for pretty-printing HTML"
+                        },
+                        "time": "2023-11-17T15:01:25+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "files": [
+                                        "library/HTMLPurifier.composer.php"
+                                ],
+                                "psr-0": {
+                                        "HTMLPurifier": "library/"
+                                },
+                                "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/v4.17.0"
+                        },
+                        "install-path": "../ezyang/htmlpurifier"
+                },
+                {
+                        "name": "maennchen/zipstream-php",
+                        "version": "3.1.0",
+                        "version_normalized": "3.1.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/maennchen/ZipStream-PHP.git",
+                                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "ext-mbstring": "*",
+                                "ext-zlib": "*",
+                                "php-64bit": "^8.1"
+                        },
+                        "require-dev": {
+                                "ext-zip": "*",
+                                "friendsofphp/php-cs-fixer": "^3.16",
+                                "guzzlehttp/guzzle": "^7.5",
+                                "mikey179/vfsstream": "^1.6",
+                                "php-coveralls/php-coveralls": "^2.5",
+                                "phpunit/phpunit": "^10.0",
+                                "vimeo/psalm": "^5.0"
+                        },
+                        "suggest": {
+                                "guzzlehttp/psr7": "^2.4",
+                                "psr/http-message": "^2.0"
+                        },
+                        "time": "2023-06-21T14:59:35+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "ZipStream\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "Paul Duncan",
+                                        "email": "pabs@pablotron.org"
+                                },
+                                {
+                                        "name": "Jonatan Männchen",
+                                        "email": "jonatan@maennchen.ch"
+                                },
+                                {
+                                        "name": "Jesse Donat",
+                                        "email": "donatj@gmail.com"
+                                },
+                                {
+                                        "name": "András Kolesár",
+                                        "email": "kolesar@kolesar.hu"
+                                }
+                        ],
+                        "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+                        "keywords": [
+                                "stream",
+                                "zip"
+                        ],
+                        "support": {
+                                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+                                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
+                        },
+                        "funding": [
+                                {
+                                        "url": "https://github.com/maennchen",
+                                        "type": "github"
+                                },
+                                {
+                                        "url": "https://opencollective.com/zipstream",
+                                        "type": "open_collective"
+                                }
+                        ],
+                        "install-path": "../maennchen/zipstream-php"
+                },
+                {
+                        "name": "markbaker/complex",
+                        "version": "3.0.2",
+                        "version_normalized": "3.0.2.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/MarkBaker/PHPComplex.git",
+                                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "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": "dev-master",
+                                "phpcompatibility/php-compatibility": "^9.3",
+                                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                                "squizlabs/php_codesniffer": "^3.7"
+                        },
+                        "time": "2022-12-06T16:21:08+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Complex\\": "classes/src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "Mark Baker",
+                                        "email": "mark@lange.demon.co.uk"
+                                }
+                        ],
+                        "description": "PHP Class for working with complex numbers",
+                        "homepage": "https://github.com/MarkBaker/PHPComplex",
+                        "keywords": [
+                                "complex",
+                                "mathematics"
+                        ],
+                        "support": {
+                                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+                                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
+                        },
+                        "install-path": "../markbaker/complex"
+                },
+                {
+                        "name": "markbaker/matrix",
+                        "version": "3.0.1",
+                        "version_normalized": "3.0.1.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/MarkBaker/PHPMatrix.git",
+                                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "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": "dev-master",
+                                "phpcompatibility/php-compatibility": "^9.3",
+                                "phpdocumentor/phpdocumentor": "2.*",
+                                "phploc/phploc": "^4.0",
+                                "phpmd/phpmd": "2.*",
+                                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                                "sebastian/phpcpd": "^4.0",
+                                "squizlabs/php_codesniffer": "^3.7"
+                        },
+                        "time": "2022-12-02T22:17:43+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Matrix\\": "classes/src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "Mark Baker",
+                                        "email": "mark@demon-angel.eu"
+                                }
+                        ],
+                        "description": "PHP Class for working with matrices",
+                        "homepage": "https://github.com/MarkBaker/PHPMatrix",
+                        "keywords": [
+                                "mathematics",
+                                "matrix",
+                                "vector"
+                        ],
+                        "support": {
+                                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+                                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
+                        },
+                        "install-path": "../markbaker/matrix"
+                },
+                {
+                        "name": "phpoffice/phpspreadsheet",
+                        "version": "1.29.2",
+                        "version_normalized": "1.29.2.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
+                                "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f",
+                                "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "ext-ctype": "*",
+                                "ext-dom": "*",
+                                "ext-fileinfo": "*",
+                                "ext-gd": "*",
+                                "ext-iconv": "*",
+                                "ext-libxml": "*",
+                                "ext-mbstring": "*",
+                                "ext-simplexml": "*",
+                                "ext-xml": "*",
+                                "ext-xmlreader": "*",
+                                "ext-xmlwriter": "*",
+                                "ext-zip": "*",
+                                "ext-zlib": "*",
+                                "ezyang/htmlpurifier": "^4.15",
+                                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                                "markbaker/complex": "^3.0",
+                                "markbaker/matrix": "^3.0",
+                                "php": "^7.4 || ^8.0",
+                                "psr/http-client": "^1.0",
+                                "psr/http-factory": "^1.0",
+                                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+                        },
+                        "require-dev": {
+                                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                                "dompdf/dompdf": "^1.0 || ^2.0",
+                                "friendsofphp/php-cs-fixer": "^3.2",
+                                "mitoteam/jpgraph": "^10.3",
+                                "mpdf/mpdf": "^8.1.1",
+                                "phpcompatibility/php-compatibility": "^9.3",
+                                "phpstan/phpstan": "^1.1",
+                                "phpstan/phpstan-phpunit": "^1.0",
+                                "phpunit/phpunit": "^8.5 || ^9.0",
+                                "squizlabs/php_codesniffer": "^3.7",
+                                "tecnickcom/tcpdf": "^6.5"
+                        },
+                        "suggest": {
+                                "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"
+                        },
+                        "time": "2024-09-29T07:04:47+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "Maarten Balliauw",
+                                        "homepage": "https://blog.maartenballiauw.be"
+                                },
+                                {
+                                        "name": "Mark Baker",
+                                        "homepage": "https://markbakeruk.net"
+                                },
+                                {
+                                        "name": "Franck Lefevre",
+                                        "homepage": "https://rootslabs.net"
+                                },
+                                {
+                                        "name": "Erik Tilt"
+                                },
+                                {
+                                        "name": "Adrien Crivelli"
+                                }
+                        ],
+                        "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+                        "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+                        "keywords": [
+                                "OpenXML",
+                                "excel",
+                                "gnumeric",
+                                "ods",
+                                "php",
+                                "spreadsheet",
+                                "xls",
+                                "xlsx"
+                        ],
+                        "support": {
+                                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
+                                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.2"
+                        },
+                        "install-path": "../phpoffice/phpspreadsheet"
+                },
+                {
+                        "name": "psr/http-client",
+                        "version": "1.0.3",
+                        "version_normalized": "1.0.3.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/php-fig/http-client.git",
+                                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "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 || ^2.0"
+                        },
+                        "time": "2023-09-23T14:17:50+00:00",
+                        "type": "library",
+                        "extra": {
+                                "branch-alias": {
+                                        "dev-master": "1.0.x-dev"
+                                }
+                        },
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Psr\\Http\\Client\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "PHP-FIG",
+                                        "homepage": "https://www.php-fig.org/"
+                                }
+                        ],
+                        "description": "Common interface for HTTP clients",
+                        "homepage": "https://github.com/php-fig/http-client",
+                        "keywords": [
+                                "http",
+                                "http-client",
+                                "psr",
+                                "psr-18"
+                        ],
+                        "support": {
+                                "source": "https://github.com/php-fig/http-client"
+                        },
+                        "install-path": "../psr/http-client"
+                },
+                {
+                        "name": "psr/http-factory",
+                        "version": "1.1.0",
+                        "version_normalized": "1.1.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/php-fig/http-factory.git",
+                                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "php": ">=7.1",
+                                "psr/http-message": "^1.0 || ^2.0"
+                        },
+                        "time": "2024-04-15T12:06:14+00:00",
+                        "type": "library",
+                        "extra": {
+                                "branch-alias": {
+                                        "dev-master": "1.0.x-dev"
+                                }
+                        },
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Psr\\Http\\Message\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "PHP-FIG",
+                                        "homepage": "https://www.php-fig.org/"
+                                }
+                        ],
+                        "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+                        "keywords": [
+                                "factory",
+                                "http",
+                                "message",
+                                "psr",
+                                "psr-17",
+                                "psr-7",
+                                "request",
+                                "response"
+                        ],
+                        "support": {
+                                "source": "https://github.com/php-fig/http-factory"
+                        },
+                        "install-path": "../psr/http-factory"
+                },
+                {
+                        "name": "psr/http-message",
+                        "version": "2.0",
+                        "version_normalized": "2.0.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/php-fig/http-message.git",
+                                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "php": "^7.2 || ^8.0"
+                        },
+                        "time": "2023-04-04T09:54:51+00:00",
+                        "type": "library",
+                        "extra": {
+                                "branch-alias": {
+                                        "dev-master": "2.0.x-dev"
+                                }
+                        },
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Psr\\Http\\Message\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "PHP-FIG",
+                                        "homepage": "https://www.php-fig.org/"
+                                }
+                        ],
+                        "description": "Common interface for HTTP messages",
+                        "homepage": "https://github.com/php-fig/http-message",
+                        "keywords": [
+                                "http",
+                                "http-message",
+                                "psr",
+                                "psr-7",
+                                "request",
+                                "response"
+                        ],
+                        "support": {
+                                "source": "https://github.com/php-fig/http-message/tree/2.0"
+                        },
+                        "install-path": "../psr/http-message"
+                },
+                {
+                        "name": "psr/simple-cache",
+                        "version": "3.0.0",
+                        "version_normalized": "3.0.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/php-fig/simple-cache.git",
+                                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "php": ">=8.0.0"
+                        },
+                        "time": "2021-10-29T13:26:27+00:00",
+                        "type": "library",
+                        "extra": {
+                                "branch-alias": {
+                                        "dev-master": "3.0.x-dev"
+                                }
+                        },
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "Psr\\SimpleCache\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "MIT"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "PHP-FIG",
+                                        "homepage": "https://www.php-fig.org/"
+                                }
+                        ],
+                        "description": "Common interfaces for simple caching",
+                        "keywords": [
+                                "cache",
+                                "caching",
+                                "psr",
+                                "psr-16",
+                                "simple-cache"
+                        ],
+                        "support": {
+                                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+                        },
+                        "install-path": "../psr/simple-cache"
+                }
         ],
-        "authors": [
-            {
-                "name": "Mark Baker",
-                "email": "mark@lange.demon.co.uk"
-            }
-        ],
-        "description": "PHP Class for working with complex numbers",
-        "homepage": "https://github.com/MarkBaker/PHPComplex",
-        "keywords": [
-            "complex",
-            "mathematics"
-        ]
-    },
-    {
-        "name": "markbaker/matrix",
-        "version": "1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/MarkBaker/PHPMatrix.git",
-            "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21",
-            "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.6.0|^7.0.0"
-        },
-        "require-dev": {
-            "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-            "phpcompatibility/php-compatibility": "dev-master",
-            "phploc/phploc": "^4",
-            "phpmd/phpmd": "dev-master",
-            "phpunit/phpunit": "^5.7",
-            "sebastian/phpcpd": "^3.0",
-            "squizlabs/php_codesniffer": "^3.0@dev"
-        },
-        "time": "2019-10-06T11:29:25+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": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Mark Baker",
-                "email": "mark@lange.demon.co.uk"
-            }
-        ],
-        "description": "PHP Class for working with matrices",
-        "homepage": "https://github.com/MarkBaker/PHPMatrix",
-        "keywords": [
-            "mathematics",
-            "matrix",
-            "vector"
-        ]
-    },
-    {
-        "name": "phpoffice/phpspreadsheet",
-        "version": "1.11.0",
-        "version_normalized": "1.11.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-            "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c2a205e82f9cf1cc9fab86b79e808d86dd680470",
-            "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-dom": "*",
-            "ext-fileinfo": "*",
-            "ext-gd": "*",
-            "ext-iconv": "*",
-            "ext-libxml": "*",
-            "ext-mbstring": "*",
-            "ext-simplexml": "*",
-            "ext-xml": "*",
-            "ext-xmlreader": "*",
-            "ext-xmlwriter": "*",
-            "ext-zip": "*",
-            "ext-zlib": "*",
-            "markbaker/complex": "^1.4",
-            "markbaker/matrix": "^1.2",
-            "php": "^7.1",
-            "psr/simple-cache": "^1.0"
-        },
-        "require-dev": {
-            "dompdf/dompdf": "^0.8.3",
-            "friendsofphp/php-cs-fixer": "^2.16",
-            "jpgraph/jpgraph": "^4.0",
-            "mpdf/mpdf": "^8.0",
-            "phpcompatibility/php-compatibility": "^9.3",
-            "phpunit/phpunit": "^7.5",
-            "squizlabs/php_codesniffer": "^3.5",
-            "tecnickcom/tcpdf": "^6.3"
-        },
-        "suggest": {
-            "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
-            "jpgraph/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"
-        },
-        "time": "2020-03-02T13:09:03+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Maarten Balliauw",
-                "homepage": "https://blog.maartenballiauw.be"
-            },
-            {
-                "name": "Mark Baker",
-                "homepage": "https://markbakeruk.net"
-            },
-            {
-                "name": "Franck Lefevre",
-                "homepage": "https://rootslabs.net"
-            },
-            {
-                "name": "Erik Tilt"
-            },
-            {
-                "name": "Adrien Crivelli"
-            }
-        ],
-        "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-        "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
-        "keywords": [
-            "OpenXML",
-            "excel",
-            "gnumeric",
-            "ods",
-            "php",
-            "spreadsheet",
-            "xls",
-            "xlsx"
-        ]
-    },
-    {
-        "name": "psr/simple-cache",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/simple-cache.git",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2017-10-23T01:57:42+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\SimpleCache\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interfaces for simple caching",
-        "keywords": [
-            "cache",
-            "caching",
-            "psr",
-            "psr-16",
-            "simple-cache"
-        ]
-    }
-]
+        "dev": true,
+        "dev-package-names": []
+}
diff --git a/libraries/phpspreadsheet/vendor/composer/installed.php b/libraries/phpspreadsheet/vendor/composer/installed.php
new file mode 100644
index 000000000..dc1948eab
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/composer/installed.php
@@ -0,0 +1,104 @@
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => '1.0.0+no-version-set',
+        'version' => '1.0.0.0',
+        'reference' => null,
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => '1.0.0+no-version-set',
+            'version' => '1.0.0.0',
+            'reference' => null,
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'ezyang/htmlpurifier' => array(
+            'pretty_version' => 'v4.17.0',
+            'version' => '4.17.0.0',
+            'reference' => 'bbc513d79acf6691fa9cf10f192c90dd2957f18c',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../ezyang/htmlpurifier',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'maennchen/zipstream-php' => array(
+            'pretty_version' => '3.1.0',
+            'version' => '3.1.0.0',
+            'reference' => 'b8174494eda667f7d13876b4a7bfef0f62a7c0d1',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../maennchen/zipstream-php',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'markbaker/complex' => array(
+            'pretty_version' => '3.0.2',
+            'version' => '3.0.2.0',
+            'reference' => '95c56caa1cf5c766ad6d65b6344b807c1e8405b9',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../markbaker/complex',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'markbaker/matrix' => array(
+            'pretty_version' => '3.0.1',
+            'version' => '3.0.1.0',
+            'reference' => '728434227fe21be27ff6d86621a1b13107a2562c',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../markbaker/matrix',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'phpoffice/phpspreadsheet' => array(
+            'pretty_version' => '1.29.2',
+            'version' => '1.29.2.0',
+            'reference' => '3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpoffice/phpspreadsheet',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-client' => array(
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-client',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory' => array(
+            'pretty_version' => '1.1.0',
+            'version' => '1.1.0.0',
+            'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-message' => array(
+            'pretty_version' => '2.0',
+            'version' => '2.0.0.0',
+            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-message',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/simple-cache' => array(
+            'pretty_version' => '3.0.0',
+            'version' => '3.0.0.0',
+            'reference' => '764e0b3939f5ca87cb904f570ef9be2d78a07865',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/simple-cache',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/libraries/phpspreadsheet/vendor/composer/platform_check.php b/libraries/phpspreadsheet/vendor/composer/platform_check.php
new file mode 100644
index 000000000..f71b2f899
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/composer/platform_check.php
@@ -0,0 +1,30 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+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) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/CREDITS b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/CREDITS
new file mode 100644
index 000000000..7921b45af
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/CREDITS
@@ -0,0 +1,9 @@
+
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/LICENSE b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/LICENSE
new file mode 100644
index 000000000..8c88a20d4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/LICENSE
@@ -0,0 +1,504 @@
+		  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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/README.md b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/README.md
new file mode 100644
index 000000000..e6b7199c1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/README.md
@@ -0,0 +1,29 @@
+HTML Purifier [![Build Status](https://github.com/ezyang/htmlpurifier/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/ezyang/htmlpurifier/actions/workflows/ci.yml)
+=============
+
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/VERSION b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/VERSION
new file mode 100644
index 000000000..8643e7227
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/VERSION
@@ -0,0 +1 @@
+4.17.0
\ No newline at end of file
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/composer.json b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/composer.json
new file mode 100644
index 000000000..ed46bd5cf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/composer.json
@@ -0,0 +1,45 @@
+{
+    "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.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+    },
+    "require-dev": {
+        "cerdic/css-tidy": "^1.7 || ^2.0",
+        "simpletest/simpletest": "dev-master"
+    },
+    "autoload": {
+        "psr-0": { "HTMLPurifier": "library/" },
+        "files": ["library/HTMLPurifier.composer.php"],
+        "exclude-from-classmap": [
+            "/library/HTMLPurifier/Language/"
+        ]
+    },
+    "suggest": {
+        "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+        "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+        "ext-bcmath": "Used for unit conversion and imagecrash protection",
+        "ext-tidy": "Used for pretty-printing HTML"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/ezyang/simpletest.git",
+            "no-api": true
+        }
+    ]
+}
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
new file mode 100644
index 000000000..1960c399f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
@@ -0,0 +1,11 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
new file mode 100644
index 000000000..0a17ee4ad
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @file
+ * Legacy autoloader for systems lacking spl_autoload_register
+ *
+ */
+
+spl_autoload_register(function($class)
+{
+     return HTMLPurifier_Bootstrap::autoload($class);
+});
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
new file mode 100644
index 000000000..7a691132f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
@@ -0,0 +1,25 @@
+<?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';
+}
+
+// phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.zend_ze1_compatibility_modeRemoved
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
new file mode 100644
index 000000000..52acc56b0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
@@ -0,0 +1,4 @@
+<?php
+if (!defined('HTMLPURIFIER_PREFIX')) {
+    define('HTMLPURIFIER_PREFIX', dirname(__FILE__));
+}
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
new file mode 100644
index 000000000..64b140bec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
@@ -0,0 +1,25 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
new file mode 100644
index 000000000..77ebf2de7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
@@ -0,0 +1,235 @@
+<?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.17.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/ContentEditable.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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
new file mode 100644
index 000000000..752290077
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
@@ -0,0 +1,30 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
new file mode 100644
index 000000000..39b1b6531
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
@@ -0,0 +1,11 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
new file mode 100644
index 000000000..5c14a335d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
@@ -0,0 +1,297 @@
+<?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.17.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.17.0';
+
+    /**
+     * Constant with version of HTML Purifier.
+     */
+    const VERSION = '4.17.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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
new file mode 100644
index 000000000..94543f593
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
@@ -0,0 +1,229 @@
+<?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/ContentEditable.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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
new file mode 100644
index 000000000..d2e9d22a2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
@@ -0,0 +1,71 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
new file mode 100644
index 000000000..c7b17cf14
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
@@ -0,0 +1,148 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
new file mode 100644
index 000000000..739646fa7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
@@ -0,0 +1,144 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
new file mode 100644
index 000000000..ad2cb90ad
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
@@ -0,0 +1,136 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
new file mode 100644
index 000000000..af2b83dff
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
@@ -0,0 +1,34 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
new file mode 100644
index 000000000..28c49883a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -0,0 +1,113 @@
+<?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'];
+        $this->info['background-size'] = $def->info['background-size'];
+    }
+
+    /**
+     * @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;
+        $caught['size'] = 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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
new file mode 100644
index 000000000..4580ef5a9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -0,0 +1,157 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
new file mode 100644
index 000000000..16243ba1e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
new file mode 100644
index 000000000..d7287a00c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -0,0 +1,161 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
new file mode 100644
index 000000000..9c1750554
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -0,0 +1,48 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
new file mode 100644
index 000000000..9d77cc9aa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
new file mode 100644
index 000000000..bde4c3301
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
@@ -0,0 +1,77 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
new file mode 100644
index 000000000..579b97ef1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -0,0 +1,176 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
new file mode 100644
index 000000000..f1ff11636
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -0,0 +1,217 @@
+<?php
+
+/**
+ * Validates a font family list according to CSS spec
+ */
+class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
+{
+
+    protected $mask = null;
+
+    public function __construct()
+    {
+        // Lowercase letters
+        $l = range('a', 'z');
+        // Uppercase letters
+        $u = range('A', 'Z');
+        // Digits
+        $d = range('0', '9');
+        // Special bytes used by UTF-8
+        $b = array_map('chr', range(0x80, 0xFF));
+        // All valid characters for the mask
+        $c = array_merge($l, $u, $d, $b);
+        // Concatenate all valid characters into a string 
+        // Use '_- ' as an initial value
+        $this->mask = array_reduce($c, function ($carry, $value) {
+            return $carry . $value;
+        }, '_- ');
+
+        /*
+            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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
new file mode 100644
index 000000000..973002c17
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
@@ -0,0 +1,32 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
new file mode 100644
index 000000000..ffc989fe8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
new file mode 100644
index 000000000..f12453a04
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -0,0 +1,77 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
new file mode 100644
index 000000000..e74d42654
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -0,0 +1,112 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
new file mode 100644
index 000000000..e707f871c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -0,0 +1,71 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
new file mode 100644
index 000000000..ef49d20fd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -0,0 +1,90 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
new file mode 100644
index 000000000..f0f25c50a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -0,0 +1,54 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
new file mode 100644
index 000000000..5fd4b7f7b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -0,0 +1,46 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
new file mode 100644
index 000000000..6617acace
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -0,0 +1,77 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
new file mode 100644
index 000000000..6698a00c0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
new file mode 100644
index 000000000..8abda7f6e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
@@ -0,0 +1,73 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
new file mode 100644
index 000000000..be3bbc8dc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
@@ -0,0 +1,48 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
new file mode 100644
index 000000000..d5013488f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
@@ -0,0 +1,48 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
new file mode 100644
index 000000000..946ebb782
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
@@ -0,0 +1,51 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php
new file mode 100644
index 000000000..5b03d3e37
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php
@@ -0,0 +1,16 @@
+<?php
+
+class HTMLPurifier_AttrDef_HTML_ContentEditable extends HTMLPurifier_AttrDef
+{
+    public function validate($string, $config, $context)
+    {
+        $allowed = array('false');
+        if ($config->get('HTML.Trusted')) {
+            $allowed = array('', 'true', 'false');
+        }
+
+        $enum = new HTMLPurifier_AttrDef_Enum($allowed);
+
+        return $enum->validate($string, $config, $context);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
new file mode 100644
index 000000000..d79ba12b3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
@@ -0,0 +1,38 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
new file mode 100644
index 000000000..4ba45610f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
@@ -0,0 +1,113 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
new file mode 100644
index 000000000..1c4006fbb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
new file mode 100644
index 000000000..63fa04c15
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
@@ -0,0 +1,72 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
new file mode 100644
index 000000000..bbb20f2f8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
@@ -0,0 +1,60 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
new file mode 100644
index 000000000..f79683b4f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
@@ -0,0 +1,70 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
new file mode 100644
index 000000000..a1d019e09
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
@@ -0,0 +1,76 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
new file mode 100644
index 000000000..400e707d2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
@@ -0,0 +1,91 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
new file mode 100644
index 000000000..2a55cea64
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
@@ -0,0 +1,86 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
new file mode 100644
index 000000000..c7eb3199a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
@@ -0,0 +1,53 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
new file mode 100644
index 000000000..4553a4ea9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
@@ -0,0 +1,21 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
new file mode 100644
index 000000000..c1cd89772
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
@@ -0,0 +1,111 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
new file mode 100644
index 000000000..daf32b764
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
@@ -0,0 +1,20 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
new file mode 100644
index 000000000..52c0d5968
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
@@ -0,0 +1,29 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
new file mode 100644
index 000000000..ddc5dfbea
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
@@ -0,0 +1,142 @@
+<?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') && class_exists('Net_IDNA2')) {
+            $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
new file mode 100644
index 000000000..30ac16c9e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
@@ -0,0 +1,45 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
new file mode 100644
index 000000000..f243793ee
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
@@ -0,0 +1,89 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
new file mode 100644
index 000000000..b428331f1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
@@ -0,0 +1,60 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
new file mode 100644
index 000000000..2f72869a5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
@@ -0,0 +1,28 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
new file mode 100644
index 000000000..d66c04a5b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
@@ -0,0 +1,27 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
new file mode 100644
index 000000000..0f51fd2ce
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
@@ -0,0 +1,28 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
new file mode 100644
index 000000000..f25cd0195
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -0,0 +1,47 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
new file mode 100644
index 000000000..057dc017f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
@@ -0,0 +1,26 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
new file mode 100644
index 000000000..7ccd0e3fb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
@@ -0,0 +1,68 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
new file mode 100644
index 000000000..235ebb34b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -0,0 +1,47 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
new file mode 100644
index 000000000..350b3358f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
@@ -0,0 +1,61 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
new file mode 100644
index 000000000..3ab47ed8c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
new file mode 100644
index 000000000..5b0aff0e4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
@@ -0,0 +1,31 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
new file mode 100644
index 000000000..853f33549
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
@@ -0,0 +1,45 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
new file mode 100644
index 000000000..63cce6837
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
@@ -0,0 +1,33 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
new file mode 100644
index 000000000..5a1fdbbfc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
@@ -0,0 +1,46 @@
+<?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
+{
+
+    /**
+     * @type HTMLPurifier_AttrDef_HTML_ID
+     */
+    public $idDef;
+
+    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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
new file mode 100644
index 000000000..1057ebee1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
@@ -0,0 +1,52 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
new file mode 100644
index 000000000..231c81a3f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
@@ -0,0 +1,25 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
new file mode 100644
index 000000000..d1f3a4d2e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
@@ -0,0 +1,28 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
new file mode 100644
index 000000000..1033106b3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
@@ -0,0 +1,84 @@
+<?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;
+
+    /**
+     * @type HTMLPurifier_AttrDef_Enum
+     */
+    public $wmode;
+
+    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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
new file mode 100644
index 000000000..b7057bbf8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
@@ -0,0 +1,23 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
new file mode 100644
index 000000000..cc30ab8c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
@@ -0,0 +1,49 @@
+<?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']);
+        
+        // Ignore invalid schemes (e.g. `javascript:`)
+        if (!($scheme = $url->getSchemeObj($config, $context))) {
+            return $attr;
+        }
+
+        if ($scheme->browsable && !$url->isBenign($config, $context)) {
+            $attr['target'] = '_blank';
+        }
+        return $attr;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php
new file mode 100644
index 000000000..1db3c6c09
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php
@@ -0,0 +1,37 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
new file mode 100644
index 000000000..587dc2e07
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
@@ -0,0 +1,37 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
new file mode 100644
index 000000000..6a9f33a0c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
@@ -0,0 +1,27 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
new file mode 100644
index 000000000..e4429e86d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
@@ -0,0 +1,97 @@
+<?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();
+        $this->info['ContentEditable'] = new HTMLPurifier_AttrDef_HTML_ContentEditable();
+
+        // 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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
new file mode 100644
index 000000000..f97dc93ed
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
@@ -0,0 +1,178 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
new file mode 100644
index 000000000..bd8f9984f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
@@ -0,0 +1,91 @@
+<?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 (spl_autoload_functions() === false) {
+            spl_autoload_register($autoload);
+        } else {
+            // prepend flag exists, no need for shenanigans
+            spl_autoload_register($autoload, true, true);
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
new file mode 100644
index 000000000..1bc419c53
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
@@ -0,0 +1,566 @@
+<?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 = [];
+
+    /**
+     * 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(
+            ['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(
+                [
+                    '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(
+            ['none', 'left', 'right', 'both'],
+            false
+        );
+        $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
+            ['none', 'left', 'right'],
+            false
+        );
+        $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
+            ['normal', 'italic', 'oblique'],
+            false
+        );
+        $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
+            ['normal', 'small-caps'],
+            false
+        );
+
+        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Enum(['none']),
+                new HTMLPurifier_AttrDef_CSS_URI()
+            ]
+        );
+
+        $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
+            ['inside', 'outside'],
+            false
+        );
+        $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
+            [
+                '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(
+            ['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(
+            ['repeat', 'repeat-x', 'repeat-y', 'no-repeat']
+        );
+        $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
+            ['scroll', 'fixed']
+        );
+        $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
+
+        $this->info['background-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Enum(
+                    [
+                        'auto',
+                        'cover',
+                        'contain',
+                        'initial',
+                        'inherit',
+                    ]
+                ),
+                new HTMLPurifier_AttrDef_CSS_Percentage(),
+                new HTMLPurifier_AttrDef_CSS_Length()
+            ]
+        );
+
+        $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(
+                [
+                    new HTMLPurifier_AttrDef_Enum(['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(
+                [
+                    new HTMLPurifier_AttrDef_Enum(['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(
+            [
+                new HTMLPurifier_AttrDef_Enum(['normal']),
+                new HTMLPurifier_AttrDef_CSS_Length()
+            ]
+        );
+
+        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Enum(['normal']),
+                new HTMLPurifier_AttrDef_CSS_Length()
+            ]
+        );
+
+        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Enum(
+                    [
+                        '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(
+            [
+                new HTMLPurifier_AttrDef_Enum(['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(
+                [
+                    new HTMLPurifier_AttrDef_CSS_Length(),
+                    new HTMLPurifier_AttrDef_CSS_Percentage(),
+                    new HTMLPurifier_AttrDef_Enum(['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(
+                [
+                    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(
+            [
+                new HTMLPurifier_AttrDef_CSS_Length(),
+                new HTMLPurifier_AttrDef_CSS_Percentage()
+            ]
+        );
+
+        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(['auto', 'initial', 'inherit'])
+            ]
+        );
+        $trusted_min_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(['initial', 'inherit'])
+            ]
+        );
+        $trusted_max_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(['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(
+                        [
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(['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(
+                        [
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(['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(
+                        [
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(['none', 'initial', 'inherit'])
+                        ]
+                    ),
+                    // For everyone else:
+                    $trusted_max_wh
+                );
+
+        // text-decoration and related shorthands
+        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
+
+        $this->info['text-decoration-line'] = new HTMLPurifier_AttrDef_Enum(
+            ['none', 'underline', 'overline', 'line-through', 'initial', 'inherit']
+        );
+
+        $this->info['text-decoration-style'] = new HTMLPurifier_AttrDef_Enum(
+            ['solid', 'double', 'dotted', 'dashed', 'wavy', 'initial', 'inherit']
+        );
+
+        $this->info['text-decoration-color'] = new HTMLPurifier_AttrDef_CSS_Color();
+
+        $this->info['text-decoration-thickness'] = new HTMLPurifier_AttrDef_CSS_Composite([
+            new HTMLPurifier_AttrDef_CSS_Length(),
+            new HTMLPurifier_AttrDef_CSS_Percentage(),
+            new HTMLPurifier_AttrDef_Enum(['auto', 'from-font', 'initial', 'inherit'])
+        ]);
+
+        $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
+
+        // this could use specialized code
+        $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
+            [
+                '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(
+            ['collapse', 'separate']
+        );
+
+        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(
+            ['top', 'bottom']
+        );
+
+        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(
+            ['auto', 'fixed']
+        );
+
+        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Enum(
+                    [
+                        '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(
+            ['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(
+            [
+                'auto',
+                'always',
+                'avoid',
+                'left',
+                'right'
+            ]
+        );
+        $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(['auto', 'avoid']);
+
+        $border_radius = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                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(
+            [
+                '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(
+            ['visible', 'hidden', 'collapse']
+        );
+        $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(['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(
+            ['static', 'relative', 'absolute', 'fixed']
+        );
+        $this->info['top'] =
+        $this->info['left'] =
+        $this->info['right'] =
+        $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_CSS_Length(),
+                new HTMLPurifier_AttrDef_CSS_Percentage(),
+                new HTMLPurifier_AttrDef_Enum(['auto']),
+            ]
+        );
+        $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(
+            [
+                new HTMLPurifier_AttrDef_Integer(),
+                new HTMLPurifier_AttrDef_Enum(['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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
new file mode 100644
index 000000000..8eb17b82e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
@@ -0,0 +1,52 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
new file mode 100644
index 000000000..7439be26b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
@@ -0,0 +1,67 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
new file mode 100644
index 000000000..f515888a1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
@@ -0,0 +1,102 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
new file mode 100644
index 000000000..a8a6cbdd2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
@@ -0,0 +1,38 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
new file mode 100644
index 000000000..3d584e727
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
@@ -0,0 +1,94 @@
+<?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);
+
+    public $whitespace;
+
+    /**
+     * @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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
new file mode 100644
index 000000000..b9468063b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
@@ -0,0 +1,45 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
new file mode 100644
index 000000000..0d1c8f5f3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
@@ -0,0 +1,118 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
new file mode 100644
index 000000000..3270a46e1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
@@ -0,0 +1,110 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
new file mode 100644
index 000000000..67c7e9535
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
@@ -0,0 +1,224 @@
+<?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) && $thead === false && $tfoot === false) {
+            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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
new file mode 100644
index 000000000..f7511ca41
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
@@ -0,0 +1,920 @@
+<?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.17.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 && version_compare(PHP_VERSION, '7.4.0', '<') && 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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
new file mode 100644
index 000000000..c3fe8cd4a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
@@ -0,0 +1,176 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
new file mode 100644
index 000000000..d5906cd46
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
@@ -0,0 +1,48 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
new file mode 100644
index 000000000..5fa56f7dd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
@@ -0,0 +1,144 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
new file mode 100644
index 000000000..2671516c5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Exceptions related to configuration schema
+ */
+class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
new file mode 100644
index 000000000..0e08ae8fe
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
@@ -0,0 +1,47 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
new file mode 100644
index 000000000..127a39a67
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
@@ -0,0 +1,89 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
new file mode 100644
index 000000000..126f09d95
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
@@ -0,0 +1,58 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
new file mode 100644
index 000000000..655e6dd1b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
@@ -0,0 +1,226 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
new file mode 100644
index 000000000..fb3127788
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
@@ -0,0 +1,248 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
new file mode 100644
index 000000000..c9aa3644a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
@@ -0,0 +1,130 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
new file mode 100644
index 000000000..a5426c736
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
@@ -0,0 +1 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
new file mode 100644
index 000000000..0517fed0a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
new file mode 100644
index 000000000..249edd647
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
new file mode 100644
index 000000000..9a8fa6a2e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
new file mode 100644
index 000000000..b01788348
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
new file mode 100644
index 000000000..e774b823b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
@@ -0,0 +1,19 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
new file mode 100644
index 000000000..533165e17
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
new file mode 100644
index 000000000..9eb7e3846
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
new file mode 100644
index 000000000..2f17bf477
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
new file mode 100644
index 000000000..52654b53a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
new file mode 100644
index 000000000..6440d2103
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
new file mode 100644
index 000000000..f31d226f5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
new file mode 100644
index 000000000..735d4b7a1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
new file mode 100644
index 000000000..5f2b5e3d2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
@@ -0,0 +1,5 @@
+Attr.IDBlacklist
+TYPE: list
+DEFAULT: array()
+DESCRIPTION: Array of IDs not allowed in the document.
+--# vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
new file mode 100644
index 000000000..6f5824586
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
new file mode 100644
index 000000000..cc49d43fd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
new file mode 100644
index 000000000..2c5924a7a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
new file mode 100644
index 000000000..d5caa1bb9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
@@ -0,0 +1,31 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
new file mode 100644
index 000000000..2a476481a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
new file mode 100644
index 000000000..663064a34
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
new file mode 100644
index 000000000..3a48ba960
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
new file mode 100644
index 000000000..db58b1346
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
new file mode 100644
index 000000000..7996488be
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
new file mode 100644
index 000000000..6367fe23c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
new file mode 100644
index 000000000..35c393b4e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
new file mode 100644
index 000000000..9228dee22
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
new file mode 100644
index 000000000..34657ba47
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
@@ -0,0 +1,46 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
new file mode 100644
index 000000000..dde990ab2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
new file mode 100644
index 000000000..4d054b1f0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
new file mode 100644
index 000000000..b324608f7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
new file mode 100644
index 000000000..748be0eec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
new file mode 100644
index 000000000..3fd465406
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
new file mode 100644
index 000000000..460112ebe
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
@@ -0,0 +1,18 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
new file mode 100644
index 000000000..5cb7dda3b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
new file mode 100644
index 000000000..f1f5c5f12
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
new file mode 100644
index 000000000..7a3291470
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
new file mode 100644
index 000000000..148eedb8b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
new file mode 100644
index 000000000..e733a61e8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
new file mode 100644
index 000000000..c486724c8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
new file mode 100644
index 000000000..54036507d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
new file mode 100644
index 000000000..2e0cc8104
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
new file mode 100644
index 000000000..568cbf3b3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
@@ -0,0 +1,18 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
new file mode 100644
index 000000000..b2b6ab149
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
new file mode 100644
index 000000000..2c910cc7d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
new file mode 100644
index 000000000..06278f82a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
new file mode 100644
index 000000000..d7317911f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
new file mode 100644
index 000000000..a75844cd5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
@@ -0,0 +1,160 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
new file mode 100644
index 000000000..64b114fce
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
new file mode 100644
index 000000000..36f16e07e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
@@ -0,0 +1,17 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
new file mode 100644
index 000000000..1cd4c2c96
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
new file mode 100644
index 000000000..ce243c35d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
new file mode 100644
index 000000000..8bfb47c3a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
new file mode 100644
index 000000000..a3881be75
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
new file mode 100644
index 000000000..a7a5b249b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
@@ -0,0 +1,7 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
new file mode 100644
index 000000000..abb499948
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
new file mode 100644
index 000000000..915391edb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
@@ -0,0 +1,19 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
new file mode 100644
index 000000000..233fca14f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
new file mode 100644
index 000000000..392b43649
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
@@ -0,0 +1,36 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
new file mode 100644
index 000000000..8983e2cca
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
@@ -0,0 +1,34 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
new file mode 100644
index 000000000..eb841a759
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
new file mode 100644
index 000000000..d77f5360d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
new file mode 100644
index 000000000..4070c2a0d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
new file mode 100644
index 000000000..3397d9f71
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
new file mode 100644
index 000000000..a4cd966df
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
new file mode 100644
index 000000000..3db50ef20
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
new file mode 100644
index 000000000..16829bcda
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
new file mode 100644
index 000000000..7f95f54d1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
@@ -0,0 +1,29 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
new file mode 100644
index 000000000..6c231b2d7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
new file mode 100644
index 000000000..078d08741
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
@@ -0,0 +1,74 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
new file mode 100644
index 000000000..321eaa2d8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
new file mode 100644
index 000000000..0b2c106da
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -0,0 +1,25 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
new file mode 100644
index 000000000..fcf093f17
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
@@ -0,0 +1,19 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
new file mode 100644
index 000000000..140e21423
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
new file mode 100644
index 000000000..f22e977d4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
new file mode 100644
index 000000000..1d3fa7907
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -0,0 +1,23 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
new file mode 100644
index 000000000..5a59a55c0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
@@ -0,0 +1,20 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
new file mode 100644
index 000000000..151fb7b82
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
new file mode 100644
index 000000000..45ae469ec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
@@ -0,0 +1,18 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
new file mode 100644
index 000000000..524618879
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
@@ -0,0 +1,23 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
new file mode 100644
index 000000000..6ed70b599
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
new file mode 100644
index 000000000..103db754a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
@@ -0,0 +1,33 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
new file mode 100644
index 000000000..229ae0267
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
@@ -0,0 +1,16 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
new file mode 100644
index 000000000..9dab497f2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
new file mode 100644
index 000000000..7878dc0bf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
new file mode 100644
index 000000000..57358f9ba
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
@@ -0,0 +1,21 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
new file mode 100644
index 000000000..93a53e14f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
@@ -0,0 +1,20 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
new file mode 100644
index 000000000..4a432d89b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
new file mode 100644
index 000000000..e424c386e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
new file mode 100644
index 000000000..700b30924
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
@@ -0,0 +1,7 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
new file mode 100644
index 000000000..62e8e160c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
new file mode 100644
index 000000000..dfb720496
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
@@ -0,0 +1,12 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
new file mode 100644
index 000000000..cdda09a4c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
new file mode 100644
index 000000000..5eb6ec2b5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
new file mode 100644
index 000000000..ceb342e22
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
new file mode 100644
index 000000000..5ebc7a19d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
new file mode 100644
index 000000000..a8b1de56b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
new file mode 100644
index 000000000..587a16778
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
new file mode 100644
index 000000000..dd514c0de
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
@@ -0,0 +1,10 @@
+--# 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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
new file mode 100644
index 000000000..cb5a0b0e5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
new file mode 100644
index 000000000..b4c271b7f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
new file mode 100644
index 000000000..4186ccd0d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
@@ -0,0 +1,24 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
new file mode 100644
index 000000000..996762bd1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
@@ -0,0 +1,8 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
new file mode 100644
index 000000000..1db9237e9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
new file mode 100644
index 000000000..2a47e384f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
new file mode 100644
index 000000000..08921fde7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
@@ -0,0 +1,10 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
new file mode 100644
index 000000000..d6f0d9f29
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
new file mode 100644
index 000000000..93398e859
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
new file mode 100644
index 000000000..79f8ad82c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
new file mode 100644
index 000000000..232b02362
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
new file mode 100644
index 000000000..06bab00a0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
@@ -0,0 +1,25 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
new file mode 100644
index 000000000..071bc0295
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
@@ -0,0 +1,7 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
new file mode 100644
index 000000000..eb97307e2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -0,0 +1,18 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
new file mode 100644
index 000000000..876f0680c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
@@ -0,0 +1,17 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
new file mode 100644
index 000000000..834bc08c0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
new file mode 100644
index 000000000..f05312ba8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
new file mode 100644
index 000000000..80cfea93f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
new file mode 100644
index 000000000..71ce025a2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
@@ -0,0 +1,14 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
new file mode 100644
index 000000000..13c122c8c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
@@ -0,0 +1,11 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
new file mode 100644
index 000000000..abcc1efd6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
new file mode 100644
index 000000000..f891de499
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -0,0 +1,15 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
new file mode 100644
index 000000000..ee83b121d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
@@ -0,0 +1,19 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
new file mode 100644
index 000000000..0b6df7625
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
new file mode 100644
index 000000000..4214900a5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
@@ -0,0 +1,13 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
new file mode 100644
index 000000000..58c81dcc4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
@@ -0,0 +1,83 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
new file mode 100644
index 000000000..6fce0fdc3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
@@ -0,0 +1,17 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
new file mode 100644
index 000000000..1e17c1d46
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
@@ -0,0 +1,30 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
new file mode 100644
index 000000000..23331a4e7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
@@ -0,0 +1,9 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
new file mode 100644
index 000000000..79084832b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
@@ -0,0 +1,22 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
new file mode 100644
index 000000000..5de4505e1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
@@ -0,0 +1,3 @@
+name = "HTML Purifier"
+
+; vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
new file mode 100644
index 000000000..543e3f8f1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
@@ -0,0 +1,170 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
new file mode 100644
index 000000000..00e509c85
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
@@ -0,0 +1,95 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
new file mode 100644
index 000000000..bc6d43364
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
@@ -0,0 +1,55 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
new file mode 100644
index 000000000..9aa8ff354
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
@@ -0,0 +1,129 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
new file mode 100644
index 000000000..b57a51b6c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
@@ -0,0 +1,112 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
new file mode 100644
index 000000000..4991777ce
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
@@ -0,0 +1,78 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
new file mode 100644
index 000000000..d529dce48
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
@@ -0,0 +1,85 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
new file mode 100644
index 000000000..b1fec8d36
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
@@ -0,0 +1,82 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
new file mode 100644
index 000000000..d9a75ce22
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
@@ -0,0 +1,76 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
new file mode 100644
index 000000000..bfad967fb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
@@ -0,0 +1,312 @@
+<?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, it is
+              // not obvious how to fix this (777 is probably
+              // bad if you are multi-user), let the user figure it out
+                $chmod = null;
+            }
+            trigger_error(
+                'Directory ' . $dir . ' not writable. ' .
+                ($chmod === null ? '' : '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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
new file mode 100644
index 000000000..2e35c1c3d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
@@ -0,0 +1,3 @@
+This is a dummy file to prevent Git from ignoring this empty directory.
+
+    vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
new file mode 100644
index 000000000..3a0f4616a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
@@ -0,0 +1,106 @@
+<?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])) {
+            $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
new file mode 100644
index 000000000..4acd06e5b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
@@ -0,0 +1,73 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
new file mode 100644
index 000000000..acc1d64a6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
@@ -0,0 +1,142 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
new file mode 100644
index 000000000..57cfd2bb0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
@@ -0,0 +1,216 @@
+<?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", (string)$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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
new file mode 100644
index 000000000..d4791cc1b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
@@ -0,0 +1,617 @@
+<?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' && function_exists('mb_convert_encoding')) {
+            $str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
+            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' && function_exists('mb_convert_encoding')) {
+            $str = mb_convert_encoding($str, 'ISO-8859-1', 'UTF-8');
+            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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
new file mode 100644
index 000000000..f12ff13a3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
@@ -0,0 +1,48 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
new file mode 100644
index 000000000..e8b08128b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
@@ -0,0 +1 @@
+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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
new file mode 100644
index 000000000..3ef2d09ec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
@@ -0,0 +1,285 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
new file mode 100644
index 000000000..d47e3f2e2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
@@ -0,0 +1,244 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
new file mode 100644
index 000000000..cf869d321
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
@@ -0,0 +1,74 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
new file mode 100644
index 000000000..be85b4c56
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
@@ -0,0 +1,12 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
new file mode 100644
index 000000000..c1f41ee16
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
new file mode 100644
index 000000000..6f8e7790e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
@@ -0,0 +1,345 @@
+<?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();
+            if (is_array($decls)) {
+                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;
+                }
+            } else {
+                continue;
+            }
+            $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
new file mode 100644
index 000000000..276d8362f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
@@ -0,0 +1,65 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
new file mode 100644
index 000000000..eb56e2dfa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
@@ -0,0 +1,286 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
new file mode 100644
index 000000000..9b7b334dd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
@@ -0,0 +1,493 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
new file mode 100644
index 000000000..9dbb98729
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
@@ -0,0 +1,285 @@
+<?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)
+    {
+        $args = func_get_args();
+        if (is_string($list)) {
+            $list = $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
new file mode 100644
index 000000000..1e67c790d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
new file mode 100644
index 000000000..7220c14cc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
@@ -0,0 +1,32 @@
+<?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',
+            'contenteditable' => 'ContentEditable',
+        ),
+        '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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
new file mode 100644
index 000000000..a9042a357
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
@@ -0,0 +1,55 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
new file mode 100644
index 000000000..eb0edcffd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
@@ -0,0 +1,194 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
new file mode 100644
index 000000000..72d7a31e6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
new file mode 100644
index 000000000..f7e7c91c0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
@@ -0,0 +1,51 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
new file mode 100644
index 000000000..0f5fdb3ba
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
@@ -0,0 +1,49 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
new file mode 100644
index 000000000..86b529957
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
@@ -0,0 +1,186 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
new file mode 100644
index 000000000..7a20ff701
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
@@ -0,0 +1,51 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
new file mode 100644
index 000000000..60c054515
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
@@ -0,0 +1,26 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
new file mode 100644
index 000000000..dc9410a89
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
@@ -0,0 +1,25 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
new file mode 100644
index 000000000..da722253a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
@@ -0,0 +1,20 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
new file mode 100644
index 000000000..2f9efc5c8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
@@ -0,0 +1,62 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
new file mode 100644
index 000000000..6458ce9d8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
@@ -0,0 +1,42 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
new file mode 100644
index 000000000..5ee3c8e67
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
new file mode 100644
index 000000000..a0d48924d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
@@ -0,0 +1,36 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
new file mode 100644
index 000000000..04e6689ea
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
new file mode 100644
index 000000000..1297f80a3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
@@ -0,0 +1,62 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
new file mode 100644
index 000000000..aea7584c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
new file mode 100644
index 000000000..8b28a7b7e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
@@ -0,0 +1,73 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
new file mode 100644
index 000000000..497b832ae
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
@@ -0,0 +1,33 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
new file mode 100644
index 000000000..8a0b3b461
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
@@ -0,0 +1,75 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
new file mode 100644
index 000000000..b188ac936
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
@@ -0,0 +1,28 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
new file mode 100644
index 000000000..58ccc6894
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
@@ -0,0 +1,24 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php
new file mode 100644
index 000000000..b967ff566
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php
@@ -0,0 +1,21 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
new file mode 100644
index 000000000..32484d601
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
@@ -0,0 +1,21 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
new file mode 100644
index 000000000..7a65e0048
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
@@ -0,0 +1,87 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
new file mode 100644
index 000000000..76fd93a6c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
@@ -0,0 +1,228 @@
+<?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;
+                    }
+                    $e->{$type}[$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()
+    {
+        return array();
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
new file mode 100644
index 000000000..a995161b2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
@@ -0,0 +1,33 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
new file mode 100644
index 000000000..332643821
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -0,0 +1,34 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
new file mode 100644
index 000000000..803c44fab
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
@@ -0,0 +1,43 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
new file mode 100644
index 000000000..c095ad974
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
@@ -0,0 +1,16 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
new file mode 100644
index 000000000..3ecddc434
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
@@ -0,0 +1,26 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
new file mode 100644
index 000000000..9ee3ffcc9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
@@ -0,0 +1,182 @@
+<?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 table, hr, td, th, col ------------------------------------------
+        $r['table@width'] =
+        $r['td@width'] =
+        $r['th@width'] =
+        $r['col@width'] =
+        $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
+
+        return $r;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
new file mode 100644
index 000000000..01dbe9deb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
@@ -0,0 +1,20 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
new file mode 100644
index 000000000..38c058fe2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
@@ -0,0 +1,467 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
new file mode 100644
index 000000000..65c902c07
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
@@ -0,0 +1,57 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
new file mode 100644
index 000000000..116b470c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
@@ -0,0 +1,283 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
new file mode 100644
index 000000000..4afdd128d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
@@ -0,0 +1,356 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
new file mode 100644
index 000000000..c19b1bc27
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
new file mode 100644
index 000000000..3b6d70f6e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
@@ -0,0 +1,67 @@
+<?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);
+
+        if ($bits === false) {
+            return;
+        }
+
+        $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
new file mode 100644
index 000000000..cb9046f33
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
@@ -0,0 +1,71 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
new file mode 100644
index 000000000..0ebc477c6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
@@ -0,0 +1,112 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
new file mode 100644
index 000000000..42d514447
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
@@ -0,0 +1,95 @@
+<?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;
+
+    /**
+     * @type SplObjectStorage
+     */
+    private $markForDeletion;
+
+    public function __construct()
+    {
+        $this->markForDeletion = new SplObjectStorage();
+    }
+
+    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
+            $this->markForDeletion->attach($current);
+            // Delete open span tag
+            $token = false;
+        }
+    }
+
+    /**
+     * @param HTMLPurifier_Token $token
+     */
+    public function handleEnd(&$token)
+    {
+        if ($this->markForDeletion->contains($token)) {
+            $this->markForDeletion->detach($token);
+            $token = false;
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
new file mode 100644
index 000000000..317f7864d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
@@ -0,0 +1,124 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
new file mode 100644
index 000000000..65277dd43
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
@@ -0,0 +1,204 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
new file mode 100644
index 000000000..c7f197e1e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
@@ -0,0 +1,55 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
new file mode 100644
index 000000000..16a4f6932
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
@@ -0,0 +1,209 @@
+<?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)) {
+                $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
new file mode 100644
index 000000000..b6ea12345
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
@@ -0,0 +1,162 @@
+<?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 ($this->unit === false || !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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
new file mode 100644
index 000000000..1f552a17a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
@@ -0,0 +1,387 @@
+<?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;
+
+    /**
+     * @type HTMLPurifier_EntityParser
+     */
+    private $_entity_parser;
+
+    // -- 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') &&
+                        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", (string)$html);
+            $html = str_replace("\r", "\n", (string)$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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
new file mode 100644
index 000000000..5e8104be9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
@@ -0,0 +1,337 @@
+<?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.
+     */
+    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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
new file mode 100644
index 000000000..6f1308966
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
@@ -0,0 +1,539 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
new file mode 100644
index 000000000..1564f283d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
@@ -0,0 +1,4788 @@
+<?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'], (string)$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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
new file mode 100644
index 000000000..3995fec9f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
@@ -0,0 +1,49 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
new file mode 100644
index 000000000..38ba19394
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
@@ -0,0 +1,36 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
new file mode 100644
index 000000000..6cbf56dad
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
@@ -0,0 +1,59 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
new file mode 100644
index 000000000..aec916647
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
@@ -0,0 +1,54 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
new file mode 100644
index 000000000..18c8bbb00
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
@@ -0,0 +1,111 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
new file mode 100644
index 000000000..549e4cea1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
@@ -0,0 +1,218 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
new file mode 100644
index 000000000..29505fe12
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
new file mode 100644
index 000000000..3ff1a88aa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
@@ -0,0 +1,10 @@
+
+.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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
new file mode 100644
index 000000000..cba00c9b8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
@@ -0,0 +1,5 @@
+function toggleWriteability(id_of_patient, checked) {
+    document.getElementById(id_of_patient).disabled = checked;
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
new file mode 100644
index 000000000..4c3ce1758
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
@@ -0,0 +1,456 @@
+<?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;
+
+    /**
+     * @var HTMLPurifier_Config
+     */
+    protected $genConfig;
+
+    /**
+     * @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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
new file mode 100644
index 000000000..ae8639176
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
@@ -0,0 +1,324 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
new file mode 100644
index 000000000..189348fd9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
@@ -0,0 +1,122 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
new file mode 100644
index 000000000..f68fc8c30
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
@@ -0,0 +1,43 @@
+<?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
+     */
+    #[\ReturnTypeWillChange]
+    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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
new file mode 100644
index 000000000..f58db9042
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
@@ -0,0 +1,56 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
new file mode 100644
index 000000000..e1ff3b72d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
@@ -0,0 +1,26 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
new file mode 100644
index 000000000..d7d35ce7d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
@@ -0,0 +1,30 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
new file mode 100644
index 000000000..4414c17d6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
@@ -0,0 +1,17 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
new file mode 100644
index 000000000..6fa673db9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
@@ -0,0 +1,181 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
new file mode 100644
index 000000000..a6eb09e45
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -0,0 +1,659 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
new file mode 100644
index 000000000..1a8149ecc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
@@ -0,0 +1,207 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
new file mode 100644
index 000000000..fbb3d27c8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
@@ -0,0 +1,45 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
new file mode 100644
index 000000000..c41ae3a76
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
@@ -0,0 +1,48 @@
+<?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
+     */
+    #[\ReturnTypeWillChange]
+    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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
new file mode 100644
index 000000000..7c73f8083
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
@@ -0,0 +1,136 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
new file mode 100644
index 000000000..7b8d83343
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
@@ -0,0 +1,37 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
new file mode 100644
index 000000000..768c9b153
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
@@ -0,0 +1,114 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
new file mode 100644
index 000000000..71bf10b91
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
new file mode 100644
index 000000000..84d3619a3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
@@ -0,0 +1,100 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
new file mode 100644
index 000000000..23453c705
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
@@ -0,0 +1,38 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
new file mode 100644
index 000000000..78a95f555
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
@@ -0,0 +1,15 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
new file mode 100644
index 000000000..59b38fdc5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
@@ -0,0 +1,24 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
new file mode 100644
index 000000000..019f317ad
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Concrete start token class.
+ */
+class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
+{
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
new file mode 100644
index 000000000..d643fa64e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
@@ -0,0 +1,68 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
new file mode 100644
index 000000000..f26a1c211
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
@@ -0,0 +1,53 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
new file mode 100644
index 000000000..dea2446b9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
@@ -0,0 +1,118 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
new file mode 100644
index 000000000..9c5be39d1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
@@ -0,0 +1,316 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
new file mode 100644
index 000000000..e0bd8bcca
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
@@ -0,0 +1,112 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
new file mode 100644
index 000000000..09724e9f4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
@@ -0,0 +1,74 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
new file mode 100644
index 000000000..ced1b1376
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
@@ -0,0 +1,54 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
new file mode 100644
index 000000000..c6562169e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
@@ -0,0 +1,25 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
new file mode 100644
index 000000000..d5c412c44
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
@@ -0,0 +1,22 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
new file mode 100644
index 000000000..32197c0e6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
@@ -0,0 +1,46 @@
+<?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 ($uri->host !== null && strpos($uri->host, $blacklisted_host_fragment) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
new file mode 100644
index 000000000..c507bbff8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
@@ -0,0 +1,158 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
new file mode 100644
index 000000000..e1393deb7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
@@ -0,0 +1,115 @@
+<?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 : '';
+        $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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
new file mode 100644
index 000000000..f609c47a3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
@@ -0,0 +1,68 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
new file mode 100644
index 000000000..0e7381a07
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
@@ -0,0 +1,71 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
new file mode 100644
index 000000000..fe9e82cf2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
@@ -0,0 +1,102 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
new file mode 100644
index 000000000..41c49d553
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
@@ -0,0 +1,136 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
new file mode 100644
index 000000000..215be4ba8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
@@ -0,0 +1,44 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
new file mode 100644
index 000000000..1eb43ee5c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
@@ -0,0 +1,58 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
new file mode 100644
index 000000000..ce69ec438
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
@@ -0,0 +1,36 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
new file mode 100644
index 000000000..0e96882db
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
@@ -0,0 +1,18 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
new file mode 100644
index 000000000..c3a6b602a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
@@ -0,0 +1,40 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
new file mode 100644
index 000000000..7490927d6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
@@ -0,0 +1,35 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
new file mode 100644
index 000000000..f211d715e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
@@ -0,0 +1,32 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php
new file mode 100644
index 000000000..dfad8efcf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php
@@ -0,0 +1,46 @@
+<?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, commas, and 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', rawurldecode($uri->path)));
+
+        return true;
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
new file mode 100644
index 000000000..4ac8a0b76
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
@@ -0,0 +1,81 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
new file mode 100644
index 000000000..b5a1eab5c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
@@ -0,0 +1,307 @@
+<?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((float)$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((float)$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 number_format((float)$r, $scale, '.', '');
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
new file mode 100644
index 000000000..0c97c8289
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
@@ -0,0 +1,198 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
new file mode 100644
index 000000000..3bfbe8386
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
@@ -0,0 +1,130 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
new file mode 100644
index 000000000..f11c318ef
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
@@ -0,0 +1,38 @@
+<?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/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
new file mode 100644
index 000000000..5df341495
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Exception type for HTMLPurifier_VarParser
+ */
+class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
+{
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
new file mode 100644
index 000000000..6e21ea070
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
@@ -0,0 +1,157 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.editorconfig b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.editorconfig
new file mode 100644
index 000000000..f7cd91427
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.phive/phars.xml b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.phive/phars.xml
new file mode 100644
index 000000000..569106af2
--- /dev/null
+++ b/libraries/phpspreadsheet/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.3.1" location="./tools/phpdocumentor" copy="false"/>
+</phive>
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..b978f0646
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php
@@ -0,0 +1,71 @@
+<?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_blank_line_before_namespace' => 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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.phpdoc/template/base.html.twig b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.phpdoc/template/base.html.twig
new file mode 100644
index 000000000..b7507fb9c
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.tool-versions b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.tool-versions
new file mode 100644
index 000000000..261817810
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/.tool-versions
@@ -0,0 +1 @@
+php 8.2.5
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/LICENSE b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/LICENSE
new file mode 100644
index 000000000..ebe7fe2f8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/LICENSE
@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (C) 2007-2009 Paul Duncan <pabs@pablotron.org>
+Copyright (C) 2014 Jonatan Männchen <jonatan@maennchen.ch>
+Copyright (C) 2014 Jesse G. Donat <donatj@gmail.com>
+Copyright (C) 2018 Nicolas CARPi <nicolas.carpi@curie.fr>
+
+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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/README.md b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/README.md
new file mode 100644
index 000000000..8ebb2c3cf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/README.md
@@ -0,0 +1,183 @@
+# 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)
+
+## 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.
+
+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:
+
+```bash
+composer require maennchen/zipstream-php
+```
+
+## Usage
+
+For detailed instructions, please check the
+[Documentation](https://maennchen.github.io/ZipStream-PHP/).
+
+```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',
+);
+
+// finish the zip stream
+$zip->finish();
+```
+
+## 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
+
+https://github.com/maennchen/ZipStream-PHP/tree/2.0.0#upgrade-to-version-200
+
+## Upgrade to version 1.0.0
+
+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
+[.github/CONTRIBUTING.md](.github/CONTRIBUTING.md) file.
+
+## Version Support
+
+Versions are supported according to the table below.
+
+Please do not open any pull requests contradicting the current version support
+status.
+
+Careful: Always check the `README` on `main` for up-to-date information.
+
+| Version | New Features | Bugfixes | Security |
+|---------|--------------|----------|----------|
+| *3*     | ✓            | ✓        | ✓        |
+| *2*     | ✗            | ✓        | ✓        |
+| *1*     | ✗            | ✗        | ✓        |
+| *0*     | ✗            | ✗        | ✗        |
+
+This library aligns itself with the PHP core support. New features and bugfixes
+will only target PHP versions according to their current status.
+
+See: https://www.php.net/supported-versions.php
+
+## 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
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute.
+[[Contribute](.github/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>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/zipstream/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/zipstream"><img src="https://opencollective.com/zipstream/individuals.svg?width=890"></a>
+
+#### 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)]
+
+<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>
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/composer.json b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/composer.json
new file mode 100644
index 000000000..98c536a43
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/composer.json
@@ -0,0 +1,88 @@
+{
+  "name": "maennchen/zipstream-php",
+  "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+  "keywords": ["zip", "stream"],
+  "type": "library",
+  "license": "MIT",
+  "authors": [{
+      "name": "Paul Duncan",
+      "email": "pabs@pablotron.org"
+    },
+    {
+      "name": "Jonatan Männchen",
+      "email": "jonatan@maennchen.ch"
+    },
+    {
+      "name": "Jesse Donat",
+      "email": "donatj@gmail.com"
+    },
+    {
+      "name": "András Kolesár",
+      "email": "kolesar@kolesar.hu"
+    }
+  ],
+  "require": {
+    "php-64bit": "^8.1",
+    "ext-mbstring": "*",
+    "ext-zlib": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^10.0",
+    "guzzlehttp/guzzle": "^7.5",
+    "ext-zip": "*",
+    "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",
+    "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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/ContentLength.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/ContentLength.rst
new file mode 100644
index 000000000..21fea34d7
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/FlySystem.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/FlySystem.rst
new file mode 100644
index 000000000..4e6c6fb82
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Nginx.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Nginx.rst
new file mode 100644
index 000000000..c53d3000e
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Options.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Options.rst
new file mode 100644
index 000000000..5e92e94d6
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst
new file mode 100644
index 000000000..22af71d4a
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/StreamOutput.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/StreamOutput.rst
new file mode 100644
index 000000000..9f3165b75
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Symfony.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Symfony.rst
new file mode 100644
index 000000000..902552c92
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Varnish.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/Varnish.rst
new file mode 100644
index 000000000..952d28749
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/index.rst b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/guides/index.rst
new file mode 100644
index 000000000..4583ca58e
--- /dev/null
+++ b/libraries/phpspreadsheet/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/146>`_.
+
+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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/phpdoc.dist.xml b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/phpdoc.dist.xml
new file mode 100644
index 000000000..b98fe1cd2
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/phpunit.xml.dist b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/phpunit.xml.dist
new file mode 100644
index 000000000..1b02a3af8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/phpunit.xml.dist
@@ -0,0 +1,15 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/psalm.xml b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/psalm.xml
new file mode 100644
index 000000000..5d050d14a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/psalm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<psalm
+    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"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <!-- Turn off dead code warnings for externally called functions -->
+        <PossiblyUnusedProperty errorLevel="suppress" />
+        <PossiblyUnusedMethod errorLevel="suppress" />
+        <PossiblyUnusedReturnValue errorLevel="suppress" />
+    </issueHandlers>
+</psalm>
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php
new file mode 100644
index 000000000..ffcfc6e97
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/CompressionMethod.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/CompressionMethod.php
new file mode 100644
index 000000000..51e436370
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/DataDescriptor.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/DataDescriptor.php
new file mode 100644
index 000000000..04146190d
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php
new file mode 100644
index 000000000..4320addc3
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception.php
new file mode 100644
index 000000000..27f4f3010
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+abstract class Exception extends \Exception
+{
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php
new file mode 100644
index 000000000..b8d050808
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
new file mode 100644
index 000000000..350a7bfe5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class FileNotFoundException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly string $path
+    ) {
+        parent::__construct("The file with the path $path wasn't found.");
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
new file mode 100644
index 000000000..93d0c6c64
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class FileNotReadableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly string $path
+    ) {
+        parent::__construct("The file with the path $path isn't readable.");
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php
new file mode 100644
index 000000000..11f0b67b3
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
new file mode 100644
index 000000000..09bdafb28
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a counter value exceeds storage size
+ */
+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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php
new file mode 100644
index 000000000..cbd9b0bb9
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php
new file mode 100644
index 000000000..717c1aafe
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
new file mode 100644
index 000000000..c1446735a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a stream can't be read.
+ */
+class StreamNotReadableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('The stream could not be read.');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php
new file mode 100644
index 000000000..606f11f14
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/File.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/File.php
new file mode 100644
index 000000000..3f35de466
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/File.php
@@ -0,0 +1,420 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use Closure;
+use DateTimeInterface;
+use DeflateContext;
+use RuntimeException;
+use ZipStream\Exception\FileSizeIncorrectException;
+use ZipStream\Exception\OverflowException;
+use ZipStream\Exception\ResourceActionException;
+use ZipStream\Exception\SimulationFileUnknownException;
+use ZipStream\Exception\StreamNotReadableException;
+use ZipStream\Exception\StreamNotSeekableException;
+
+/**
+ * @internal
+ */
+class File
+{
+    private const CHUNKED_READ_BLOCK_SIZE = 0x1000000;
+
+    private Version $version;
+
+    private int $compressedSize = 0;
+
+    private int $uncompressedSize = 0;
+
+    private int $crc = 0;
+
+    private int $generalPurposeBitFlag = 0;
+
+    private readonly string $fileName;
+
+    /**
+     * @var resource|null
+     */
+    private $stream;
+
+    /**
+     * @param Closure $dataCallback
+     * @psalm-param Closure(): resource $dataCallback
+     */
+    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;
+        }
+
+        $this->version = $this->compressionMethod === CompressionMethod::DEFLATE ? Version::DEFLATE : Version::STORE;
+    }
+
+    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,
+        );
+    }
+
+    public function process(): string
+    {
+        $forecastSize = $this->forecastSize();
+
+        if ($this->enableZeroHeader) {
+            // No calculation required
+        } elseif ($this->isSimulation() && $forecastSize) {
+            $this->uncompressedSize = $forecastSize;
+            $this->compressedSize = $forecastSize;
+        } else {
+            $this->readStream(send: false);
+            if (rewind($this->unpackStream()) === false) {
+                throw new ResourceActionException('rewind', $this->unpackStream());
+            }
+        }
+
+        $this->addFileHeader();
+
+        $detectedSize = $forecastSize ?? $this->compressedSize;
+
+        if (
+            $this->isSimulation() &&
+            $detectedSize > 0
+        ) {
+            ($this->recordSentBytes)($detectedSize);
+        } else {
+            $this->readStream(send: true);
+        }
+
+        $this->addFileFooter();
+        return $this->getCdrFile();
+    }
+
+    /**
+     * @return resource
+     */
+    private function unpackStream()
+    {
+        if ($this->stream) {
+            return $this->stream;
+        }
+
+        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;
+    }
+
+    private function forecastSize(): ?int
+    {
+        if ($this->compressionMethod !== CompressionMethod::STORE) {
+            return null;
+        }
+        if ($this->exactSize) {
+            return $this->exactSize;
+        }
+        $fstat = fstat($this->unpackStream());
+        if (!$fstat || !array_key_exists('size', $fstat) || $fstat['size'] < 1) {
+            return null;
+        }
+
+        if ($this->maxSize !== null && $this->maxSize < $fstat['size']) {
+            return $this->maxSize;
+        }
+
+        return $fstat['size'];
+    }
+
+    /**
+     * Create and send zip header for this file.
+     */
+    private function addFileHeader(): void
+    {
+        $forceEnableZip64 = $this->enableZeroHeader && $this->enableZip64;
+
+        $footer = $this->buildZip64ExtraBlock($forceEnableZip64);
+
+        $zip64Enabled = $footer !== '';
+
+        if($zip64Enabled) {
+            $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();
+        }
+
+        $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
+     */
+    private static function filterFilename(
+        /**
+         * Unprocessed filename
+         */
+        string $fileName
+    ): string {
+        // strip leading slashes from file name
+        // (fixes bug in windows archive viewer)
+        $fileName = ltrim($fileName, '/');
+
+        return str_replace(['\\', ':', '*', '?', '"', '<', '>', '|'], '_', $fileName);
+    }
+
+    private function checkEncoding(): void
+    {
+        // 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;
+        }
+    }
+
+    private function buildZip64ExtraBlock(bool $force = false): string
+    {
+        $outputZip64ExtraBlock = false;
+
+        $originalSize = null;
+        if ($force || $this->uncompressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $originalSize = $this->uncompressedSize;
+        }
+
+        $compressedSize = null;
+        if ($force || $this->compressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $compressedSize = $this->compressedSize;
+        }
+
+        // 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 (!$outputZip64ExtraBlock) {
+            return '';
+        }
+
+        if (!$this->enableZip64) {
+            throw new OverflowException();
+        }
+
+        return Zip64\ExtendedInformationExtraField::generate(
+            originalSize: $originalSize,
+            compressedSize: $compressedSize,
+            relativeHeaderOffset: $relativeHeaderOffset,
+            diskStartNumber: null,
+        );
+    }
+
+    private function addFileFooter(): void
+    {
+        if (($this->compressedSize > 0xFFFFFFFF || $this->uncompressedSize > 0xFFFFFFFF) && $this->version !== Version::ZIP64) {
+            throw new OverflowException();
+        }
+
+        if (!$this->enableZeroHeader) {
+            return;
+        }
+
+        if ($this->version === Version::ZIP64) {
+            $footer = Zip64\DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
+        } else {
+            $footer = DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
+        }
+
+        ($this->send)($footer);
+    }
+
+    private function readStream(bool $send): void
+    {
+        $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->compressedSize += strlen($data);
+
+            if ($send) {
+                ($this->send)($data);
+            }
+        }
+
+        if ($this->exactSize && $this->uncompressedSize !== $this->exactSize) {
+            throw new FileSizeIncorrectException(expectedSize: $this->exactSize, actualSize: $this->uncompressedSize);
+        }
+
+        $this->crc = hexdec(hash_final($hash));
+    }
+
+    private function compressionInit(): ?DeflateContext
+    {
+        switch($this->compressionMethod) {
+            case CompressionMethod::STORE:
+                // Noting to do
+                return null;
+            case CompressionMethod::DEFLATE:
+                $deflateContext = deflate_init(
+                    ZLIB_ENCODING_RAW,
+                    ['level' => $this->deflateLevel]
+                );
+
+                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
+        }
+    }
+
+    private function getCdrFile(): string
+    {
+        $footer = $this->buildZip64ExtraBlock();
+
+        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,
+        );
+    }
+
+    private function isSimulation(): bool
+    {
+        return $this->operationMode === OperationMode::SIMULATE_LAX || $this->operationMode === OperationMode::SIMULATE_STRICT;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php
new file mode 100644
index 000000000..23a66d889
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/LocalFileHeader.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/LocalFileHeader.php
new file mode 100644
index 000000000..e08b65610
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/OperationMode.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/OperationMode.php
new file mode 100644
index 000000000..dd650f070
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/PackField.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/PackField.php
new file mode 100644
index 000000000..3370dd8d0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/PackField.php
@@ -0,0 +1,57 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Time.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Time.php
new file mode 100644
index 000000000..4bfba3cc5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Time.php
@@ -0,0 +1,45 @@
+<?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' => $year,
+            'mon' => $month,
+            'mday' => $day,
+            'hours' => $hour,
+            'minutes' => $minute,
+            'seconds' => $second
+        ] = getdate($dateTime->getTimestamp());
+
+        return
+            ($year << 25) |
+            ($month << 21) |
+            ($day << 16) |
+            ($hour << 11) |
+            ($minute << 5) |
+            ($second >> 1);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Version.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Version.php
new file mode 100644
index 000000000..c014f8a10
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php
new file mode 100644
index 000000000..041c5579d
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php
new file mode 100644
index 000000000..08588e49c
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php
new file mode 100644
index 000000000..ef431c347
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
new file mode 100644
index 000000000..b647ce6cd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
@@ -0,0 +1,46 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/ZipStream.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/ZipStream.php
new file mode 100644
index 000000000..cd308a493
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/ZipStream.php
@@ -0,0 +1,864 @@
+<?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\Exception\ResourceActionException;
+
+/**
+ * Streamed, dynamically generated zip archives.
+ *
+ * ## Usage
+ *
+ * Streaming zip archives is a simple, three-step process:
+ *
+ * 1.  Create the zip stream:
+ *
+ * ```php
+ * $zip = new ZipStream(outputName: 'example.zip');
+ * ```
+ *
+ * 2.  Add one or more files to the archive:
+ *
+ * ```php
+ * // add first file
+ * $zip->addFile(fileName: 'world.txt', data: 'Hello World');
+ *
+ * // add second file
+ * $zip->addFile(fileName: 'moon.txt', data: 'Hello Moon');
+ * ```
+ *
+ * 3.  Finish the zip stream:
+ *
+ * ```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
+ *
+ * ```php
+ * // create a new zip stream object
+ * $zip = new ZipStream(outputName: 'some_files.zip');
+ *
+ * // list of local files
+ * $files = array('foo.txt', 'bar.jpg');
+ *
+ * // read and add each file to the archive
+ * foreach ($files as $path)
+ *   $zip->addFileFormPath(fileName: $path, $path);
+ *
+ * // write archive footer to stream
+ * $zip->finish();
+ * ```
+ */
+class ZipStream
+{
+    /**
+     * This number corresponds to the ZIP version/OS used (2 bytes)
+     * From: https://www.iana.org/assignments/media-types/application/zip
+     * The upper byte (leftmost one) indicates the host system (OS) for the
+     * file.  Software can use this information to determine
+     * the line record format for text files etc.  The current
+     * mappings are:
+     *
+     * 0 - MS-DOS and OS/2 (F.A.T. file systems)
+     * 1 - Amiga                     2 - VAX/VMS
+     * 3 - *nix                      4 - VM/CMS
+     * 5 - Atari ST                  6 - OS/2 H.P.F.S.
+     * 7 - Macintosh                 8 - Z-System
+     * 9 - CP/M                      10 thru 255 - unused
+     *
+     * The lower byte (rightmost one) indicates the version number of the
+     * software used to encode the file.  The value/10
+     * indicates the major version number, and the value
+     * mod 10 is the minor version number.
+     * 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
+     *
+     * @internal
+     */
+    public const ZIP_VERSION_MADE_BY = 0x603;
+
+    private bool $ready = true;
+
+    private int $offset = 0;
+
+    /**
+     * @var string[]
+     */
+    private array $centralDirectoryRecords = [];
+
+    /**
+     * @var resource
+     */
+    private $outputStream;
+
+    private readonly Closure $httpHeaderCallback;
+
+    /**
+     * @var File[]
+     */
+    private array $recordedSimulation = [];
+
+    /**
+     * Create a new ZipStream object.
+     *
+     * ##### 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 bool $enableZip64
+     * Enable Zip64 extension, supporting very large
+     * archives (any size > 4 GB or file count > 64k)
+     *
+     * @param bool $defaultEnableZeroHeader
+     * Enable streaming files with single read.
+     *
+     * 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.)
+     *
+     * 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.
+     *
+     * @param bool $sendHttpHeaders
+     * Boolean indicating whether or not to send
+     * the HTTP headers for this file.
+     *
+     * @param ?Closure $httpHeaderCallback
+     * The method called to send HTTP headers
+     *
+     * @param string|null $outputName
+     * The name of the created archive.
+     *
+     * Only relevant if `$sendHttpHeaders = true`.
+     *
+     * @param string $contentDisposition
+     * HTTP Content-Disposition
+     *
+     * 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(
+        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(...);
+    }
+
+    /**
+     * Add a file to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // add a file named 'world.txt'
+     * $zip->addFile(fileName: 'world.txt', data: 'Hello World!');
+     *
+     * // 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'),
+     * );
+     * ```
+     *
+     * @param string $data
+     *
+     * contents of file
+     */
+    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,
+        );
+    }
+
+    /**
+     * Add a file at path to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ###### 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 'bigfile.rar' from the local file
+     * // '/usr/share/bigfile.rar' with a comment and a last-modified
+     * // time of two hours ago
+     * $zip->addFile(
+     *   fileName: 'bigfile.rar',
+     *   path: '/usr/share/bigfile.rar',
+     *   comment: 'this is a comment about bigfile.rar',
+     *   lastModificationDateTime: new DateTime('2 hours ago'),
+     * );
+     * ```
+     *
+     * @throws \ZipStream\Exception\FileNotFoundException
+     * @throws \ZipStream\Exception\FileNotReadableException
+     */
+    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);
+        }
+
+        if ($fileTime = filemtime($path)) {
+            $lastModificationDateTime ??= (new DateTimeImmutable())->setTimestamp($fileTime);
+        }
+
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: function () use ($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,
+        );
+    }
+
+    /**
+     * Add an open stream (resource) to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```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
+     * $archive->addFileFromStream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $filePointer,
+     * );
+     * ```
+     *
+     * @param resource $stream contents of file as a stream resource
+     */
+    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,
+        );
+    }
+
+    /**
+     * Add an open stream to the archive.
+     *
+     * ##### Examples
+     *
+     * ```php
+     * $stream = $response->getBody();
+     * // add a file named 'streamfile.txt' from the content of the stream
+     * $archive->addFileFromPsr7Stream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $stream,
+     * );
+     * ```
+     *
+     * @param string $fileName
+     * path of file in archive (including directory)
+     *
+     * @param StreamInterface $stream
+     * contents of file as a stream resource
+     *
+     * @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 addFileFromPsr7Stream(
+        string $fileName,
+        StreamInterface $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,
+        );
+    }
+
+    /**
+     * 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->addFileFromPsr7Stream(
+     *     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->addFile(fileName: 'world/');
+     * ```
+     */
+    public function addDirectory(
+        string $fileName,
+        string $comment = '',
+        ?DateTimeInterface $lastModificationDateTime = null,
+    ): void {
+        if (!str_ends_with($fileName, '/')) {
+            $fileName .= '/';
+        }
+
+        $this->addFile(
+            fileName: $fileName,
+            data: '',
+            comment: $comment,
+            compressionMethod: CompressionMethod::STORE,
+            deflateLevel: null,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: 0,
+            exactSize: 0,
+            enableZeroHeader: false,
+        );
+    }
+
+    /**
+     * Executes a previously calculated simulation.
+     *
+     * ##### Example
+     *
+     * ```php
+     * $zip = new ZipStream(
+     *   outputName: 'foo.zip',
+     *   operationMode: OperationMode::SIMULATE_STRICT,
+     * );
+     *
+     * $zip->addFile('test.txt', 'Hello World');
+     *
+     * $size = $zip->finish();
+     *
+     * header('Content-Length: '. $size);
+     *
+     * $zip->executeSimulation();
+     * ```
+     */
+    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->centralDirectoryRecords as $centralDirectoryRecord) {
+            $this->send($centralDirectoryRecord);
+            $sizeOfCentralDirectory += strlen($centralDirectoryRecord);
+        }
+
+        // Add 64bit headers (if applicable)
+        if (count($this->centralDirectoryRecords) >= 0xFFFF ||
+            $centralDirectoryStartOffsetOnDisk > 0xFFFFFFFF ||
+            $sizeOfCentralDirectory > 0xFFFFFFFF) {
+            if (!$this->enableZip64) {
+                throw new OverflowException();
+            }
+
+            $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
+        $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;
+    }
+
+    /**
+     * @param StreamInterface|resource|null $outputStream
+     * @return resource
+     */
+    private static function normalizeStream($outputStream)
+    {
+        if ($outputStream instanceof StreamInterface) {
+            return StreamWrapper::getResource($outputStream);
+        }
+        if (is_resource($outputStream)) {
+            return $outputStream;
+        }
+        return fopen('php://output', 'wb');
+    }
+
+    /**
+     * Record sent bytes
+     */
+    private function recordSentBytes(int $sentBytes): void
+    {
+        $this->offset += $sentBytes;
+    }
+
+    /**
+     * Send string, sending HTTP headers if necessary.
+     * Flush output after write if configure option is set.
+     */
+    private function send(string $data): void
+    {
+        if (!$this->ready) {
+            throw new RuntimeException('Archive is already finished');
+        }
+
+        if ($this->operationMode === OperationMode::NORMAL && $this->sendHttpHeaders) {
+            $this->sendHttpHeaders();
+            $this->sendHttpHeaders = false;
+        }
+
+        $this->recordSentBytes(strlen($data));
+
+        if ($this->operationMode === OperationMode::NORMAL) {
+            if (fwrite($this->outputStream, $data) === false) {
+                throw new ResourceActionException('fwrite', $this->outputStream);
+            }
+
+            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.
+     */
+    private function sendHttpHeaders(): void
+    {
+        // grab content disposition
+        $disposition = $this->contentDisposition;
+
+        if ($this->outputName) {
+            // Various different browsers dislike various characters here. Strip them all for safety.
+            $safeOutput = trim(str_replace(['"', "'", '\\', ';', "\n", "\r"], '', $this->outputName));
+
+            // Check if we need to UTF-8 encode the filename
+            $urlencoded = rawurlencode($safeOutput);
+            $disposition .= "; filename*=UTF-8''{$urlencoded}";
+        }
+
+        $headers = [
+            'Content-Type' => $this->contentType,
+            'Content-Disposition' => $disposition,
+            'Pragma' => 'public',
+            'Cache-Control' => 'public, must-revalidate',
+            'Content-Transfer-Encoding' => 'binary',
+        ];
+
+        foreach ($headers as $key => $val) {
+            ($this->httpHeaderCallback)("$key: $val");
+        }
+    }
+
+    /**
+     * Clear all internal variables. Note that the stream object is not
+     * usable after this.
+     */
+    private function clear(): void
+    {
+        $this->centralDirectoryRecords = [];
+        $this->offset = 0;
+
+        if($this->operationMode === OperationMode::NORMAL) {
+            $this->ready = false;
+            $this->recordedSimulation = [];
+        } else {
+            $this->operationMode = OperationMode::NORMAL;
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php
new file mode 100644
index 000000000..bf621bc09
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Assertions.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Assertions.php
new file mode 100644
index 000000000..900b7cc52
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php
new file mode 100644
index 000000000..5457b4f44
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php
new file mode 100644
index 000000000..cc886c74b
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php
new file mode 100644
index 000000000..be0a90743
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
new file mode 100644
index 000000000..4f1cf5c32
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
@@ -0,0 +1,106 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php
new file mode 100644
index 000000000..3d4440e8a
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php
new file mode 100644
index 000000000..196dd0fe3
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/PackFieldTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/PackFieldTest.php
new file mode 100644
index 000000000..ecd66bac7
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ResourceStream.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ResourceStream.php
new file mode 100644
index 000000000..8a414719a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ResourceStream.php
@@ -0,0 +1,160 @@
+<?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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/TimeTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/TimeTest.php
new file mode 100644
index 000000000..25aed277f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/TimeTest.php
@@ -0,0 +1,35 @@
+<?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
+        );
+    }
+
+    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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Util.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Util.php
new file mode 100644
index 000000000..4ec743e7c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Util.php
@@ -0,0 +1,135 @@
+<?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 getTmpFileStream(): array
+    {
+        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
+        $stream = fopen($tmp, 'wb+');
+
+        return [$tmp, $stream];
+    }
+
+    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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php
new file mode 100644
index 000000000..49fb2ccb2
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php
new file mode 100644
index 000000000..271a29862
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php
new file mode 100644
index 000000000..b86fb1781
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 000000000..904783d86
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ZipStreamTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
new file mode 100644
index 000000000..6e6902025
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
@@ -0,0 +1,1284 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\StreamWrapper;
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+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;
+
+class ZipStreamTest extends TestCase
+{
+    use Util;
+    use Assertions;
+
+    public function testAddFile(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $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
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame([$name], $files);
+        $this->assertStringEqualsFile($tmpDir . '/' . $name, $content);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+        $this->assertSame($comment, $zipArchive->getCommentName($name));
+    }
+
+    public function testAddFileUtf8NameNonUtfComment(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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();
+        fclose($stream);
+
+        $zipArch = new ZipArchive();
+        $zipArch->open($tmp);
+        $this->assertSame($guessComment, $zipArch->getCommentName($name));
+        $this->assertSame($comment, $zipArch->getCommentName($name, ZipArchive::FL_ENC_RAW));
+    }
+
+    public function testAddFileWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $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 testAddFileFromPath(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $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 testAddFileFromPathFileNotFoundException(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        // Get ZipStream Object
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        // Trigger error by adding a file which doesn't exist
+        $zip->addFileFromPath(fileName: 'foobar.php', path: '/foo/bar/foobar.php');
+    }
+
+    public function testAddFileFromPathFileNotReadableException(): void
+    {
+        $this->expectException(FileNotReadableException::class);
+
+
+        [, $stream] = $this->getTmpFileStream();
+
+
+        // create new virtual filesystem
+        $root = vfsStream::setup('vfs');
+        // create a virtual file with no permissions
+        $file = vfsStream::newFile('foo.txt', 0)->at($root)->setContent('bar');
+
+        // Get ZipStream Object
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFileFromPath('foo.txt', $file->url());
+    }
+
+    public function testAddFileFromPathWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        [$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);
+
+        $zip->finish();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $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']);
+
+        $zipArchive->close();
+    }
+
+    public function testAddLargeFileFromPath(): void
+    {
+        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
+                    );
+                }
+            }
+        }
+    }
+
+    public function testAddFileFromStream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        // 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);
+
+        $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);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile(__FILE__, file_get_contents($tmpDir . '/sample.txt'));
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testAddFileFromStreamUnreadableInput(): void
+    {
+        $this->expectException(StreamNotReadableException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+        [$tmpInput] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $streamUnreadable = fopen($tmpInput, 'w');
+
+        $zip->addFileFromStream('sample.json', $streamUnreadable);
+    }
+
+    public function testAddFileFromStreamBrokenOutputWrite(): void
+    {
+        $this->expectException(ResourceActionException::class);
+
+        $outputStream = FaultInjectionResource::getResource(['stream_write']);
+
+        $zip = new ZipStream(
+            outputStream: $outputStream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'foobar');
+    }
+
+    public function testAddFileFromStreamBrokenInputRewind(): void
+    {
+        $this->expectException(ResourceActionException::class);
+
+        [,$stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        $fileStream = FaultInjectionResource::getResource(['stream_seek']);
+
+        $zip->addFileFromStream('sample.txt', $fileStream, maxSize: 0);
+    }
+
+    public function testAddFileFromStreamUnseekableInputWithoutZeroHeader(): void
+    {
+        $this->expectException(StreamNotSeekableException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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');
+        }
+
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 2);
+    }
+
+    public function testAddFileFromStreamUnseekableInputWithZeroHeader(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: true,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        $streamUnseekable = StreamWrapper::getResource(new class ('test') extends EndlessCycleStream {
+            public function isSeekable(): bool
+            {
+                return false;
+            }
+
+            public function seek(int $offset, int $whence = SEEK_SET): void
+            {
+                throw new RuntimeException('Not seekable');
+            }
+        });
+
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 7);
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(filesize($tmpDir . '/sample.txt'), 7);
+    }
+
+    public function testAddFileFromStreamWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $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);
+
+        $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);
+
+        $zip->finish();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $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']);
+
+        $zipArchive->close();
+    }
+
+    public function testAddFileFromPsr7Stream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileFromPsr7Stream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $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 testContinueFinishedZip(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+        $zip->finish();
+
+        $zip->addFile('sample.txt', '1234');
+    }
+
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithoutZip64(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+        );
+
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
+
+        $zip->finish();
+    }
+
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithZip64(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+        );
+
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(count($files), 0x10000);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testLongZipWithout64(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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'),
+            );
+        }
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample0', 'sample1', 'sample2', 'sample3'], $files);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithZeroHeader(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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'),
+        );
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddsZip64HeaderWhenNeeded(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileContains($tmp, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
+
+    /**
+     * @group slow
+     */
+    public function testDoesNotAddZip64HeaderWhenNotNeeded(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileDoesNotContain($tmp, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithoutZeroHeader(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            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 testAddFileFromPsr7StreamWithOutputToPsr7Stream(): void
+    {
+        [$tmp, $resource] = $this->getTmpFileStream();
+        $psr7OutputStream = new ResourceStream($resource);
+
+
+        $zip = new ZipStream(
+            outputStream: $psr7OutputStream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+        );
+        $zip->finish();
+        $psr7OutputStream->close();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    public function testAddFileFromPsr7StreamWithFileSizeSet(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $fileSize = strlen($body);
+        // Add fake padding
+        $fakePadding = "\0\0\0\0\0\0";
+        $response = new Response(200, [], $body . $fakePadding);
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+            maxSize: $fileSize
+        );
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    public function testCreateArchiveHeaders(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $headers = [];
+
+        $httpHeaderCallback = function (string $header) use (&$headers) {
+            $headers[] = $header;
+        };
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: true,
+            outputName: 'example.zip',
+            httpHeaderCallback: $httpHeaderCallback,
+        );
+
+        $zip->addFile(
+            fileName: 'sample.json',
+            data: 'foo',
+        );
+        $zip->finish();
+        fclose($stream);
+
+        $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);
+    }
+
+    public function testCreateArchiveWithFlushOptionSet(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $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 testCreateArchiveWithOutputBufferingOffAndFlushOptionSet(): void
+    {
+        // 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());
+
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+
+        $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();
+    }
+
+    public function testAddEmptyDirectory(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addDirectory('foo');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir, includeDirectories: true);
+
+        $this->assertContains('foo', $files);
+
+        $this->assertFileExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
+        $this->assertDirectoryExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
+    }
+
+    public function testAddFileSimulate(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $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);
+    }
+
+    public function testAddFileSimulateWithMaxSize(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', maxSize: 0);
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithFstat(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $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);
+    }
+
+    public function testAddFileSimulateWithExactSizeZero(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithExactSizeInitial(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
+
+            return $zip->finish();
+        };
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithZeroSizeInFstat(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $stream,
+            );
+
+            $zip->addFileFromPsr7Stream('sample.txt', new class () implements StreamInterface {
+                public $pos = 0;
+
+                public function __toString(): string
+                {
+                    return 'test';
+                }
+
+                public function close(): void
+                {
+                }
+
+                public function detach()
+                {
+                }
+
+                public function getSize(): ?int
+                {
+                    return null;
+                }
+
+                public function tell(): int
+                {
+                    return $this->pos;
+                }
+
+                public function eof(): bool
+                {
+                    return $this->pos >= 4;
+                }
+
+                public function isSeekable(): bool
+                {
+                    return true;
+                }
+
+                public function seek(int $offset, int $whence = SEEK_SET): void
+                {
+                    $this->pos = $offset;
+                }
+
+                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);
+
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithWrongExactSize(): void
+    {
+        $this->expectException(FileSizeIncorrectException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_LAX,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data', exactSize: 1000);
+    }
+
+    public function testAddFileSimulateStrictZero(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: true
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+    }
+
+    public function testAddFileSimulateStrictInitial(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+    }
+
+    public function testAddFileCallbackStrict(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
+
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return '';
+        });
+    }
+
+    public function testAddFileCallbackLax(): void
+    {
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return 'Sample String Data';
+        });
+
+        $size = $zip->finish();
+
+        $this->assertEquals($size, 142);
+    }
+
+    public function testExecuteSimulation(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $stream,
+        );
+
+        $zip->addFileFromCallback(
+            'sample.txt',
+            exactSize: 18,
+            callback: function () {
+                return 'Sample String Data';
+            }
+        );
+
+        $size = $zip->finish();
+
+        $this->assertEquals(filesize($tmp), 0);
+
+        $zip->executeSimulation();
+        fclose($stream);
+
+        clearstatcache();
+
+        $this->assertEquals(filesize($tmp), $size);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+    }
+
+    public function testExecuteSimulationBeforeFinish(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $stream,
+        );
+
+        $zip->executeSimulation();
+    }
+
+    private function addLargeFileFileFromPath(CompressionMethod $compressionMethod, $zeroHeader, $zip64): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: $zeroHeader,
+            enableZip64: $zip64,
+        );
+
+        [$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);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(sha1_file($tmpDir . '/sample.txt'), $shaExample, "SHA-1 Mismatch Method: {$compressionMethod->value}");
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 000000000..2b8dbed4a
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/bootstrap.php b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/bootstrap.php
new file mode 100644
index 000000000..13c7a0e6c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/maennchen/zipstream-php/test/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+date_default_timezone_set('UTC');
+
+require __DIR__ . '/../vendor/autoload.php';
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/.github/workflows/main.yml b/libraries/phpspreadsheet/vendor/markbaker/complex/.github/workflows/main.yml
new file mode 100644
index 000000000..891153308
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/.github/workflows/main.yml
@@ -0,0 +1,153 @@
+name: main
+on: [ push, pull_request ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        experimental:
+          - false
+        php-version:
+          - '7.2'
+          - '7.3'
+          - '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@v3
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          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@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Delete composer lock file
+        id: composer-lock
+        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 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"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: "Run PHPUnit tests (Experimental: ${{ matrix.experimental }})"
+        env:
+          FAILURE_ACTION: "${{ matrix.experimental == true }}"
+        run: vendor/bin/phpunit --verbose || $FAILURE_ACTION
+
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          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@v3
+        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 -q --report=checkstyle classes/src/ | cs2pr
+
+  versions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          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@v3
+        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 Version Compatibility check with PHP_CodeSniffer
+        run: ./vendor/bin/phpcs -q --report-width=200 --report=summary,full classes/src/ --standard=PHPCompatibility --runtime-set testVersion 7.2-
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: pcov
+
+      - 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@v3
+        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: Test Coverage
+        run: ./vendor/bin/phpunit --verbose --coverage-text
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/README.md b/libraries/phpspreadsheet/vendor/markbaker/complex/README.md
new file mode 100644
index 000000000..76347af16
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/README.md
@@ -0,0 +1,173 @@
+PHPComplex
+==========
+
+---
+
+PHP Class Library for working with Complex numbers
+
+[![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)
+
+
+[![Complex Numbers](https://imgs.xkcd.com/comics/complex_numbers_2x.png)](https://xkcd.com/2028/)
+
+---
+
+The library currently provides the following operations:
+
+ - addition
+ - subtraction
+ - multiplication
+ - division
+    - division by
+    - division into
+
+together with functions for 
+
+ - theta (polar theta angle)
+ - rho (polar distance/radius)
+ - conjugate
+ * negative
+ - inverse (1 / complex)
+ - cos (cosine)
+ - acos (inverse cosine)
+ - cosh (hyperbolic cosine)
+ - acosh (inverse hyperbolic cosine)
+ - sin (sine)
+ - asin (inverse sine)
+ - sinh (hyperbolic sine)
+ - asinh (inverse hyperbolic sine)
+ - sec (secant)
+ - asec (inverse secant)
+ - sech (hyperbolic secant)
+ - asech (inverse hyperbolic secant)
+ - csc (cosecant)
+ - acsc (inverse cosecant)
+ - csch (hyperbolic secant)
+ - acsch (inverse hyperbolic secant)
+ - tan (tangent)
+ - atan (inverse tangent)
+ - tanh (hyperbolic tangent)
+ - atanh (inverse hyperbolic tangent)
+ - cot (cotangent)
+ - acot (inverse cotangent)
+ - coth (hyperbolic cotangent)
+ - acoth (inverse hyperbolic cotangent)
+ - sqrt (square root)
+ - exp (exponential)
+ - ln (natural log)
+ - log10 (base-10 log)
+ - log2 (base-2 log)
+ - pow (raised to the power of a real number)
+ 
+ 
+---
+
+# 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 as an array
+```php
+$real = 1.23;
+$imaginary = -4.56;
+$suffix = 'i';
+
+$arguments = [$real, $imaginary, $suffix];
+
+$complexObject = new Complex\Complex($arguments);
+```
+or as a string
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+```
+
+Complex objects are immutable: whenever you call a method or pass a complex value to a function that returns a complex value, a new Complex object will be returned, and the original will remain unchanged.
+This also allows you to chain multiple methods as you would for a fluent interface (as long as they are methods that will return a Complex result).
+
+## Performing Mathematical Operations
+
+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 use the static Operation methods
+```php
+$complexString1 = '1.23-4.56i';
+$complexString2 = '2.34+5.67i';
+
+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.
+
+## 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 use the static Functions methods
+```php
+$complexString = '1.23-4.56i';
+
+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
+
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+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);
+echo $complexObject->pow(2);
+```
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/Autoloader.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/Autoloader.php
deleted file mode 100644
index 792ecef0d..000000000
--- a/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/Bootstrap.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/Bootstrap.php
deleted file mode 100644
index f1103df86..000000000
--- a/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Complex.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Complex.php
index 4f873afc7..25414ee61 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Complex.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Complex.php
@@ -186,7 +186,7 @@ class Complex
         // Set parsed values in our properties
         $this->realPart = (float) $realPart;
         $this->imaginaryPart = (float) $imaginaryPart;
-        $this->suffix = strtolower($suffix);
+        $this->suffix = strtolower($suffix ?? '');
     }
 
     /**
@@ -194,7 +194,7 @@ class Complex
      *
      * @return Float
      */
-    public function getReal()
+    public function getReal(): float
     {
         return $this->realPart;
     }
@@ -204,7 +204,7 @@ class Complex
      *
      * @return Float
      */
-    public function getImaginary()
+    public function getImaginary(): float
     {
         return $this->imaginaryPart;
     }
@@ -214,7 +214,7 @@ class Complex
      *
      * @return String
      */
-    public function getSuffix()
+    public function getSuffix(): string
     {
         return $this->suffix;
     }
@@ -224,7 +224,7 @@ class Complex
      *
      * @return Bool
      */
-    public function isReal()
+    public function isReal(): bool
     {
         return $this->imaginaryPart == 0.0;
     }
@@ -234,12 +234,12 @@ class Complex
      *
      * @return Bool
      */
-    public function isComplex()
+    public function isComplex(): bool
     {
         return !$this->isReal();
     }
 
-    public function format()
+    public function format(): string
     {
         $str = "";
         if ($this->imaginaryPart != 0.0) {
@@ -262,7 +262,7 @@ class Complex
         return $str;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->format();
     }
@@ -274,7 +274,7 @@ class Complex
      * @return    Complex
      * @throws    Exception    If the argument isn't a Complex number or cannot be converted to one
      */
-    public static function validateComplexArgument($complex)
+    public static function validateComplexArgument($complex): Complex
     {
         if (is_scalar($complex) || is_array($complex)) {
             $complex = new Complex($complex);
@@ -290,7 +290,7 @@ class Complex
      *
      * @return    Complex
      */
-    public function reverse()
+    public function reverse(): Complex
     {
         return new Complex(
             $this->imaginaryPart,
@@ -299,7 +299,7 @@ class Complex
         );
     }
 
-    public function invertImaginary()
+    public function invertImaginary(): Complex
     {
         return new Complex(
             $this->realPart,
@@ -308,7 +308,7 @@ class Complex
         );
     }
 
-    public function invertReal()
+    public function invertReal(): Complex
     {
         return new Complex(
             $this->realPart * -1,
@@ -376,15 +376,13 @@ class Complex
         $functionName = strtolower(str_replace('_', '', $functionName));
 
         // Test for function calls
-        if (in_array($functionName, self::$functions)) {
-            $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}";
-            return $functionName($this, ...$arguments);
+        if (in_array($functionName, self::$functions, true)) {
+            return Functions::$functionName($this, ...$arguments);
         }
         // Test for operation calls
-        if (in_array($functionName, self::$operations)) {
-            $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}";
-            return $functionName($this, ...$arguments);
+        if (in_array($functionName, self::$operations, true)) {
+            return Operations::$functionName($this, ...$arguments);
         }
-        throw new Exception('Function or Operation does not exist');
+        throw new Exception('Complex Function or Operation does not exist');
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Functions.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Functions.php
new file mode 100644
index 000000000..ff38c237d
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Operations.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/Operations.php
new file mode 100644
index 000000000..b13a8734d
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/abs.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/abs.php
deleted file mode 100644
index b66ef7cf0..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/abs.php
+++ /dev/null
@@ -1,29 +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
- *
- */
-function abs($complex)
-{
-    return rho($complex);
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acos.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acos.php
deleted file mode 100644
index a269c3df5..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acos.php
+++ /dev/null
@@ -1,38 +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.
- */
-function acos($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acosh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acosh.php
deleted file mode 100644
index 18a992e43..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acosh.php
+++ /dev/null
@@ -1,34 +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.
- */
-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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acot.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acot.php
deleted file mode 100644
index 11bee4666..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acot.php
+++ /dev/null
@@ -1,25 +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
- */
-function acot($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return atan(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acoth.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acoth.php
deleted file mode 100644
index b76014f60..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acoth.php
+++ /dev/null
@@ -1,25 +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
- */
-function acoth($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return atanh(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsc.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsc.php
deleted file mode 100644
index 65ef4bb60..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsc.php
+++ /dev/null
@@ -1,29 +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
- */
-function acsc($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return asin(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsch.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsch.php
deleted file mode 100644
index bb45d3477..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/acsch.php
+++ /dev/null
@@ -1,29 +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
- */
-function acsch($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return asinh(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/argument.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/argument.php
deleted file mode 100644
index d7209cc48..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/argument.php
+++ /dev/null
@@ -1,28 +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
- */
-function argument($complex)
-{
-    return theta($complex);
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asec.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asec.php
deleted file mode 100644
index c8b064778..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asec.php
+++ /dev/null
@@ -1,29 +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
- */
-function asec($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return acos(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asech.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asech.php
deleted file mode 100644
index b36c40e2c..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asech.php
+++ /dev/null
@@ -1,29 +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
- */
-function asech($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return acosh(inverse($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asin.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asin.php
deleted file mode 100644
index 9c982aca8..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asin.php
+++ /dev/null
@@ -1,37 +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.
- */
-function asin($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asinh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asinh.php
deleted file mode 100644
index c1243fd7f..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/asinh.php
+++ /dev/null
@@ -1,33 +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.
- */
-function asinh($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atan.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atan.php
deleted file mode 100644
index 2c75dcf8e..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atan.php
+++ /dev/null
@@ -1,45 +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
- */
-function atan($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atanh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atanh.php
deleted file mode 100644
index c53f2a9a0..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/atanh.php
+++ /dev/null
@@ -1,38 +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.
- */
-function atanh($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/conjugate.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/conjugate.php
deleted file mode 100644
index bd1984b78..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/conjugate.php
+++ /dev/null
@@ -1,28 +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.
- */
-function conjugate($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return new Complex(
-        $complex->getReal(),
-        -1 * $complex->getImaginary(),
-        $complex->getSuffix()
-    );
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cos.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cos.php
deleted file mode 100644
index 80a4683d5..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cos.php
+++ /dev/null
@@ -1,34 +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.
- */
-function cos($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cosh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cosh.php
deleted file mode 100644
index a4bea6536..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cosh.php
+++ /dev/null
@@ -1,32 +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.
- */
-function cosh($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cot.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cot.php
deleted file mode 100644
index 339101e1b..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/cot.php
+++ /dev/null
@@ -1,29 +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
- */
-function cot($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/coth.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/coth.php
deleted file mode 100644
index 7fe705a4d..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/coth.php
+++ /dev/null
@@ -1,24 +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
- */
-function coth($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-    return inverse(tanh($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csc.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csc.php
deleted file mode 100644
index bfbbc6ce9..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csc.php
+++ /dev/null
@@ -1,29 +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
- */
-function csc($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return inverse(sin($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csch.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csch.php
deleted file mode 100644
index f4500981d..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/csch.php
+++ /dev/null
@@ -1,29 +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
- */
-function csch($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-        return INF;
-    }
-
-    return inverse(sinh($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/exp.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/exp.php
deleted file mode 100644
index 4cac6967e..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/exp.php
+++ /dev/null
@@ -1,34 +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.
- */
-function exp($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/inverse.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/inverse.php
deleted file mode 100644
index 7d3182ada..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/inverse.php
+++ /dev/null
@@ -1,29 +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
- */
-function inverse($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/ln.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/ln.php
deleted file mode 100644
index 39071cf67..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/ln.php
+++ /dev/null
@@ -1,33 +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
- */
-function ln($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log10.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log10.php
deleted file mode 100644
index 694d3d08e..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log10.php
+++ /dev/null
@@ -1,32 +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
- */
-function log10($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log2.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log2.php
deleted file mode 100644
index 081f2c499..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/log2.php
+++ /dev/null
@@ -1,32 +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
- */
-function log2($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/negative.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/negative.php
deleted file mode 100644
index dbd11922c..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/negative.php
+++ /dev/null
@@ -1,31 +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    float            The negative value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- *
- * @see    rho
- *
- */
-function negative($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return new Complex(
-        -1 * $complex->getReal(),
-        -1 * $complex->getImaginary(),
-        $complex->getSuffix()
-    );
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/pow.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/pow.php
deleted file mode 100644
index 18ee26909..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/pow.php
+++ /dev/null
@@ -1,40 +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
- */
-function pow($complex, $power)
-{
-    $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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/rho.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/rho.php
deleted file mode 100644
index 750f3f99e..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/rho.php
+++ /dev/null
@@ -1,28 +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.
- */
-function rho($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return \sqrt(
-        ($complex->getReal() * $complex->getReal()) +
-        ($complex->getImaginary() * $complex->getImaginary())
-    );
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sec.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sec.php
deleted file mode 100644
index 7dd43eaf0..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sec.php
+++ /dev/null
@@ -1,25 +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
- */
-function sec($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return inverse(cos($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sech.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sech.php
deleted file mode 100644
index 8e40a38fd..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sech.php
+++ /dev/null
@@ -1,25 +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
- */
-function sech($complex)
-{
-    $complex = Complex::validateComplexArgument($complex);
-
-    return inverse(cosh($complex));
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sin.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sin.php
deleted file mode 100644
index 2895d6f82..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sin.php
+++ /dev/null
@@ -1,32 +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.
- */
-function sin($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sinh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sinh.php
deleted file mode 100644
index 4c0f6503e..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sinh.php
+++ /dev/null
@@ -1,32 +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.
- */
-function sinh($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sqrt.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sqrt.php
deleted file mode 100644
index 9c171b880..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/sqrt.php
+++ /dev/null
@@ -1,29 +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.
- */
-function sqrt($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tan.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tan.php
deleted file mode 100644
index 014d7981b..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tan.php
+++ /dev/null
@@ -1,40 +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
- */
-function tan($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tanh.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tanh.php
deleted file mode 100644
index 028741d6b..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/tanh.php
+++ /dev/null
@@ -1,35 +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
- */
-function tanh($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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/theta.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/theta.php
deleted file mode 100644
index d12866cd8..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/functions/theta.php
+++ /dev/null
@@ -1,38 +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.
- */
-function theta($complex)
-{
-    $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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/add.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/add.php
deleted file mode 100644
index 10bd42f4f..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/add.php
+++ /dev/null
@@ -1,46 +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
- */
-function add(...$complexValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideby.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideby.php
deleted file mode 100644
index 089e0ef99..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideby.php
+++ /dev/null
@@ -1,56 +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
- */
-function divideby(...$complexValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideinto.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideinto.php
deleted file mode 100644
index 3dfe085e2..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/divideinto.php
+++ /dev/null
@@ -1,56 +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
- */
-function divideinto(...$complexValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/multiply.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/multiply.php
deleted file mode 100644
index bf2473ea7..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/multiply.php
+++ /dev/null
@@ -1,48 +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
- */
-function multiply(...$complexValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/subtract.php b/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/subtract.php
deleted file mode 100644
index 075ef4436..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/complex/classes/src/operations/subtract.php
+++ /dev/null
@@ -1,46 +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
- */
-function subtract(...$complexValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/complex/composer.json b/libraries/phpspreadsheet/vendor/markbaker/complex/composer.json
new file mode 100644
index 000000000..246683ca4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/composer.json
@@ -0,0 +1,40 @@
+{
+    "name": "markbaker/complex",
+    "type": "library",
+    "description": "PHP Class for working with complex numbers",
+    "keywords": ["complex", "mathematics"],
+    "homepage": "https://github.com/MarkBaker/PHPComplex",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Mark Baker",
+            "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.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Complex\\": "classes/src/"
+        }
+    },
+    "scripts": {
+        "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
+        "versions": "phpcs --report-width=200 --standard=PHPCompatibility --report=summary,full classes/src/ --runtime-set testVersion 7.2- -n"
+    },
+    "minimum-stability": "dev"
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/examples/complexTest.php b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/complexTest.php
new file mode 100644
index 000000000..9a5e1238d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/complexTest.php
@@ -0,0 +1,154 @@
+<?php
+
+use Complex\Complex as Complex;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+echo 'Create', PHP_EOL;
+
+$x = new Complex(123);
+echo $x, PHP_EOL;
+
+$x = new Complex(123, 456);
+echo $x, PHP_EOL;
+
+$x = new Complex(array(123,456,'j'));
+echo $x, PHP_EOL;
+
+$x = new Complex('1.23e-4--2.34e-5i');
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Add', PHP_EOL;
+
+$x = new Complex(123);
+$x->add(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->add(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->add(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->add(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->add(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->add(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Subtract', PHP_EOL;
+
+$x = new Complex(123);
+$x->subtract(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->subtract(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->subtract(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->subtract(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->subtract(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->subtract(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Multiply', PHP_EOL;
+
+$x = new Complex(123);
+$x->multiply(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->multiply(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->multiply(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->multiply(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->multiply(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->multiply(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Divide By', PHP_EOL;
+
+$x = new Complex(123);
+$x->divideBy(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->divideBy(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideBy(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideBy(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideBy(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideBy(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Divide Into', PHP_EOL;
+
+$x = new Complex(123);
+$x->divideInto(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->divideInto(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideInto(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideInto(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideInto(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideInto(new Complex(0, -1));
+echo $x, PHP_EOL;
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testFunctions.php b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testFunctions.php
new file mode 100644
index 000000000..bad1c03de
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testFunctions.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Complex;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+echo 'Function Examples', PHP_EOL;
+
+$functions = array(
+    'abs',
+    'acos',
+    'acosh',
+    'acsc',
+    'acsch',
+    'argument',
+    'asec',
+    'asech',
+    'asin',
+    'asinh',
+    'conjugate',
+    'cos',
+    'cosh',
+    'csc',
+    'csch',
+    'exp',
+    'inverse',
+    'ln',
+    'log2',
+    'log10',
+    'rho',
+    'sec',
+    'sech',
+    'sin',
+    'sinh',
+    'sqrt',
+    'theta'
+);
+
+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__ . '\\Functions::' . $function;
+            $complex = new Complex($real, $imaginary);
+            try {
+                echo $function, '(', $complex, ') = ', $complexFunction($complex), PHP_EOL;
+            } catch (\Exception $e) {
+                echo $function, '(', $complex, ') ERROR: ', $e->getMessage(), PHP_EOL;
+            }
+        }
+        echo PHP_EOL;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testOperations.php b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testOperations.php
new file mode 100644
index 000000000..2b7e0ba4b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/examples/testOperations.php
@@ -0,0 +1,35 @@
+<?php
+
+use Complex\Complex as Complex;
+use Complex\Operations;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+$values = [
+    new Complex(123),
+    new Complex(456, 123),
+    new Complex(0.0, 456),
+];
+
+foreach ($values as $value) {
+    echo $value, PHP_EOL;
+}
+
+echo 'Addition', PHP_EOL;
+
+$result = Operations::add(...$values);
+echo '=> ', $result, PHP_EOL;
+
+echo PHP_EOL;
+
+echo 'Subtraction', PHP_EOL;
+
+$result = Operations::subtract(...$values);
+echo '=> ', $result, PHP_EOL;
+
+echo PHP_EOL;
+
+echo 'Multiplication', PHP_EOL;
+
+$result = Operations::multiply(...$values);
+echo '=> ', $result, PHP_EOL;
diff --git a/libraries/phpspreadsheet/vendor/markbaker/complex/license.md b/libraries/phpspreadsheet/vendor/markbaker/complex/license.md
new file mode 100644
index 000000000..5b4b15619
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/complex/license.md
@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright © `2017` `Mark Baker`
+
+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.
\ No newline at end of file
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/.github/workflows/main.yaml b/libraries/phpspreadsheet/vendor/markbaker/matrix/.github/workflows/main.yaml
new file mode 100644
index 000000000..5fa1bdb2d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/.github/workflows/main.yaml
@@ -0,0 +1,124 @@
+name: main
+on: [ push, pull_request ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version:
+          - '7.1'
+          - '7.2'
+          - '7.3'
+          - '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@v3
+
+      - 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@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Delete composer lock file
+        id: composer-lock
+        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 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"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Test with PHPUnit
+        run: ./vendor/bin/phpunit
+
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - 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@v3
+        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 -q --report=checkstyle | cs2pr --graceful-warnings --colorize
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - 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: pcov
+
+      - 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@v3
+        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-text
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/README.md b/libraries/phpspreadsheet/vendor/markbaker/matrix/README.md
new file mode 100644
index 000000000..d0dc91452
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/README.md
@@ -0,0 +1,215 @@
+PHPMatrix
+==========
+
+---
+
+PHP Class for handling Matrices
+
+[![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/)
+
+Matrix Transform
+
+---
+
+This library currently provides the following operations:
+
+ - addition
+ - direct sum
+ - subtraction
+ - multiplication
+ - division (using [A].[B]<sup>-1</sup>)
+    - division by
+    - division into
+
+together with functions for 
+
+ - adjoint
+ - antidiagonal
+ - cofactors
+ - determinant
+ - diagonal
+ - identity
+ - inverse
+ - minors
+ - trace
+ - transpose
+ - solve
+
+   Given Matrices A and B, calculate X for A.X = B
+   
+and classes for
+
+ - Decomposition
+   - LU Decomposition with partial row pivoting,
+
+     such that [P].[A] = [L].[U] and [A] = [P]<sup>|</sup>.[L].[U]
+   - QR Decomposition
+
+     such that [A] = [Q].[R]
+
+## TO DO
+
+ - power() function
+ - Decomposition
+   - Cholesky Decomposition
+   - EigenValue Decomposition 
+     - EigenValues
+     - EigenVectors
+
+---
+
+# 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
+
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+```
+The `Builder` class provides helper methods for creating specific matrices, specifically an identity matrix of a specified size; or a matrix of a specified dimensions, with every cell containing a set value.
+```php
+$matrix = Matrix\Builder::createFilledMatrix(1, 5, 3);
+```
+Will create a matrix of 5 rows and 3 columns, filled with a `1` in every cell; while
+```php
+$matrix = Matrix\Builder::createIdentityMatrix(3);
+```
+will create a 3x3 identity matrix.
+
+
+Matrix objects are immutable: whenever you call a method or pass a grid to a function that returns a matrix value, a new Matrix object will be returned, and the original will remain unchanged. This also allows you to chain multiple methods as you would for a fluent interface (as long as they are methods that will return a Matrix result).
+
+## Performing Mathematical Operations
+
+To perform mathematical operations with Matrices, you can call the appropriate method against a matrix value, passing other values as arguments
+
+```php
+$matrix1 = new Matrix\Matrix([
+    [2, 7, 6],
+    [9, 5, 1],
+    [4, 3, 8],
+]);
+$matrix2 = new Matrix\Matrix([
+    [1, 2, 3],
+    [4, 5, 6],
+    [7, 8, 9],
+]);
+
+var_dump($matrix1->multiply($matrix2)->toArray());
+```
+or pass all values to the appropriate static method
+```php
+$matrix1 = new Matrix\Matrix([
+    [2, 7, 6],
+    [9, 5, 1],
+    [4, 3, 8],
+]);
+$matrix2 = new Matrix\Matrix([
+    [1, 2, 3],
+    [4, 5, 6],
+    [7, 8, 9],
+]);
+
+var_dump(Matrix\Operations::multiply($matrix1, $matrix2)->toArray());
+```
+You can pass in the arguments as Matrix objects, or as arrays.
+
+If you want to perform the same operation against multiple values (e.g. to add three or more matrices), then you can pass multiple arguments to any of the operations.
+
+## Using functions
+
+When calling any of the available functions for a matrix value, you can either call the relevant method for the Matrix object
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+echo $matrix->trace();
+```
+or you can call the static method, passing the Matrix object or array as an argument 
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+echo Matrix\Functions::trace($matrix);
+```
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+echo Matrix\Functions::trace($grid);
+```
+
+## Decomposition
+
+The library also provides classes for matrix decomposition. You can access these using
+```php
+$grid = [
+    [1, 2],
+    [3, 4],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+$decomposition = new Matrix\Decomposition\QR($matrix);
+$Q = $decomposition->getQ();
+$R = $decomposition->getR();
+```
+
+or alternatively us the `Decomposition` factory, identifying which form of decomposition you want to use
+```php
+$grid = [
+    [1, 2],
+    [3, 4],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+$decomposition = Matrix\Decomposition\Decomposition::decomposition(Matrix\Decomposition\Decomposition::QR, $matrix);
+$Q = $decomposition->getQ();
+$R = $decomposition->getR();
+```
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Autoloader.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Autoloader.php
deleted file mode 100644
index 279d176ef..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Autoloader.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Matrix;
-
-/**
- *
- * Autoloader for Matrix classes
- *
- * @package Matrix
- * @copyright  Copyright (c) 2014 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @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(['Matrix\\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, 'Matrix\\') !== 0)) {
-            // Either already loaded, or not a Matrix class request
-            return false;
-        }
-
-        $pClassFilePath = __DIR__ . DIRECTORY_SEPARATOR .
-                          'src' . DIRECTORY_SEPARATOR .
-                          str_replace(['Matrix\\', '\\'], ['', '/'], $pClassName) .
-                          '.php';
-
-        if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
-            // Can't load
-            return false;
-        }
-        require($pClassFilePath);
-    }
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Bootstrap.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Bootstrap.php
deleted file mode 100644
index 87ad9e050..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/Bootstrap.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-include_once __DIR__ . '/Autoloader.php';
-
-\Matrix\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, '/^(?!.*(Matrix|Exception)\.php).*$/i');
-
-foreach (new RecursiveIteratorIterator($filteredFileList) as $file) {
-    if ($file->isFile()) {
-        include_once $file;
-    }
-}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Builder.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Builder.php
index 6bc334adc..161bb6889 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Builder.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Builder.php
@@ -21,13 +21,13 @@ class Builder
      * Create a new matrix of specified dimensions, and filled with a specified value
      * If the column argument isn't provided, then a square matrix will be created
      *
-     * @param mixed $value
+     * @param mixed $fillValue
      * @param int $rows
      * @param int|null $columns
      * @return Matrix
      * @throws Exception
      */
-    public static function createFilledMatrix($value, $rows, $columns = null)
+    public static function createFilledMatrix($fillValue, $rows, $columns = null)
     {
         if ($columns === null) {
             $columns = $rows;
@@ -43,7 +43,7 @@ class Builder
                 array_fill(
                     0,
                     $columns,
-                    $value
+                    $fillValue
                 )
             )
         );
@@ -57,9 +57,9 @@ class Builder
      * @return Matrix
      * @throws Exception
      */
-    public static function createIdentityMatrix($dimensions)
+    public static function createIdentityMatrix($dimensions, $fillValue = null)
     {
-        $grid = static::createFilledMatrix(null, $dimensions)->toArray();
+        $grid = static::createFilledMatrix($fillValue, $dimensions)->toArray();
 
         for ($x = 0; $x < $dimensions; ++$x) {
             $grid[$x][$x] = 1;
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php
new file mode 100644
index 000000000..f01444875
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class Decomposition
+{
+    const LU = 'LU';
+    const QR = 'QR';
+
+    /**
+     * @throws Exception
+     */
+    public static function decomposition($type, Matrix $matrix)
+    {
+        switch (strtoupper($type)) {
+            case self::LU:
+                return new LU($matrix);
+            case self::QR:
+                return new QR($matrix);
+            default:
+                throw new Exception('Invalid Decomposition');
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/LU.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/LU.php
new file mode 100644
index 000000000..10fd9f786
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/LU.php
@@ -0,0 +1,260 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class LU
+{
+    private $luMatrix;
+    private $rows;
+    private $columns;
+
+    private $pivot = [];
+
+    public function __construct(Matrix $matrix)
+    {
+        $this->luMatrix = $matrix->toArray();
+        $this->rows = $matrix->rows;
+        $this->columns = $matrix->columns;
+
+        $this->buildPivot();
+    }
+
+    /**
+     * Get lower triangular factor.
+     *
+     * @return Matrix Lower triangular factor
+     */
+    public function getL(): Matrix
+    {
+        $lower = [];
+
+        $columns = min($this->rows, $this->columns);
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $columns; ++$column) {
+                if ($row > $column) {
+                    $lower[$row][$column] = $this->luMatrix[$row][$column];
+                } elseif ($row === $column) {
+                    $lower[$row][$column] = 1.0;
+                } else {
+                    $lower[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($lower);
+    }
+
+    /**
+     * Get upper triangular factor.
+     *
+     * @return Matrix Upper triangular factor
+     */
+    public function getU(): Matrix
+    {
+        $upper = [];
+
+        $rows = min($this->rows, $this->columns);
+        for ($row = 0; $row < $rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row <= $column) {
+                    $upper[$row][$column] = $this->luMatrix[$row][$column];
+                } else {
+                    $upper[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($upper);
+    }
+
+    /**
+     * Return pivot permutation vector.
+     *
+     * @return Matrix Pivot matrix
+     */
+    public function getP(): Matrix
+    {
+        $pMatrix = [];
+
+        $pivots = $this->pivot;
+        $pivotCount = count($pivots);
+        foreach ($pivots as $row => $pivot) {
+            $pMatrix[$row] = array_fill(0, $pivotCount, 0);
+            $pMatrix[$row][$pivot] = 1;
+        }
+
+        return new Matrix($pMatrix);
+    }
+
+    /**
+     * Return pivot permutation vector.
+     *
+     * @return array Pivot vector
+     */
+    public function getPivot(): array
+    {
+        return $this->pivot;
+    }
+
+    /**
+     *    Is the matrix nonsingular?
+     *
+     * @return bool true if U, and hence A, is nonsingular
+     */
+    public function isNonsingular(): bool
+    {
+        for ($diagonal = 0; $diagonal < $this->columns; ++$diagonal) {
+            if ($this->luMatrix[$diagonal][$diagonal] === 0.0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function buildPivot(): void
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $this->pivot[$row] = $row;
+        }
+
+        for ($column = 0; $column < $this->columns; ++$column) {
+            $luColumn = $this->localisedReferenceColumn($column);
+
+            $this->applyTransformations($column, $luColumn);
+
+            $pivot = $this->findPivot($column, $luColumn);
+            if ($pivot !== $column) {
+                $this->pivotExchange($pivot, $column);
+            }
+
+            $this->computeMultipliers($column);
+
+            unset($luColumn);
+        }
+    }
+
+    private function localisedReferenceColumn($column): array
+    {
+        $luColumn = [];
+
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $luColumn[$row] = &$this->luMatrix[$row][$column];
+        }
+
+        return $luColumn;
+    }
+
+    private function applyTransformations($column, array $luColumn): void
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $luRow = $this->luMatrix[$row];
+            // Most of the time is spent in the following dot product.
+            $kmax = min($row, $column);
+            $sValue = 0.0;
+            for ($kValue = 0; $kValue < $kmax; ++$kValue) {
+                $sValue += $luRow[$kValue] * $luColumn[$kValue];
+            }
+            $luRow[$column] = $luColumn[$row] -= $sValue;
+        }
+    }
+
+    private function findPivot($column, array $luColumn): int
+    {
+        $pivot = $column;
+        for ($row = $column + 1; $row < $this->rows; ++$row) {
+            if (abs($luColumn[$row]) > abs($luColumn[$pivot])) {
+                $pivot = $row;
+            }
+        }
+
+        return $pivot;
+    }
+
+    private function pivotExchange($pivot, $column): void
+    {
+        for ($kValue = 0; $kValue < $this->columns; ++$kValue) {
+            $tValue = $this->luMatrix[$pivot][$kValue];
+            $this->luMatrix[$pivot][$kValue] = $this->luMatrix[$column][$kValue];
+            $this->luMatrix[$column][$kValue] = $tValue;
+        }
+
+        $lValue = $this->pivot[$pivot];
+        $this->pivot[$pivot] = $this->pivot[$column];
+        $this->pivot[$column] = $lValue;
+    }
+
+    private function computeMultipliers($diagonal): void
+    {
+        if (($diagonal < $this->rows) && ($this->luMatrix[$diagonal][$diagonal] != 0.0)) {
+            for ($row = $diagonal + 1; $row < $this->rows; ++$row) {
+                $this->luMatrix[$row][$diagonal] /= $this->luMatrix[$diagonal][$diagonal];
+            }
+        }
+    }
+
+    private function pivotB(Matrix $B): array
+    {
+        $X = [];
+        foreach ($this->pivot as $rowId) {
+            $row = $B->getRows($rowId + 1)->toArray();
+            $X[] = array_pop($row);
+        }
+
+        return $X;
+    }
+
+    /**
+     * Solve A*X = B.
+     *
+     * @param Matrix $B a Matrix with as many rows as A and any number of columns
+     *
+     * @throws Exception
+     *
+     * @return Matrix X so that L*U*X = B(piv,:)
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($B->rows !== $this->rows) {
+            throw new Exception('Matrix row dimensions are not equal');
+        }
+
+        if ($this->rows !== $this->columns) {
+            throw new Exception('LU solve() only works on square matrices');
+        }
+
+        if (!$this->isNonsingular()) {
+            throw new Exception('Can only perform operation on singular matrix');
+        }
+
+        // Copy right hand side with pivoting
+        $nx = $B->columns;
+        $X = $this->pivotB($B);
+
+        // Solve L*Y = B(piv,:)
+        for ($k = 0; $k < $this->columns; ++$k) {
+            for ($i = $k + 1; $i < $this->columns; ++$i) {
+                for ($j = 0; $j < $nx; ++$j) {
+                    $X[$i][$j] -= $X[$k][$j] * $this->luMatrix[$i][$k];
+                }
+            }
+        }
+
+        // Solve U*X = Y;
+        for ($k = $this->columns - 1; $k >= 0; --$k) {
+            for ($j = 0; $j < $nx; ++$j) {
+                $X[$k][$j] /= $this->luMatrix[$k][$k];
+            }
+            for ($i = 0; $i < $k; ++$i) {
+                for ($j = 0; $j < $nx; ++$j) {
+                    $X[$i][$j] -= $X[$k][$j] * $this->luMatrix[$i][$k];
+                }
+            }
+        }
+
+        return new Matrix($X);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/QR.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/QR.php
new file mode 100644
index 000000000..4b6106f64
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Decomposition/QR.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class QR
+{
+    private $qrMatrix;
+    private $rows;
+    private $columns;
+
+    private $rDiagonal = [];
+
+    public function __construct(Matrix $matrix)
+    {
+        $this->qrMatrix = $matrix->toArray();
+        $this->rows = $matrix->rows;
+        $this->columns = $matrix->columns;
+
+        $this->decompose();
+    }
+
+    public function getHouseholdVectors(): Matrix
+    {
+        $householdVectors = [];
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row >= $column) {
+                    $householdVectors[$row][$column] = $this->qrMatrix[$row][$column];
+                } else {
+                    $householdVectors[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($householdVectors);
+    }
+
+    public function getQ(): Matrix
+    {
+        $qGrid = [];
+
+        $rowCount = $this->rows;
+        for ($k = $this->columns - 1; $k >= 0; --$k) {
+            for ($i = 0; $i < $this->rows; ++$i) {
+                $qGrid[$i][$k] = 0.0;
+            }
+            $qGrid[$k][$k] = 1.0;
+            if ($this->columns > $this->rows) {
+                $qGrid = array_slice($qGrid, 0, $this->rows);
+            }
+
+            for ($j = $k; $j < $this->columns; ++$j) {
+                if (isset($this->qrMatrix[$k], $this->qrMatrix[$k][$k]) && $this->qrMatrix[$k][$k] != 0.0) {
+                    $s = 0.0;
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $s += $this->qrMatrix[$i][$k] * $qGrid[$i][$j];
+                    }
+                    $s = -$s / $this->qrMatrix[$k][$k];
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $qGrid[$i][$j] += $s * $this->qrMatrix[$i][$k];
+                    }
+                }
+            }
+        }
+
+        array_walk(
+            $qGrid,
+            function (&$row) use ($rowCount) {
+                $row = array_reverse($row);
+                $row = array_slice($row, 0, $rowCount);
+            }
+        );
+
+        return new Matrix($qGrid);
+    }
+
+    public function getR(): Matrix
+    {
+        $rGrid = [];
+
+        for ($row = 0; $row < $this->columns; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row < $column) {
+                    $rGrid[$row][$column] = $this->qrMatrix[$row][$column] ?? 0.0;
+                } elseif ($row === $column) {
+                    $rGrid[$row][$column] = $this->rDiagonal[$row] ?? 0.0;
+                } else {
+                    $rGrid[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        if ($this->columns > $this->rows) {
+            $rGrid = array_slice($rGrid, 0, $this->rows);
+        }
+
+        return new Matrix($rGrid);
+    }
+
+    private function hypo($a, $b): float
+    {
+        if (abs($a) > abs($b)) {
+            $r = $b / $a;
+            $r = abs($a) * sqrt(1 + $r * $r);
+        } elseif ($b != 0.0) {
+            $r = $a / $b;
+            $r = abs($b) * sqrt(1 + $r * $r);
+        } else {
+            $r = 0.0;
+        }
+
+        return $r;
+    }
+
+    /**
+     * QR Decomposition computed by Householder reflections.
+     */
+    private function decompose(): void
+    {
+        for ($k = 0; $k < $this->columns; ++$k) {
+            // Compute 2-norm of k-th column without under/overflow.
+            $norm = 0.0;
+            for ($i = $k; $i < $this->rows; ++$i) {
+                $norm = $this->hypo($norm, $this->qrMatrix[$i][$k]);
+            }
+            if ($norm != 0.0) {
+                // Form k-th Householder vector.
+                if ($this->qrMatrix[$k][$k] < 0.0) {
+                    $norm = -$norm;
+                }
+                for ($i = $k; $i < $this->rows; ++$i) {
+                    $this->qrMatrix[$i][$k] /= $norm;
+                }
+                $this->qrMatrix[$k][$k] += 1.0;
+                // Apply transformation to remaining columns.
+                for ($j = $k + 1; $j < $this->columns; ++$j) {
+                    $s = 0.0;
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $s += $this->qrMatrix[$i][$k] * $this->qrMatrix[$i][$j];
+                    }
+                    $s = -$s / $this->qrMatrix[$k][$k];
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $this->qrMatrix[$i][$j] += $s * $this->qrMatrix[$i][$k];
+                    }
+                }
+            }
+            $this->rDiagonal[$k] = -$norm;
+        }
+    }
+
+    public function isFullRank(): bool
+    {
+        for ($j = 0; $j < $this->columns; ++$j) {
+            if ($this->rDiagonal[$j] == 0.0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Least squares solution of A*X = B.
+     *
+     * @param Matrix $B a Matrix with as many rows as A and any number of columns
+     *
+     * @throws Exception
+     *
+     * @return Matrix matrix that minimizes the two norm of Q*R*X-B
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($B->rows !== $this->rows) {
+            throw new Exception('Matrix row dimensions are not equal');
+        }
+
+        if (!$this->isFullRank()) {
+            throw new Exception('Can only perform this operation on a full-rank matrix');
+        }
+
+        // Compute Y = transpose(Q)*B
+        $Y = $this->getQ()->transpose()
+            ->multiply($B);
+        // Solve R*X = Y;
+        return $this->getR()->inverse()
+            ->multiply($Y);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Div0Exception.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Div0Exception.php
new file mode 100644
index 000000000..eba28f8a4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Div0Exception.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Exception.
+ *
+ * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+namespace Matrix;
+
+class Div0Exception extends Exception
+{
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Functions.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Functions.php
index cf750569a..cdb49c6af 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Functions.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Functions.php
@@ -4,6 +4,25 @@ namespace Matrix;
 
 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 @@ class Functions
      * 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 @@ class Functions
     /**
      * 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 @@ class Functions
     /**
      * 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 @@ class Functions
     /**
      * 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 @@ class Functions
     /**
      * 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 @@ class Functions
      * 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,19 +256,21 @@ class Functions
     /**
      * 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)
+    public static function inverse($matrix, string $type = 'inverse')
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
-            throw new Exception('Inverse can only be calculated for a square matrix');
+            throw new Exception(ucfirst($type) . ' can only be calculated for a square matrix');
         }
 
         $determinant = self::getDeterminant($matrix);
         if ($determinant == 0.0) {
-            throw new Exception('Inverse can only be calculated for a matrix with a non-zero determinant');
+            throw new Div0Exception(ucfirst($type) . ' can only be calculated for a matrix with a non-zero determinant');
         }
 
         if ($matrix->rows == 1) {
@@ -281,12 +314,14 @@ class Functions
      *     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 @@ class Functions
      * 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 @@ class Functions
     /**
      * 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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Matrix.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Matrix.php
index a4f049517..95f55e75a 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Matrix.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Matrix.php
@@ -10,6 +10,10 @@
 
 namespace Matrix;
 
+use Generator;
+use Matrix\Decomposition\LU;
+use Matrix\Decomposition\QR;
+
 /**
  * Matrix object.
  *
@@ -24,7 +28,6 @@ namespace Matrix;
  * @method Matrix diagonal()
  * @method Matrix identity()
  * @method Matrix inverse()
- * @method Matrix pseudoInverse()
  * @method Matrix minors()
  * @method float trace()
  * @method Matrix transpose()
@@ -33,6 +36,7 @@ namespace Matrix;
  * @method Matrix multiply(...$matrices)
  * @method Matrix divideby(...$matrices)
  * @method Matrix divideinto(...$matrices)
+ * @method Matrix directsum(...$matrices)
  */
 class Matrix
 {
@@ -55,7 +59,7 @@ class Matrix
      *
      * @param array $grid
      */
-    protected function buildFromArray(array $grid)
+    protected function buildFromArray(array $grid): void
     {
         $this->rows = count($grid);
         $columns = array_reduce(
@@ -86,7 +90,7 @@ class Matrix
      * @return int
      * @throws Exception
      */
-    public static function validateRow($row)
+    public static function validateRow(int $row): int
     {
         if ((!is_numeric($row)) || (intval($row) < 1)) {
             throw new Exception('Invalid Row');
@@ -102,7 +106,7 @@ class Matrix
      * @return int
      * @throws Exception
      */
-    public static function validateColumn($column)
+    public static function validateColumn(int $column): int
     {
         if ((!is_numeric($column)) || (intval($column) < 1)) {
             throw new Exception('Invalid Column');
@@ -118,7 +122,7 @@ class Matrix
      * @return int
      * @throws Exception
      */
-    protected function validateRowInRange($row)
+    protected function validateRowInRange(int $row): int
     {
         $row = static::validateRow($row);
         if ($row > $this->rows) {
@@ -135,7 +139,7 @@ class Matrix
      * @return int
      * @throws Exception
      */
-    protected function validateColumnInRange($column)
+    protected function validateColumnInRange(int $column): int
     {
         $column = static::validateColumn($column);
         if ($column > $this->columns) {
@@ -157,7 +161,7 @@ class Matrix
      * @return static
      * @throws Exception
      */
-    public function getRows($row, $rowCount = 1)
+    public function getRows(int $row, int $rowCount = 1): Matrix
     {
         $row = $this->validateRowInRange($row);
         if ($rowCount === 0) {
@@ -179,7 +183,7 @@ class Matrix
      * @return Matrix
      * @throws Exception
      */
-    public function getColumns($column, $columnCount = 1)
+    public function getColumns(int $column, int $columnCount = 1): Matrix
     {
         $column = $this->validateColumnInRange($column);
         if ($columnCount < 1) {
@@ -207,7 +211,7 @@ class Matrix
      * @return static
      * @throws Exception
      */
-    public function dropRows($row, $rowCount = 1)
+    public function dropRows(int $row, int $rowCount = 1): Matrix
     {
         $this->validateRowInRange($row);
         if ($rowCount === 0) {
@@ -233,7 +237,7 @@ class Matrix
      * @return static
      * @throws Exception
      */
-    public function dropColumns($column, $columnCount = 1)
+    public function dropColumns(int $column, int $columnCount = 1): Matrix
     {
         $this->validateColumnInRange($column);
         if ($columnCount < 1) {
@@ -260,7 +264,7 @@ class Matrix
      * @return mixed
      * @throws Exception
      */
-    public function getValue($row, $column)
+    public function getValue(int $row, int $column)
     {
         $row = $this->validateRowInRange($row);
         $column = $this->validateColumnInRange($column);
@@ -270,11 +274,11 @@ class Matrix
 
     /**
      * Returns a Generator that will yield each row of the matrix in turn as a vector matrix
-     *     or the value of each cell if the matrix is a vector
+     *     or the value of each cell if the matrix is a column vector
      *
-     * @return \Generator|Matrix[]|mixed[]
+     * @return Generator|Matrix[]|mixed[]
      */
-    public function rows()
+    public function rows(): Generator
     {
         foreach ($this->grid as $i => $row) {
             yield $i + 1 => ($this->columns == 1)
@@ -285,11 +289,11 @@ class Matrix
 
     /**
      * Returns a Generator that will yield each column of the matrix in turn as a vector matrix
-     *     or the value of each cell if the matrix is a vector
+     *     or the value of each cell if the matrix is a row vector
      *
-     * @return \Generator|Matrix[]|mixed[]
+     * @return Generator|Matrix[]|mixed[]
      */
-    public function columns()
+    public function columns(): Generator
     {
         for ($i = 0; $i < $this->columns; ++$i) {
             yield $i + 1 => ($this->rows == 1)
@@ -304,9 +308,9 @@ class Matrix
      *
      * @return bool
      */
-    public function isSquare()
+    public function isSquare(): bool
     {
-        return $this->rows == $this->columns;
+        return $this->rows === $this->columns;
     }
 
     /**
@@ -315,9 +319,9 @@ class Matrix
      *
      * @return bool
      */
-    public function isVector()
+    public function isVector(): bool
     {
-        return $this->rows == 1 || $this->columns == 1;
+        return $this->rows === 1 || $this->columns === 1;
     }
 
     /**
@@ -325,11 +329,29 @@ class Matrix
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->grid;
     }
 
+    /**
+     * Solve A*X = B.
+     *
+     * @param Matrix $B Right hand side
+     *
+     * @throws Exception
+     *
+     * @return Matrix ... Solution if A is square, least squares solution otherwise
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($this->columns === $this->rows) {
+            return (new LU($this))->solve($B);
+        }
+
+        return (new QR($this))->solve($B);
+    }
+
     protected static $getters = [
         'rows',
         'columns',
@@ -342,7 +364,7 @@ class Matrix
      * @return mixed
      * @throws Exception
      */
-    public function __get($propertyName)
+    public function __get(string $propertyName)
     {
         $propertyName = strtolower($propertyName);
 
@@ -355,8 +377,8 @@ class Matrix
     }
 
     protected static $functions = [
-        'antidiagonal',
         'adjoint',
+        'antidiagonal',
         'cofactors',
         'determinant',
         'diagonal',
@@ -384,16 +406,17 @@ class Matrix
      * @return Matrix|float
      * @throws Exception
      */
-    public function __call($functionName, $arguments)
+    public function __call(string $functionName, $arguments)
     {
         $functionName = strtolower(str_replace('_', '', $functionName));
 
-        if (in_array($functionName, self::$functions) || in_array($functionName, self::$operations)) {
-            $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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operations.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operations.php
new file mode 100644
index 000000000..e3d88d641
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Addition.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Addition.php
index e78c6d7d9..543f56e95 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Addition.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Addition.php
@@ -14,7 +14,7 @@ class Addition extends Operator
      * @throws Exception If the provided argument is not appropriate for the operation
      * @return $this The operation object, allowing multiple additions to be chained
      **/
-    public function execute($value)
+    public function execute($value): Operator
     {
         if (is_array($value)) {
             $value = new Matrix($value);
@@ -35,7 +35,7 @@ class Addition extends Operator
      * @param mixed $value The numeric value to add to the current base value
      * @return $this The operation object, allowing multiple additions to be chained
      **/
-    protected function addScalar($value)
+    protected function addScalar($value): Operator
     {
         for ($row = 0; $row < $this->rows; ++$row) {
             for ($column = 0; $column < $this->columns; ++$column) {
@@ -53,7 +53,7 @@ class Addition extends Operator
      * @return $this The operation object, allowing multiple additions to be chained
      * @throws Exception If the provided argument is not appropriate for the operation
      **/
-    protected function addMatrix(Matrix $value)
+    protected function addMatrix(Matrix $value): Operator
     {
         $this->validateMatchingDimensions($value);
 
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php
index 6db0853bf..cc51ef961 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php
@@ -14,7 +14,7 @@ class DirectSum extends Operator
      * @return $this The operation object, allowing multiple additions to be chained
      * @throws Exception If the provided argument is not appropriate for the operation
      */
-    public function execute($value)
+    public function execute($value): Operator
     {
         if (is_array($value)) {
             $value = new Matrix($value);
@@ -33,7 +33,7 @@ class DirectSum extends Operator
      * @param Matrix $value The numeric value to concatenate/direct sum with the current base value
      * @return $this The operation object, allowing multiple additions to be chained
      **/
-    private function directSumMatrix($value)
+    private function directSumMatrix($value): Operator
     {
         $originalColumnCount = count($this->matrix[0]);
         $originalRowCount = count($this->matrix);
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Division.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Division.php
index 2a573f550..dbfec9d3f 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Division.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Division.php
@@ -2,9 +2,10 @@
 
 namespace Matrix\Operators;
 
+use Matrix\Div0Exception;
+use Matrix\Exception;
 use \Matrix\Matrix;
 use \Matrix\Functions;
-use Matrix\Exception;
 
 class Division extends Multiplication
 {
@@ -15,22 +16,18 @@ class Division extends Multiplication
      * @throws Exception If the provided argument is not appropriate for the operation
      * @return $this The operation object, allowing multiple divisions to be chained
      **/
-    public function execute($value)
+    public function execute($value, string $type = 'division'): Operator
     {
         if (is_array($value)) {
             $value = new Matrix($value);
         }
 
         if (is_object($value) && ($value instanceof Matrix)) {
-            try {
-                $value = Functions::inverse($value);
-            } catch (Exception $e) {
-                throw new Exception('Division can only be calculated using a matrix with a non-zero determinant');
-            }
+            $value = Functions::inverse($value, $type);
 
-            return $this->multiplyMatrix($value);
+            return $this->multiplyMatrix($value, $type);
         } elseif (is_numeric($value)) {
-            return $this->multiplyScalar(1 / $value);
+            return $this->multiplyScalar(1 / $value, $type);
         }
 
         throw new Exception('Invalid argument for division');
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php
index 63df162d6..0761e466a 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php
@@ -5,6 +5,7 @@ namespace Matrix\Operators;
 use Matrix\Matrix;
 use \Matrix\Builder;
 use Matrix\Exception;
+use Throwable;
 
 class Multiplication extends Operator
 {
@@ -15,19 +16,19 @@ class Multiplication extends Operator
      * @throws Exception If the provided argument is not appropriate for the operation
      * @return $this The operation object, allowing multiple multiplications to be chained
      **/
-    public function execute($value)
+    public function execute($value, string $type = 'multiplication'): Operator
     {
         if (is_array($value)) {
             $value = new Matrix($value);
         }
 
         if (is_object($value) && ($value instanceof Matrix)) {
-            return $this->multiplyMatrix($value);
+            return $this->multiplyMatrix($value, $type);
         } elseif (is_numeric($value)) {
-            return $this->multiplyScalar($value);
+            return $this->multiplyScalar($value, $type);
         }
 
-        throw new Exception('Invalid argument for multiplication');
+        throw new Exception("Invalid argument for $type");
     }
 
     /**
@@ -36,12 +37,16 @@ class Multiplication extends Operator
      * @param mixed $value The numeric value to multiply with the current base value
      * @return $this The operation object, allowing multiple mutiplications to be chained
      **/
-    protected function multiplyScalar($value)
+    protected function multiplyScalar($value, string $type = 'multiplication'): Operator
     {
-        for ($row = 0; $row < $this->rows; ++$row) {
-            for ($column = 0; $column < $this->columns; ++$column) {
-                $this->matrix[$row][$column] *= $value;
+        try {
+            for ($row = 0; $row < $this->rows; ++$row) {
+                for ($column = 0; $column < $this->columns; ++$column) {
+                    $this->matrix[$row][$column] *= $value;
+                }
             }
+        } catch (Throwable $e) {
+            throw new Exception("Invalid argument for $type");
         }
 
         return $this;
@@ -54,7 +59,7 @@ class Multiplication extends Operator
      * @return $this The operation object, allowing multiple mutiplications to be chained
      * @throws Exception If the provided argument is not appropriate for the operation
      **/
-    protected function multiplyMatrix(Matrix $value)
+    protected function multiplyMatrix(Matrix $value, string $type = 'multiplication'): Operator
     {
         $this->validateReflectingDimensions($value);
 
@@ -62,13 +67,17 @@ class Multiplication extends Operator
         $newColumns = $value->columns;
         $matrix = Builder::createFilledMatrix(0, $newRows, $newColumns)
             ->toArray();
-        for ($row = 0; $row < $newRows; ++$row) {
-            for ($column = 0; $column < $newColumns; ++$column) {
-                $columnData = $value->getColumns($column + 1)->toArray();
-                foreach ($this->matrix[$row] as $key => $valueData) {
-                    $matrix[$row][$column] += $valueData * $columnData[$key][0];
+        try {
+            for ($row = 0; $row < $newRows; ++$row) {
+                for ($column = 0; $column < $newColumns; ++$column) {
+                    $columnData = $value->getColumns($column + 1)->toArray();
+                    foreach ($this->matrix[$row] as $key => $valueData) {
+                        $matrix[$row][$column] += $valueData * $columnData[$key][0];
+                    }
                 }
             }
+        } catch (Throwable $e) {
+            throw new Exception("Invalid argument for $type");
         }
         $this->matrix = $matrix;
 
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Operator.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Operator.php
index 87d3f3b5d..39e36c619 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Operator.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Operator.php
@@ -46,7 +46,7 @@ abstract class Operator
      * @param Matrix $matrix The second Matrix object on which the operation will be performed
      * @throws Exception
      */
-    protected function validateMatchingDimensions(Matrix $matrix)
+    protected function validateMatchingDimensions(Matrix $matrix): void
     {
         if (($this->rows != $matrix->rows) || ($this->columns != $matrix->columns)) {
             throw new Exception('Matrices have mismatched dimensions');
@@ -59,7 +59,7 @@ abstract class Operator
      * @param Matrix $matrix The second Matrix object on which the operation will be performed
      * @throws Exception
      */
-    protected function validateReflectingDimensions(Matrix $matrix)
+    protected function validateReflectingDimensions(Matrix $matrix): void
     {
         if ($this->columns != $matrix->rows) {
             throw new Exception('Matrices have mismatched dimensions');
@@ -71,7 +71,7 @@ abstract class Operator
      *
      * @return Matrix
      */
-    public function result()
+    public function result(): Matrix
     {
         return new Matrix($this->matrix);
     }
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php
index 57c0b147c..b7e14fad4 100644
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php
@@ -14,7 +14,7 @@ class Subtraction extends Operator
      * @throws Exception If the provided argument is not appropriate for the operation
      * @return $this The operation object, allowing multiple subtractions to be chained
      **/
-    public function execute($value)
+    public function execute($value): Operator
     {
         if (is_array($value)) {
             $value = new Matrix($value);
@@ -35,7 +35,7 @@ class Subtraction extends Operator
      * @param mixed $value The numeric value to subtracted from the current base value
      * @return $this The operation object, allowing multiple additions to be chained
      **/
-    protected function subtractScalar($value)
+    protected function subtractScalar($value): Operator
     {
         for ($row = 0; $row < $this->rows; ++$row) {
             for ($column = 0; $column < $this->columns; ++$column) {
@@ -53,7 +53,7 @@ class Subtraction extends Operator
      * @return $this The operation object, allowing multiple subtractions to be chained
      * @throws Exception If the provided argument is not appropriate for the operation
      **/
-    protected function subtractMatrix(Matrix $value)
+    protected function subtractMatrix(Matrix $value): Operator
     {
         $this->validateMatchingDimensions($value);
 
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/adjoint.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/adjoint.php
deleted file mode 100644
index fc1e16995..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/adjoint.php
+++ /dev/null
@@ -1,30 +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.
- */
-function adjoint($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/antidiagonal.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/antidiagonal.php
deleted file mode 100644
index cc7b326f6..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/antidiagonal.php
+++ /dev/null
@@ -1,29 +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.
- */
-function antidiagonal($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/cofactors.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/cofactors.php
deleted file mode 100644
index 07be8eeda..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/cofactors.php
+++ /dev/null
@@ -1,30 +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.
- */
-function cofactors($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/determinant.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/determinant.php
deleted file mode 100644
index edadb3108..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/determinant.php
+++ /dev/null
@@ -1,30 +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.
- */
-function determinant($matrix)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/diagonal.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/diagonal.php
deleted file mode 100644
index 0bf05c913..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/diagonal.php
+++ /dev/null
@@ -1,30 +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.
- */
-function diagonal($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/identity.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/identity.php
deleted file mode 100644
index 0a52db2b6..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/identity.php
+++ /dev/null
@@ -1,30 +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.
- */
-function identity($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/inverse.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/inverse.php
deleted file mode 100644
index d7cb5a073..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/inverse.php
+++ /dev/null
@@ -1,30 +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.
- */
-function inverse($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/minors.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/minors.php
deleted file mode 100644
index 9d0e4f52c..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/minors.php
+++ /dev/null
@@ -1,30 +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.
- */
-function minors($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/trace.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/trace.php
deleted file mode 100644
index 4031d5ed9..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/trace.php
+++ /dev/null
@@ -1,30 +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.
- */
-function trace($matrix)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/transpose.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/transpose.php
deleted file mode 100644
index cfb021e21..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/functions/transpose.php
+++ /dev/null
@@ -1,30 +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.
- */
-function transpose($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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/add.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/add.php
deleted file mode 100644
index 4ae731221..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/add.php
+++ /dev/null
@@ -1,44 +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
- */
-function add(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/directsum.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/directsum.php
deleted file mode 100644
index 9d15b89bb..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/directsum.php
+++ /dev/null
@@ -1,44 +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
- */
-function directsum(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideby.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideby.php
deleted file mode 100644
index 767d03a5a..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideby.php
+++ /dev/null
@@ -1,44 +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
- */
-function divideby(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideinto.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideinto.php
deleted file mode 100644
index f5cb8dca1..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/divideinto.php
+++ /dev/null
@@ -1,44 +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
- */
-function divideinto(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/multiply.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/multiply.php
deleted file mode 100644
index 1428f091f..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/multiply.php
+++ /dev/null
@@ -1,44 +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
- */
-function multiply(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/subtract.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/subtract.php
deleted file mode 100644
index 3123b61ec..000000000
--- a/libraries/phpspreadsheet/vendor/markbaker/matrix/classes/src/operations/subtract.php
+++ /dev/null
@@ -1,44 +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
- */
-function subtract(...$matrixValues)
-{
-    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/libraries/phpspreadsheet/vendor/markbaker/matrix/composer.json b/libraries/phpspreadsheet/vendor/markbaker/matrix/composer.json
new file mode 100644
index 000000000..e86a1e055
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/composer.json
@@ -0,0 +1,52 @@
+{
+    "name": "markbaker/matrix",
+    "type": "library",
+    "description": "PHP Class for working with matrices",
+    "keywords": ["matrix", "vector", "mathematics"],
+    "homepage": "https://github.com/MarkBaker/PHPMatrix",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Mark Baker",
+            "email": "mark@demon-angel.eu"
+        }
+    ],
+    "require": {
+        "php": "^7.1 || ^8.0"
+    },
+    "require-dev": {
+        "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.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Matrix\\": "classes/src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "MatrixTest\\": "unitTests/classes/src/"
+        }
+    },
+    "scripts": {
+        "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
+        "test": "phpunit -c phpunit.xml.dist",
+        "mess": "phpmd classes/src/ xml codesize,unusedcode,design,naming -n",
+        "lines": "phploc classes/src/ -n",
+        "cpd": "phpcpd classes/src/ -n",
+        "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",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/examples/test.php b/libraries/phpspreadsheet/vendor/markbaker/matrix/examples/test.php
new file mode 100644
index 000000000..071dae910
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/examples/test.php
@@ -0,0 +1,33 @@
+<?php
+
+use Matrix\Matrix;
+use Matrix\Decomposition\QR;
+
+include __DIR__ . '/../vendor/autoload.php';
+
+$grid = [
+    [0, 1],
+    [-1, 0],
+];
+
+$targetGrid = [
+    [-1],
+    [2],
+];
+
+$matrix = new Matrix($grid);
+$target = new Matrix($targetGrid);
+
+$decomposition = new QR($matrix);
+
+$X = $decomposition->solve($target);
+
+echo 'X', PHP_EOL;
+var_export($X->toArray());
+echo PHP_EOL;
+
+$resolve = $matrix->multiply($X);
+
+echo 'Resolve', PHP_EOL;
+var_export($resolve->toArray());
+echo PHP_EOL;
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/infection.json.dist b/libraries/phpspreadsheet/vendor/markbaker/matrix/infection.json.dist
new file mode 100644
index 000000000..eddaa70a2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/infection.json.dist
@@ -0,0 +1,17 @@
+{
+    "timeout": 1,
+    "source": {
+        "directories": [
+            "classes\/src"
+        ]
+    },
+    "logs": {
+        "text": "build/infection/text.log",
+        "summary": "build/infection/summary.log",
+        "debug": "build/infection/debug.log",
+        "perMutator": "build/infection/perMutator.md"
+    },
+    "mutators": {
+        "@default": true
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/license.md b/libraries/phpspreadsheet/vendor/markbaker/matrix/license.md
new file mode 100644
index 000000000..7329058f5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/license.md
@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright © `2018` `Mark Baker`
+
+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.
\ No newline at end of file
diff --git a/libraries/phpspreadsheet/vendor/markbaker/matrix/phpstan.neon b/libraries/phpspreadsheet/vendor/markbaker/matrix/phpstan.neon
new file mode 100644
index 000000000..3d90d4927
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/markbaker/matrix/phpstan.neon
@@ -0,0 +1,6 @@
+parameters:
+    ignoreErrors:
+        - '#Property [A-Za-z\\]+::\$[A-Za-z]+ has no typehint specified#'
+        - '#Method [A-Za-z\\]+::[A-Za-z]+\(\) has no return typehint specified#'
+        - '#Method [A-Za-z\\]+::[A-Za-z]+\(\) has parameter \$[A-Za-z0-9]+ with no typehint specified#'
+    checkMissingIterableValueType: false
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..9ed4b41b2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php
@@ -0,0 +1,223 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->notPath('src/PhpSpreadsheet/Writer/ZipStream3.php')
+    ->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_line_after_opening_tag' => true,
+        'blank_line_before_statement' => false,
+        'blank_lines_before_namespace' => ['max_line_breaks' => 2, 'min_line_breaks' => 2], // we want 1 blank line before namespace
+        'cast_spaces' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
+        'class_definition' => false,
+        '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,
+        'encoding' => true,
+        'ereg_to_preg' => 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
+        'self_static_accessor' => true,
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'full_opening_tag' => true,
+        'fully_qualified_strict_types' => false,
+        'function_declaration' => true,
+        'function_to_constant' => true,
+        'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright']],
+        'global_namespace_import' => true,
+        '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,
+        '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
+        'new_with_parentheses' => ['anonymous_class' => true, 'named_class' => 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_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_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_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' => 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' => false,
+        'phpdoc_var_annotation_correct_order' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+        'protected_to_private' => true,
+        //'psr0' => true,
+        //'psr4' => 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_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' => false,
+        '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
+        'strict_param' => false, // No, too dangerous to change that
+        'string_implicit_backslashes' => false, // was escape_implicit_backslashes, too confusing
+        '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,
+        'type_declaration_spaces' => ['elements' => ['function', 'property']], // was function_typehint_space
+        '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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist
new file mode 100644
index 000000000..3eafb6ca1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+
+    <file>samples</file>
+    <file>src</file>
+    <file>tests</file>
+
+    <exclude-pattern>samples/Header.php</exclude-pattern>
+    <exclude-pattern>*/tests/Core/*/*Test\.(inc|css|js)$</exclude-pattern>
+
+    <arg name="report-width" value="200"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value="/tmp/.phpspreadsheet.phpcs-cache"/>
+    <arg name="colors"/>
+    <arg value="np"/>
+
+    <!-- Include the whole PSR12 standard -->
+    <rule ref="PSR12">
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+    </rule>
+</ruleset>
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CHANGELOG.md b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
new file mode 100644
index 000000000..170398c36
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
@@ -0,0 +1,1416 @@
+# Changelog
+
+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).
+
+## 1.29.2 - 2024-09-29
+
+### Fixed
+
+- Backported security patches.
+- Support for Php8.4.
+- Change to Csv Reader (see below under Deprecated). Backport of PR #4162 intended for 3.0.0. [Issue #4161](https://github.com/PHPOffice/PhpSpreadsheet/issues/4161)
+- Tweaks to ROUNDUP, ROUNDDOWN, TRUNC, AMORDEGRC (results had been different under 8.4).
+
+### Changed
+
+- Images will not be added to spreadsheet if they cannot be validated as images.
+
+### Deprecated
+
+- Php8.4 will deprecate the escape parameter of fgetcsv. Csv Reader is affected by this; code is changed to be unaffected, but this will mean a breaking change is coming with Php9. Any code which uses the default escape value of backslash will fail in Php9. It is recommended to explicitly set the escape value to null string before then.
+
+## 1.29.1 - 2024-09-03
+
+### Fixed
+
+- Backported security patches.
+
+## 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)
+
+### Deprecated
+
+- Rationalisation of Pre-defined Currency Format Masks
+
+### 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
+
+- `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)
+
+### 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.
+- 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 notContainsText Conditional Style in xlsx [Issue #984](https://github.com/PHPOffice/PhpSpreadsheet/issues/984)
+
+### Changed
+
+- Use of `nb` rather than `no` as the locale code for Norsk Bokmål.
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Database`, `Calculation\DateTime`, `Calculation\Engineering`, `Calculation\Financial`, `Calculation\Logical`, `Calculation\LookupRef`, `Calculation\MathTrig`, `Calculation\Statistical`, `Calculation\TextData` and `Calculation\Web` have been moved to dedicated classes for individual functions or 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.
+
+### Removed
+
+- 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 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)
+- 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)
+
+## 1.17.1 - 2021-03-01
+
+### Added
+
+- Implementation of the Excel `AVERAGEIFS()` functions as part of a restructuring of Database functions and Conditional Statistical functions.
+- Support for date values and percentages in query parameters for Database functions, and the IF expressions in functions like COUNTIF() and AVERAGEIF(). [#1875](https://github.com/PHPOffice/PhpSpreadsheet/pull/1875)
+- Support for booleans, and for wildcard text search in query parameters for Database functions, and the IF expressions in functions like COUNTIF() and AVERAGEIF(). [#1876](https://github.com/PHPOffice/PhpSpreadsheet/pull/1876)
+- Implemented DataBar for conditional formatting in Xlsx, providing read/write and creation of (type, value, direction, fills, border, axis position, color settings) as DataBar options in Excel. [#1754](https://github.com/PHPOffice/PhpSpreadsheet/pull/1754)
+- Alignment for ODS Writer [#1796](https://github.com/PHPOffice/PhpSpreadsheet/issues/1796)
+- Basic implementation of the PERMUTATIONA() Statistical Function
+
+### Changed
+
+- Formula functions that previously called PHP functions directly are now processed through the Excel Functions classes; resolving issues with PHP8 stricter typing. [#1789](https://github.com/PHPOffice/PhpSpreadsheet/issues/1789)
+
+  The following MathTrig functions are affected:
+  `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.
+  The following functions are affected `CUMPRINC()`, `CUMIPMT()`, `AMORLINC()`,
+  `AMORDEGRC()`.
+- Adapt some function error return value to match excel's error.
+  The following functions are affected `PPMT()`, `IPMT()`.
+
+### Deprecated
+
+- Calling many of the Excel formula functions directly rather than through the Calculation Engine.
+
+  The logic for these Functions is now being moved out of the categorised `Database`, `DateTime`, `Engineering`, `Financial`, `Logical`, `LookupRef`, `MathTrig`, `Statistical`, `TextData` and `Web` classes into small, dedicated classes for individual functions or related groups of functions.
+
+  This makes the logic in these classes easier to maintain; and will reduce the memory footprint required to execute formulae when calling these functions.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- 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 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 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.
+
+## 1.16.0 - 2020-12-31
+
+### Added
+
+- CSV Reader - Best Guess for Encoding, and Handle Null-string Escape [#1647](https://github.com/PHPOffice/PhpSpreadsheet/issues/1647)
+
+### Changed
+
+- Updated the CONVERT() function to support all current MS Excel categories and Units of Measure.
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Database`, `Calculation\DateTime`, `Calculation\Engineering`, `Calculation\Financial`, `Calculation\Logical`, `Calculation\LookupRef`, `Calculation\MathTrig`, `Calculation\Statistical`, `Calculation\TextData` and `Calculation\Web` have been moved to dedicated classes for individual functions or 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.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- 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
+- Resolve issue with SLK long filenames [#1612](https://github.com/PHPOffice/PhpSpreadsheet/issues/1612)
+- ROUNDUP and ROUNDDOWN return incorrect results for values of 0 [#1627](https://github.com/phpoffice/phpspreadsheet/pull/1627)
+- Apply Column and Row Styles to Existing Cells [#1712](https://github.com/PHPOffice/PhpSpreadsheet/issues/1712) [PR #1721](https://github.com/PHPOffice/PhpSpreadsheet/pull/1721)
+- Resolve issues with defined names where worksheet doesn't exist (#1686)[https://github.com/PHPOffice/PhpSpreadsheet/issues/1686] and [#1723](https://github.com/PHPOffice/PhpSpreadsheet/issues/1723) - [PR #1742](https://github.com/PHPOffice/PhpSpreadsheet/pull/1742)
+- Fix for issue [#1735](https://github.com/PHPOffice/PhpSpreadsheet/issues/1735) Incorrect activeSheetIndex after RemoveSheetByIndex - [PR #1743](https://github.com/PHPOffice/PhpSpreadsheet/pull/1743)
+- Ensure that the list of shared formulae is maintained when an xlsx file is chunked with readFilter[Issue #169](https://github.com/PHPOffice/PhpSpreadsheet/issues/1669).
+- Fix for notice during accessing "cached magnification factor" offset [#1354](https://github.com/PHPOffice/PhpSpreadsheet/pull/1354)
+- Fix compatibility with ext-gd on php 8
+
+### Security Fix (CVE-2020-7776)
+
+- Prevent XSS through cell comments in the HTML Writer.
+
+## 1.15.0 - 2020-10-11
+
+### Added
+
+- Implemented Page Order for Xlsx and Xls Readers, and provided Page Settings (Orientation, Scale, Horizontal/Vertical Centering, Page Order, Margins) support for Ods, Gnumeric and Xls Readers [#1559](https://github.com/PHPOffice/PhpSpreadsheet/pull/1559)
+- Implementation of the Excel `LOGNORM.DIST()`, `NORM.S.DIST()`, `GAMMA()` and `GAUSS()` functions. [#1588](https://github.com/PHPOffice/PhpSpreadsheet/pull/1588)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+  - Defined Names are now case-insensitive
+  - Distinction between named ranges and named formulae
+  - Correct handling of union and intersection operators in named ranges
+  - Correct evaluation of named range operators in calculations
+  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+  - Calculation support for named formulae
+  - Support for nested ranges and formulae (named ranges and formulae that reference other named ranges/formulae) in calculations
+  - Introduction of a helper to convert address formats between R1C1 and A1 (and the reverse)
+  - Proper support for both named ranges and named formulae in all appropriate Readers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously only simple named ranges were supported)
+    - **Gnumeric** (Previously neither named ranges nor formulae were supported)
+    - **Ods** (Previously neither named ranges nor formulae were supported)
+    - **Xml** (Previously neither named ranges nor formulae were supported)
+  - Proper support for named ranges and named formulae in all appropriate Writers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously neither named ranges nor formulae were supported) - Still not supported, but some parser issues resolved that previously failed to differentiate between a defined name and a function name
+    - **Ods** (Previously neither named ranges nor formulae were supported)
+- Support for PHP 8.0
+
+### Changed
+
+- Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1545)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+- fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- Drop $this->spreadSheet null check from Xlsx Writer [#1646](https://github.com/phpoffice/phpspreadsheet/pull/1646)
+- Improving Coverage for Excel2003 XML Reader [#1557](https://github.com/phpoffice/phpspreadsheet/pull/1557)
+
+### Deprecated
+
+- **IMPORTANT NOTE:** This Introduces a **BC break** in the handling of named ranges. Previously, a named range cell reference of `B2` would be treated identically to a named range cell reference of `$B2` or `B$2` or `$B$2` because the calculation engine treated then all as absolute references. These changes "fix" that, so the calculation engine now handles relative references in named ranges correctly.
+  This change that resolves previously incorrect behaviour in the calculation may affect users who have dynamically defined named ranges using relative references when they should have used absolute references.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
+- Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
+- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
+- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)
+- Bug setting Superscript/Subscript to false [#1567](https://github.com/phpoffice/phpspreadsheet/pull/1567)
+
+## 1.14.1 - 2020-07-19
+
+### Added
+
+- nothing
+
+### Fixed
+
+- WEBSERVICE is HTTP client agnostic and must be configured via `Settings::setHttpClient()` [#1562](https://github.com/PHPOffice/PhpSpreadsheet/issues/1562)
+- Borders were not complete on rowspanned columns using HTML reader [#1473](https://github.com/PHPOffice/PhpSpreadsheet/pull/1473)
+
+### Changed
+
+## 1.14.0 - 2020-06-29
+
+### Added
+
+- Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
+- Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
+- Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
+- Add ability to set codepage explicitly for BIFF5 [#1018](https://github.com/PHPOffice/PhpSpreadsheet/issues/1018)
+- Added support for the WEBSERVICE function [#1409](https://github.com/PHPOffice/PhpSpreadsheet/pull/1409)
+
+### Fixed
+
+- Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+- Fix HLOOKUP on single row [#1512](https://github.com/PHPOffice/PhpSpreadsheet/pull/1512)
+- Fix MATCH when comparing different numeric types [#1521](https://github.com/PHPOffice/PhpSpreadsheet/pull/1521)
+- Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
+- Fix for Issue [#1516](https://github.com/PHPOffice/PhpSpreadsheet/issues/1516) (Cloning worksheet makes corrupted Xlsx) [#1530](https://github.com/PHPOffice/PhpSpreadsheet/pull/1530)
+- Fix For Issue [#1509](https://github.com/PHPOffice/PhpSpreadsheet/issues/1509) (Can not set empty enclosure for CSV) [#1518](https://github.com/PHPOffice/PhpSpreadsheet/pull/1518)
+- Fix for Issue [#1505](https://github.com/PHPOffice/PhpSpreadsheet/issues/1505) (TypeError : Argument 4 passed to PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeAttributeIf() must be of the type string) [#1525](https://github.com/PHPOffice/PhpSpreadsheet/pull/1525)
+- Fix for Issue [#1495](https://github.com/PHPOffice/PhpSpreadsheet/issues/1495) (Sheet index being changed when multiple sheets are used in formula) [#1500]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1500))
+- Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534](https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
+- Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
+- Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
+
+## 1.13.0 - 2020-05-31
+
+### Added
+
+- Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
+- Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
+- Support protection of worksheet by a specific hash algorithm [#1485](https://github.com/PHPOffice/PhpSpreadsheet/pull/1485)
+
+### Fixed
+
+- Fix Chart samples by updating chart parameter from 0 to DataSeries::EMPTY_AS_GAP [#1448](https://github.com/PHPOffice/PhpSpreadsheet/pull/1448)
+- Fix return type in docblock for the Cells::get() [#1398](https://github.com/PHPOffice/PhpSpreadsheet/pull/1398)
+- Fix RATE, PRICE, XIRR, and XNPV Functions [#1456](https://github.com/PHPOffice/PhpSpreadsheet/pull/1456)
+- Save Excel 2010+ functions properly in XLSX [#1461](https://github.com/PHPOffice/PhpSpreadsheet/pull/1461)
+- Several improvements in HTML writer [#1464](https://github.com/PHPOffice/PhpSpreadsheet/pull/1464)
+- Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
+- Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
+- Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
+- Stricter typing for mergeCells [#1494](https://github.com/PHPOffice/PhpSpreadsheet/pull/1494)
+
+### Changed
+
+- Drop support for PHP 7.1, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+- Drop partial migration tool in favor of complete migration via RectorPHP [#1445](https://github.com/PHPOffice/PhpSpreadsheet/issues/1445)
+- Limit composer package to `src/` [#1424](https://github.com/PHPOffice/PhpSpreadsheet/pull/1424)
+
+## 1.12.0 - 2020-04-27
+
+### Added
+
+- Improved the ARABIC function to also handle short-hand roman numerals
+- Added support for the FLOOR.MATH and FLOOR.PRECISE functions [#1351](https://github.com/PHPOffice/PhpSpreadsheet/pull/1351)
+
+### Fixed
+
+- Fix ROUNDUP and ROUNDDOWN for floating-point rounding error [#1404](https://github.com/PHPOffice/PhpSpreadsheet/pull/1404)
+- Fix ROUNDUP and ROUNDDOWN for negative number [#1417](https://github.com/PHPOffice/PhpSpreadsheet/pull/1417)
+- Fix loading styles from vmlDrawings when containing whitespace [#1347](https://github.com/PHPOffice/PhpSpreadsheet/issues/1347)
+- Fix incorrect behavior when removing last row [#1365](https://github.com/PHPOffice/PhpSpreadsheet/pull/1365)
+- MATCH with a static array should return the position of the found value based on the values submitted [#1332](https://github.com/PHPOffice/PhpSpreadsheet/pull/1332)
+- Fix Xlsx Reader's handling of undefined fill color [#1353](https://github.com/PHPOffice/PhpSpreadsheet/pull/1353)
+
+## 1.11.0 - 2020-03-02
+
+### Added
+
+- Added support for the BASE function
+- Added support for the ARABIC function
+- Conditionals - Extend Support for (NOT)CONTAINSBLANKS [#1278](https://github.com/PHPOffice/PhpSpreadsheet/pull/1278)
+
+### Fixed
+
+- Handle Error in Formula Processing Better for Xls [#1267](https://github.com/PHPOffice/PhpSpreadsheet/pull/1267)
+- Handle ConditionalStyle NumberFormat When Reading Xlsx File [#1296](https://github.com/PHPOffice/PhpSpreadsheet/pull/1296)
+- Fix Xlsx Writer's handling of decimal commas [#1282](https://github.com/PHPOffice/PhpSpreadsheet/pull/1282)
+- Fix for issue by removing test code mistakenly left in [#1328](https://github.com/PHPOffice/PhpSpreadsheet/pull/1328)
+- Fix for Xls writer wrong selected cells and active sheet [#1256](https://github.com/PHPOffice/PhpSpreadsheet/pull/1256)
+- Fix active cell when freeze pane is used [#1323](https://github.com/PHPOffice/PhpSpreadsheet/pull/1323)
+- Fix XLSX file loading with autofilter containing '$' [#1326](https://github.com/PHPOffice/PhpSpreadsheet/pull/1326)
+- PHPDoc - Use `@return $this` for fluent methods [#1362](https://github.com/PHPOffice/PhpSpreadsheet/pull/1362)
+
+## 1.10.1 - 2019-12-02
+
+### Changed
+
+- PHP 7.4 compatibility
+
+### Fixed
+
+- FLOOR() function accept negative number and negative significance [#1245](https://github.com/PHPOffice/PhpSpreadsheet/pull/1245)
+- Correct column style even when using rowspan [#1249](https://github.com/PHPOffice/PhpSpreadsheet/pull/1249)
+- Do not confuse defined names and cell refs [#1263](https://github.com/PHPOffice/PhpSpreadsheet/pull/1263)
+- XLSX reader/writer keep decimal for floats with a zero decimal part [#1262](https://github.com/PHPOffice/PhpSpreadsheet/pull/1262)
+- ODS writer prevent invalid numeric value if locale decimal separator is comma [#1268](https://github.com/PHPOffice/PhpSpreadsheet/pull/1268)
+- Xlsx writer actually writes plotVisOnly and dispBlanksAs from chart properties [#1266](https://github.com/PHPOffice/PhpSpreadsheet/pull/1266)
+
+## 1.10.0 - 2019-11-18
+
+### Changed
+
+- Change license from LGPL 2.1 to MIT [#140](https://github.com/PHPOffice/PhpSpreadsheet/issues/140)
+
+### Added
+
+- Implementation of IFNA() logical function
+- Support "showZeros" worksheet option to change how Excel shows and handles "null" values returned from a calculation
+- Allow HTML Reader to accept HTML as a string into an existing spreadsheet [#1212](https://github.com/PHPOffice/PhpSpreadsheet/pull/1212)
+
+### Fixed
+
+- IF implementation properly handles the value `#N/A` [#1165](https://github.com/PHPOffice/PhpSpreadsheet/pull/1165)
+- Formula Parser: Wrong line count for stuff like "MyOtherSheet!A:D" [#1215](https://github.com/PHPOffice/PhpSpreadsheet/issues/1215)
+- Call garbage collector after removing a column to prevent stale cached values
+- Trying to remove a column that doesn't exist deletes the latest column
+- Keep big integer as integer instead of lossely casting to float [#874](https://github.com/PHPOffice/PhpSpreadsheet/pull/874)
+- Fix branch pruning handling of non boolean conditions [#1167](https://github.com/PHPOffice/PhpSpreadsheet/pull/1167)
+- Fix ODS Reader when no DC namespace are defined [#1182](https://github.com/PHPOffice/PhpSpreadsheet/pull/1182)
+- Fixed Functions->ifCondition for allowing <> and empty condition [#1206](https://github.com/PHPOffice/PhpSpreadsheet/pull/1206)
+- Validate XIRR inputs and return correct error values [#1120](https://github.com/PHPOffice/PhpSpreadsheet/issues/1120)
+- Allow to read xlsx files with exotic workbook names like "workbook2.xml" [#1183](https://github.com/PHPOffice/PhpSpreadsheet/pull/1183)
+
+## 1.9.0 - 2019-08-17
+
+### Changed
+
+- Drop support for PHP 5.6 and 7.0, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+
+### Added
+
+- When &lt;br&gt; appears in a table cell, set the cell to wrap [#1071](https://github.com/PHPOffice/PhpSpreadsheet/issues/1071) and [#1070](https://github.com/PHPOffice/PhpSpreadsheet/pull/1070)
+- Add MAXIFS, MINIFS, COUNTIFS and Remove MINIF, MAXIF [#1056](https://github.com/PHPOffice/PhpSpreadsheet/issues/1056)
+- HLookup needs an ordered list even if range_lookup is set to false [#1055](https://github.com/PHPOffice/PhpSpreadsheet/issues/1055) and [#1076](https://github.com/PHPOffice/PhpSpreadsheet/pull/1076)
+- Improve performance of IF function calls via ranch pruning to avoid resolution of every branches [#844](https://github.com/PHPOffice/PhpSpreadsheet/pull/844)
+- MATCH function supports `*?~` Excel functionality, when match_type=0 [#1116](https://github.com/PHPOffice/PhpSpreadsheet/issues/1116)
+- Allow HTML Reader to accept HTML as a string [#1136](https://github.com/PHPOffice/PhpSpreadsheet/pull/1136)
+
+### Fixed
+
+- Fix to AVERAGEIF() function when called with a third argument
+- Eliminate duplicate fill none style entries [#1066](https://github.com/PHPOffice/PhpSpreadsheet/issues/1066)
+- Fix number format masks containing literal (non-decimal point) dots [#1079](https://github.com/PHPOffice/PhpSpreadsheet/issues/1079)
+- Fix number format masks containing named colours that were being misinterpreted as date formats; and add support for masks that fully replace the value with a full text string [#1009](https://github.com/PHPOffice/PhpSpreadsheet/issues/1009)
+- Stricter-typed comparison testing in COUNTIF() and COUNTIFS() evaluation [#1046](https://github.com/PHPOffice/PhpSpreadsheet/issues/1046)
+- COUPNUM should not return zero when settlement is in the last period [#1020](https://github.com/PHPOffice/PhpSpreadsheet/issues/1020) and [#1021](https://github.com/PHPOffice/PhpSpreadsheet/pull/1021)
+- Fix handling of named ranges referencing sheets with spaces or "!" in their title
+- Cover `getSheetByName()` with tests for name with quote and spaces [#739](https://github.com/PHPOffice/PhpSpreadsheet/issues/739)
+- Best effort to support invalid colspan values in HTML reader - [#878](https://github.com/PHPOffice/PhpSpreadsheet/pull/878)
+- Fixes incorrect rows deletion [#868](https://github.com/PHPOffice/PhpSpreadsheet/issues/868)
+- MATCH function fix (value search by type, stop search when match_type=-1 and unordered element encountered) [#1116](https://github.com/PHPOffice/PhpSpreadsheet/issues/1116)
+- Fix `getCalculatedValue()` error with more than two INDIRECT [#1115](https://github.com/PHPOffice/PhpSpreadsheet/pull/1115)
+- Writer\Html did not hide columns [#985](https://github.com/PHPOffice/PhpSpreadsheet/pull/985)
+
+## 1.8.2 - 2019-07-08
+
+### Fixed
+
+- Uncaught error when opening ods file and properties aren't defined [#1047](https://github.com/PHPOffice/PhpSpreadsheet/issues/1047)
+- Xlsx Reader Cell datavalidations bug [#1052](https://github.com/PHPOffice/PhpSpreadsheet/pull/1052)
+
+## 1.8.1 - 2019-07-02
+
+### Fixed
+
+- Allow nullable theme for Xlsx Style Reader class [#1043](https://github.com/PHPOffice/PhpSpreadsheet/issues/1043)
+
+## 1.8.0 - 2019-07-01
+
+### Security Fix (CVE-2019-12331)
+
+- Detect double-encoded xml in the Security scanner, and reject as suspicious.
+- This change also broadens the scope of the `libxml_disable_entity_loader` setting when reading XML-based formats, so that it is enabled while the xml is being parsed and not simply while it is loaded.
+  On some versions of PHP, this can cause problems because it is not thread-safe, and can affect other PHP scripts running on the same server. This flag is set to true when instantiating a loader, and back to its original setting when the Reader is no longer in scope, or manually unset.
+- Provide a check to identify whether libxml_disable_entity_loader is thread-safe or not.
+
+  `XmlScanner::threadSafeLibxmlDisableEntityLoaderAvailability()`
+- Provide an option to disable the libxml_disable_entity_loader call through settings. This is not recommended as it reduces the security of the XML-based readers, and should only be used if you understand the consequences and have no other choice.
+
+### Added
+
+- Added support for the SWITCH function [#963](https://github.com/PHPOffice/PhpSpreadsheet/issues/963) and [#983](https://github.com/PHPOffice/PhpSpreadsheet/pull/983)
+- Add accounting number format style [#974](https://github.com/PHPOffice/PhpSpreadsheet/pull/974)
+
+### Fixed
+
+- Whitelist `tsv` extension when opening CSV files [#429](https://github.com/PHPOffice/PhpSpreadsheet/issues/429)
+- Fix a SUMIF warning with some versions of PHP when having different length of arrays provided as input [#873](https://github.com/PHPOffice/PhpSpreadsheet/pull/873)
+- Fix incorrectly handled backslash-escaped space characters in number format
+
+## 1.7.0 - 2019-05-26
+
+- Added support for inline styles in Html reader (borders, alignment, width, height)
+- QuotedText cells no longer treated as formulae if the content begins with a `=`
+- Clean handling for DDE in formulae
+
+### Fixed
+
+- Fix handling for escaped enclosures and new lines in CSV Separator Inference
+- Fix MATCH an error was appearing when comparing strings against 0 (always true)
+- Fix wrong calculation of highest column with specified row [#700](https://github.com/PHPOffice/PhpSpreadsheet/issues/700)
+- Fix VLOOKUP
+- Fix return type hint
+
+## 1.6.0 - 2019-01-02
+
+### Added
+
+- Refactored Matrix Functions to use external Matrix library
+- Possibility to specify custom colors of values for pie and donut charts [#768](https://github.com/PHPOffice/PhpSpreadsheet/pull/768)
+
+### Fixed
+
+- Improve XLSX parsing speed if no readFilter is applied [#772](https://github.com/PHPOffice/PhpSpreadsheet/issues/772)
+- Fix column names if read filter calls in XLSX reader skip columns [#777](https://github.com/PHPOffice/PhpSpreadsheet/pull/777)
+- XLSX reader can now ignore blank cells, using the setReadEmptyCells(false) method. [#810](https://github.com/PHPOffice/PhpSpreadsheet/issues/810)
+- Fix LOOKUP function which was breaking on edge cases [#796](https://github.com/PHPOffice/PhpSpreadsheet/issues/796)
+- Fix VLOOKUP with exact matches [#809](https://github.com/PHPOffice/PhpSpreadsheet/pull/809)
+- Support COUNTIFS multiple arguments [#830](https://github.com/PHPOffice/PhpSpreadsheet/pull/830)
+- Change `libxml_disable_entity_loader()` as shortly as possible [#819](https://github.com/PHPOffice/PhpSpreadsheet/pull/819)
+- Improved memory usage and performance when loading large spreadsheets [#822](https://github.com/PHPOffice/PhpSpreadsheet/pull/822)
+- Improved performance when loading large spreadsheets [#825](https://github.com/PHPOffice/PhpSpreadsheet/pull/825)
+- Improved performance when loading large spreadsheets [#824](https://github.com/PHPOffice/PhpSpreadsheet/pull/824)
+- Fix color from CSS when reading from HTML [#831](https://github.com/PHPOffice/PhpSpreadsheet/pull/831)
+- Fix infinite loop when reading invalid ODS files [#832](https://github.com/PHPOffice/PhpSpreadsheet/pull/832)
+- Fix time format for duration is incorrect [#666](https://github.com/PHPOffice/PhpSpreadsheet/pull/666)
+- Fix iconv unsupported `//IGNORE//TRANSLIT` on IBM i [#791](https://github.com/PHPOffice/PhpSpreadsheet/issues/791)
+
+### Changed
+
+- `master` is the new default branch, `develop` does not exist anymore
+
+## 1.5.2 - 2018-11-25
+
+### Security
+
+- Improvements to the design of the XML Security Scanner [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
+
+## 1.5.1 - 2018-11-20
+
+### Security
+
+- Fix and improve XXE security scanning for XML-based and HTML Readers [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
+
+### Added
+
+- Support page margin in mPDF [#750](https://github.com/PHPOffice/PhpSpreadsheet/issues/750)
+
+### Fixed
+
+- Support numeric condition in SUMIF, SUMIFS, AVERAGEIF, COUNTIF, MAXIF and MINIF [#683](https://github.com/PHPOffice/PhpSpreadsheet/issues/683)
+- SUMIFS containing multiple conditions [#704](https://github.com/PHPOffice/PhpSpreadsheet/issues/704)
+- Csv reader avoid notice when the file is empty [#743](https://github.com/PHPOffice/PhpSpreadsheet/pull/743)
+- Fix print area parser for XLSX reader [#734](https://github.com/PHPOffice/PhpSpreadsheet/pull/734)
+- Support overriding `DefaultValueBinder::dataTypeForValue()` without overriding `DefaultValueBinder::bindValue()` [#735](https://github.com/PHPOffice/PhpSpreadsheet/pull/735)
+- Mpdf export can exceed pcre.backtrack_limit [#637](https://github.com/PHPOffice/PhpSpreadsheet/issues/637)
+- Fix index overflow on data values array [#748](https://github.com/PHPOffice/PhpSpreadsheet/pull/748)
+
+## 1.5.0 - 2018-10-21
+
+### Added
+
+- PHP 7.3 support
+- Add the DAYS() function [#594](https://github.com/PHPOffice/PhpSpreadsheet/pull/594)
+
+### Fixed
+
+- Sheet title can contain exclamation mark [#325](https://github.com/PHPOffice/PhpSpreadsheet/issues/325)
+- Xls file cause the exception during open by Xls reader [#402](https://github.com/PHPOffice/PhpSpreadsheet/issues/402)
+- Skip non numeric value in SUMIF [#618](https://github.com/PHPOffice/PhpSpreadsheet/pull/618)
+- OFFSET should allow omitted height and width [#561](https://github.com/PHPOffice/PhpSpreadsheet/issues/561)
+- Correctly determine delimiter when CSV contains line breaks inside enclosures [#716](https://github.com/PHPOffice/PhpSpreadsheet/issues/716)
+
+## 1.4.1 - 2018-09-30
+
+### Fixed
+
+- Remove locale from formatting string [#644](https://github.com/PHPOffice/PhpSpreadsheet/pull/644)
+- Allow iterators to go out of bounds with prev [#587](https://github.com/PHPOffice/PhpSpreadsheet/issues/587)
+- Fix warning when reading xlsx without styles [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)
+- Fix broken sample links on windows due to $baseDir having backslash [#653](https://github.com/PHPOffice/PhpSpreadsheet/pull/653)
+
+## 1.4.0 - 2018-08-06
+
+### Added
+
+- Add excel function EXACT(value1, value2) support [#595](https://github.com/PHPOffice/PhpSpreadsheet/pull/595)
+- Support workbook view attributes for Xlsx format [#523](https://github.com/PHPOffice/PhpSpreadsheet/issues/523)
+- Read and write hyperlink for drawing image [#490](https://github.com/PHPOffice/PhpSpreadsheet/pull/490)
+- Added calculation engine support for the new bitwise functions that were added in MS Excel 2013
+  - BITAND()          Returns a Bitwise 'And' of two numbers
+  - BITOR()           Returns a Bitwise 'Or' of two number
+  - BITXOR()          Returns a Bitwise 'Exclusive Or' of two numbers
+  - BITLSHIFT()       Returns a number shifted left by a specified number of bits
+  - BITRSHIFT()       Returns a number shifted right by a specified number of bits
+- Added calculation engine support for other new functions that were added in MS Excel 2013 and MS Excel 2016
+  - Text Functions
+    - CONCAT()        Synonym for CONCATENATE()
+    - NUMBERVALUE()   Converts text to a number, in a locale-independent way
+    - UNICHAR()       Synonym for CHAR() in PHPSpreadsheet, which has always used UTF-8 internally
+    - UNIORD()        Synonym for ORD() in PHPSpreadsheet, which has always used UTF-8 internally
+    - TEXTJOIN()      Joins together two or more text strings, separated by a delimiter
+  - Logical Functions
+    - XOR()           Returns a logical Exclusive Or of all arguments
+  - Date/Time Functions
+    - ISOWEEKNUM()    Returns the ISO 8601 week number of the year for a given date
+  - Lookup and Reference Functions
+    - FORMULATEXT()   Returns a formula as a string
+  - Financial Functions
+    - PDURATION()     Calculates the number of periods required for an investment to reach a specified value
+    - RRI()           Calculates the interest rate required for an investment to grow to a specified future value
+  - Engineering Functions
+    - ERF.PRECISE()   Returns the error function integrated between 0 and a supplied limit
+    - ERFC.PRECISE()  Synonym for ERFC
+  - Math and Trig Functions
+    - SEC()           Returns the secant of an angle
+    - SECH()          Returns the hyperbolic secant of an angle
+    - CSC()           Returns the cosecant of an angle
+    - CSCH()          Returns the hyperbolic cosecant of an angle
+    - COT()           Returns the cotangent of an angle
+    - COTH()          Returns the hyperbolic cotangent of an angle
+    - ACOT()          Returns the cotangent of an angle
+    - ACOTH()         Returns the hyperbolic cotangent of an angle
+- Refactored Complex Engineering Functions to use external complex number library
+- Added calculation engine support for the new complex number functions that were added in MS Excel 2013
+    - IMCOSH()        Returns the hyperbolic cosine of a complex number
+    - IMCOT()         Returns the cotangent of a complex number
+    - IMCSC()         Returns the cosecant of a complex number
+    - IMCSCH()        Returns the hyperbolic cosecant of a complex number
+    - IMSEC()         Returns the secant of a complex number
+    - IMSECH()        Returns the hyperbolic secant of a complex number
+    - IMSINH()        Returns the hyperbolic sine of a complex number
+    - IMTAN()         Returns the tangent of a complex number
+
+### Fixed
+
+- Fix ISFORMULA() function to work with a cell reference to another worksheet
+- Xlsx reader crashed when reading a file with workbook protection [#553](https://github.com/PHPOffice/PhpSpreadsheet/pull/553)
+- Cell formats with escaped spaces were causing incorrect date formatting [#557](https://github.com/PHPOffice/PhpSpreadsheet/issues/557)
+- Could not open CSV file containing HTML fragment [#564](https://github.com/PHPOffice/PhpSpreadsheet/issues/564)
+- Exclude the vendor folder in migration [#481](https://github.com/PHPOffice/PhpSpreadsheet/issues/481)
+- Chained operations on cell ranges involving borders operated on last cell only [#428](https://github.com/PHPOffice/PhpSpreadsheet/issues/428)
+- Avoid memory exhaustion when cloning worksheet with a drawing [#437](https://github.com/PHPOffice/PhpSpreadsheet/issues/437)
+- Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
+- Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
+
+## 1.3.1 - 2018-06-12
+
+### Fixed
+
+- Ranges across Z and AA columns incorrectly threw an exception [#545](https://github.com/PHPOffice/PhpSpreadsheet/issues/545)
+
+## 1.3.0 - 2018-06-10
+
+### Added
+
+- Support to read Xlsm templates with form elements, macros, printer settings, protected elements and back compatibility drawing, and save result without losing important elements of document [#435](https://github.com/PHPOffice/PhpSpreadsheet/issues/435)
+- Expose sheet title maximum length as `Worksheet::SHEET_TITLE_MAXIMUM_LENGTH` [#482](https://github.com/PHPOffice/PhpSpreadsheet/issues/482)
+- Allow escape character to be set in CSV reader [#492](https://github.com/PHPOffice/PhpSpreadsheet/issues/492)
+
+### Fixed
+
+- Subtotal 9 in a group that has other subtotals 9 exclude the totals of the other subtotals in the range [#332](https://github.com/PHPOffice/PhpSpreadsheet/issues/332)
+- `Helper\Html` support UTF-8 HTML input [#444](https://github.com/PHPOffice/PhpSpreadsheet/issues/444)
+- Xlsx loaded an extra empty comment for each real comment [#375](https://github.com/PHPOffice/PhpSpreadsheet/issues/375)
+- Xlsx reader do not read rows and columns filtered out in readFilter at all [#370](https://github.com/PHPOffice/PhpSpreadsheet/issues/370)
+- Make newer Excel versions properly recalculate formulas on document open [#456](https://github.com/PHPOffice/PhpSpreadsheet/issues/456)
+- `Coordinate::extractAllCellReferencesInRange()` throws an exception for an invalid range [#519](https://github.com/PHPOffice/PhpSpreadsheet/issues/519)
+- Fixed parsing of conditionals in COUNTIF functions [#526](https://github.com/PHPOffice/PhpSpreadsheet/issues/526)
+- Corruption errors for saved Xlsx docs with frozen panes [#532](https://github.com/PHPOffice/PhpSpreadsheet/issues/532)
+
+## 1.2.1 - 2018-04-10
+
+### Fixed
+
+- Plain text and richtext mixed in same cell can be read [#442](https://github.com/PHPOffice/PhpSpreadsheet/issues/442)
+
+## 1.2.0 - 2018-03-04
+
+### Added
+
+- HTML writer creates a generator meta tag [#312](https://github.com/PHPOffice/PhpSpreadsheet/issues/312)
+- Support invalid zoom value in XLSX format [#350](https://github.com/PHPOffice/PhpSpreadsheet/pull/350)
+- Support for `_xlfn.` prefixed functions and `ISFORMULA`, `MODE.SNGL`, `STDEV.S`, `STDEV.P` [#390](https://github.com/PHPOffice/PhpSpreadsheet/pull/390)
+
+### Fixed
+
+- Avoid potentially unsupported PSR-16 cache keys [#354](https://github.com/PHPOffice/PhpSpreadsheet/issues/354)
+- Check for MIME type to know if CSV reader can read a file [#167](https://github.com/PHPOffice/PhpSpreadsheet/issues/167)
+- Use proper € symbol for currency format [#379](https://github.com/PHPOffice/PhpSpreadsheet/pull/379)
+- Read printing area correctly when skipping some sheets [#371](https://github.com/PHPOffice/PhpSpreadsheet/issues/371)
+- Avoid incorrectly overwriting calculated value type [#394](https://github.com/PHPOffice/PhpSpreadsheet/issues/394)
+- Select correct cell when calling freezePane [#389](https://github.com/PHPOffice/PhpSpreadsheet/issues/389)
+- `setStrikethrough()` did not set the font [#403](https://github.com/PHPOffice/PhpSpreadsheet/issues/403)
+
+## 1.1.0 - 2018-01-28
+
+### Added
+
+- Support for PHP 7.2
+- Support cell comments in HTML writer and reader [#308](https://github.com/PHPOffice/PhpSpreadsheet/issues/308)
+- Option to stop at a conditional styling, if it matches (only XLSX format) [#292](https://github.com/PHPOffice/PhpSpreadsheet/pull/292)
+- Support for line width for data series when rendering Xlsx [#329](https://github.com/PHPOffice/PhpSpreadsheet/pull/329)
+
+### Fixed
+
+- Better auto-detection of CSV separators [#305](https://github.com/PHPOffice/PhpSpreadsheet/issues/305)
+- Support for shape style ending with `;` [#304](https://github.com/PHPOffice/PhpSpreadsheet/issues/304)
+- Freeze Panes takes wrong coordinates for XLSX [#322](https://github.com/PHPOffice/PhpSpreadsheet/issues/322)
+- `COLUMNS` and `ROWS` functions crashed in some cases [#336](https://github.com/PHPOffice/PhpSpreadsheet/issues/336)
+- Support XML file without styles [#331](https://github.com/PHPOffice/PhpSpreadsheet/pull/331)
+- Cell coordinates which are already a range cause an exception [#319](https://github.com/PHPOffice/PhpSpreadsheet/issues/319)
+
+## 1.0.0 - 2017-12-25
+
+### Added
+
+- Support to write merged cells in ODS format [#287](https://github.com/PHPOffice/PhpSpreadsheet/issues/287)
+- Able to set the `topLeftCell` in freeze panes [#261](https://github.com/PHPOffice/PhpSpreadsheet/pull/261)
+- Support `DateTimeImmutable` as cell value
+- Support migration of prefixed classes
+
+### Fixed
+
+- Can read very small HTML files [#194](https://github.com/PHPOffice/PhpSpreadsheet/issues/194)
+- Written DataValidation was corrupted [#290](https://github.com/PHPOffice/PhpSpreadsheet/issues/290)
+- Date format compatible with both LibreOffice and Excel [#298](https://github.com/PHPOffice/PhpSpreadsheet/issues/298)
+
+### BREAKING CHANGE
+
+- Constant `TYPE_DOUGHTNUTCHART` is now `TYPE_DOUGHNUTCHART`.
+
+## 1.0.0-beta2 - 2017-11-26
+
+### Added
+
+- Support for chart fill color - @CrazyBite [#158](https://github.com/PHPOffice/PhpSpreadsheet/pull/158)
+- Support for read Hyperlink for xml - @GreatHumorist [#223](https://github.com/PHPOffice/PhpSpreadsheet/pull/223)
+- Support for cell value validation according to data validation rules - @SailorMax [#257](https://github.com/PHPOffice/PhpSpreadsheet/pull/257)
+- Support for custom implementation, or configuration, of PDF libraries - @SailorMax [#266](https://github.com/PHPOffice/PhpSpreadsheet/pull/266)
+
+### Changed
+
+- Merge data-validations to reduce written worksheet size - @billblume [#131](https://github.com/PHPOffice/PhpSpreadSheet/issues/131)
+- Throws exception if a XML file is invalid - @GreatHumorist [#222](https://github.com/PHPOffice/PhpSpreadsheet/pull/222)
+- Upgrade to mPDF 7.0+ [#144](https://github.com/PHPOffice/PhpSpreadsheet/issues/144)
+
+### Fixed
+
+- Control characters in cell values are automatically escaped [#212](https://github.com/PHPOffice/PhpSpreadsheet/issues/212)
+- Prevent color changing when copy/pasting xls files written by PhpSpreadsheet to another file - @al-lala [#218](https://github.com/PHPOffice/PhpSpreadsheet/issues/218)
+- Add cell reference automatic when there is no cell reference('r' attribute) in Xlsx file. - @GreatHumorist [#225](https://github.com/PHPOffice/PhpSpreadsheet/pull/225) Refer to [#201](https://github.com/PHPOffice/PhpSpreadsheet/issues/201)
+- `Reader\Xlsx::getFromZipArchive()` function return false if the zip entry could not be located. - @anton-harvey [#268](https://github.com/PHPOffice/PhpSpreadsheet/pull/268)
+
+### BREAKING CHANGE
+
+- Extracted coordinate method to dedicate class [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Column indexes are based on 1, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Standardization of array keys used for style, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Easier usage of PDF writers, and other custom readers and writers, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Easier usage of chart renderers, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Rename a few more classes to keep them in their related namespaces:
+    - `CalcEngine` => `Calculation\Engine`
+    - `PhpSpreadsheet\Calculation` => `PhpSpreadsheet\Calculation\Calculation`
+    - `PhpSpreadsheet\Cell` => `PhpSpreadsheet\Cell\Cell`
+    - `PhpSpreadsheet\Chart` => `PhpSpreadsheet\Chart\Chart`
+    - `PhpSpreadsheet\RichText` => `PhpSpreadsheet\RichText\RichText`
+    - `PhpSpreadsheet\Style` => `PhpSpreadsheet\Style\Style`
+    - `PhpSpreadsheet\Worksheet` => `PhpSpreadsheet\Worksheet\Worksheet`
+
+## 1.0.0-beta - 2017-08-17
+
+### Added
+
+- Initial implementation of SUMIFS() function
+- Additional codepages
+- MemoryDrawing not working in HTML writer [#808](https://github.com/PHPOffice/PHPExcel/issues/808)
+- CSV Reader can auto-detect the separator used in file [#141](https://github.com/PHPOffice/PhpSpreadsheet/pull/141)
+- HTML Reader supports some basic inline styles [#180](https://github.com/PHPOffice/PhpSpreadsheet/pull/180)
+
+### Changed
+
+- Start following [SemVer](https://semver.org) properly.
+
+### Fixed
+
+- Fix to getCell() method when cell reference includes a worksheet reference - @MarkBaker
+- 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)
+
+### General
+
+- Whitespace after toRichTextObject() - @MarkBaker [#554](https://github.com/PHPOffice/PHPExcel/issues/554)
+- Optimize vlookup() sort - @umpirsky [#548](https://github.com/PHPOffice/PHPExcel/issues/548)
+- c:max and c:min elements shall NOT be inside c:orientation elements - @vitalyrepin [#869](https://github.com/PHPOffice/PHPExcel/pull/869)
+- Implement actual timezone adjustment into PHPExcel_Shared_Date::PHPToExcel - @sim642 [#489](https://github.com/PHPOffice/PHPExcel/pull/489)
+
+### BREAKING CHANGE
+
+- Introduction of namespaces for all classes, eg: `PHPExcel_Calculation_Functions` becomes `PhpOffice\PhpSpreadsheet\Calculation\Functions`
+- Some classes were renamed for clarity and/or consistency:
+
+For a comprehensive list of all class changes, and a semi-automated migration path, read the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+
+- Dropped `PHPExcel_Calculation_Functions::VERSION()`. Composer or git should be used to know the version.
+- Dropped `PHPExcel_Settings::setPdfRenderer()` and `PHPExcel_Settings::setPdfRenderer()`. Composer should be used to autoload PDF libs.
+- Dropped support for HHVM
+
+## Previous versions of PHPExcel
+
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
new file mode 100644
index 000000000..09794b565
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# Want to contribute?
+
+If you would like to contribute, here are some notes and guidelines:
+
+ - 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 (currently PHP 7.4 to PHP 8.2).
+   - 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 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/LICENSE b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/LICENSE
new file mode 100644
index 000000000..3ec5723dd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/LICENSE
@@ -0,0 +1,21 @@
+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:
+
+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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/README.md b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/README.md
new file mode 100644
index 000000000..a69c3afc9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/README.md
@@ -0,0 +1,144 @@
+# PhpSpreadsheet
+
+[![Build Status](https://github.com/PHPOffice/PhpSpreadsheet/workflows/main/badge.svg)](https://github.com/PHPOffice/PhpSpreadsheet/actions)
+[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
+[![Total Downloads](https://img.shields.io/packagist/dt/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Latest Stable Version](https://img.shields.io/github/v/release/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![License](https://img.shields.io/github/license/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet)
+
+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.
+
+## PHP Version Support
+
+LTS: Support for PHP versions will only be maintained for a period of six months beyond the
+[end of life](https://www.php.net/supported-versions) of that PHP version.
+
+Currently the required PHP minimum version is PHP __7.4__, and we [will support that version](https://www.php.net/eol.php) until 28th June 2023.
+
+See the `composer.json` for other requirements.
+
+## Installation
+
+Use [composer](https://getcomposer.org) to install PhpSpreadsheet into your project:
+
+```sh
+composer require phpoffice/phpspreadsheet
+```
+
+If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
+```json
+{
+    "require": {
+        "phpoffice/phpspreadsheet": "^1.28"
+    },
+    "config": {
+        "platform": {
+            "php": "7.4"
+        }
+    }
+}
+```
+and then run
+```sh
+composer install
+```
+to ensure that the correct dependencies are retrieved to match your deployment environment.
+
+See [CLI vs Application run-time](https://php.watch/articles/composer-platform-check) for more details.
+
+### Additional Installation Options
+
+If you want to write to PDF, or to include Charts when you write to HTML or PDF, then you will need to install additional libraries:
+
+#### PDF
+
+For PDF Generation, you can install any of the following, and then configure PhpSpreadsheet to indicate which library you are going to use:
+ - mpdf/mpdf
+ - dompdf/dompdf
+ - tecnickcom/tcpdf
+
+and configure PhpSpreadsheet using:
+
+```php
+// Dompdf, Mpdf or Tcpdf (as appropriate)
+$className = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class;
+IOFactory::registerWriter('Pdf', $className);
+```
+or the appropriate PDF Writer wrapper for the library that you have chosen to install.
+
+#### Chart Export
+
+For Chart export, we support following packages, which you will also need to install yourself using `composer require`
+ - [jpgraph/jpgraph](https://packagist.org/packages/jpgraph/jpgraph) (this package was abandoned at version 4.0. 
+   You can manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/))
+ - [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) - up to date fork with modern PHP versions support and some bugs fixed.
+
+and then configure PhpSpreadsheet using:
+```php
+// to use jpgraph/jpgraph
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+//or
+// to use mitoteam/jpgraph
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+```
+
+One or the other of these libraries is necessary if you want to generate HTML or PDF files that include charts; or to render a Chart to an Image format from within your code.
+They are not necessary to define charts for writing to `Xlsx` files.
+Other file formats don't support writing Charts.
+
+## 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.).
+
+Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet `master` branch.
+
+Do you need to migrate? There is [an automated tool](/docs/topics/migration-from-PHPExcel.md) for that.
+
+## License
+
+PhpSpreadsheet is licensed under [MIT](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/LICENSE).
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/migrate-from-phpexcel b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/migrate-from-phpexcel
deleted file mode 100644
index 51c60d495..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/migrate-from-phpexcel
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env php
-<?php
-use PhpOffice\PhpSpreadsheet\Helper\Migrator;
-
-require_once __DIR__ . '/../src/Bootstrap.php';
-
-$migrator = new Migrator();
-$migrator->migrate();
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/pre-commit b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/pre-commit
deleted file mode 100644
index 8d93f8abb..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/bin/pre-commit
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-pass=true
-
-files=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.(php|phtml)$')
-if [ "$files" != "" ]; then
-
-    # Run php syntax check before commit
-    while read -r file; do
-        php -l "$file"
-        if [ $? -ne 0 ]; then
-            pass=false
-        fi
-    done <<< "$files"
-
-    # Run php-cs-fixer validation before commit
-    echo "$files" | xargs ./vendor/bin/php-cs-fixer fix --diff --config .php_cs.dist
-    if [ $? -ne 0 ]; then
-        pass=false
-    fi
-
-    # Automatically add files that may have been fixed by php-cs-fixer
-    echo "$files" | xargs git add
-fi
-
-if $pass; then
-    exit 0
-else
-    echo ""
-    echo "PRE-COMMIT HOOK FAILED:"
-    echo "Code style validation failed. Please fix errors and try committing again."
-    exit 1
-fi
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/composer.json b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/composer.json
new file mode 100644
index 000000000..aabddd351
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/composer.json
@@ -0,0 +1,117 @@
+{
+    "name": "phpoffice/phpspreadsheet",
+    "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+    "keywords": [
+        "PHP",
+        "OpenXML",
+        "Excel",
+        "xlsx",
+        "xls",
+        "ods",
+        "gnumeric",
+        "spreadsheet"
+    ],
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
+    "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Maarten Balliauw",
+            "homepage": "https://blog.maartenballiauw.be"
+        },
+        {
+            "name": "Mark Baker",
+            "homepage": "https://markbakeruk.net"
+        },
+        {
+            "name": "Franck Lefevre",
+            "homepage": "https://rootslabs.net"
+        },
+        {
+            "name": "Erik Tilt"
+        },
+        {
+            "name": "Adrien Crivelli"
+        }
+    ],
+    "scripts": {
+        "check": [
+            "phpcs src/ tests/ --report=checkstyle",
+            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.4- -n",
+            "php-cs-fixer fix --ansi --dry-run --diff",
+            "phpunit --color=always",
+            "phpstan analyse --ansi --memory-limit=2048M"
+        ],
+        "style": [
+            "phpcs src/ tests/ --report=checkstyle",
+            "php-cs-fixer fix --ansi --dry-run --diff"
+        ],
+        "fix": [
+            "phpcbf 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.4- -n"
+        ]
+    },
+    "require": {
+        "php": "^7.4 || ^8.0",
+        "ext-ctype": "*",
+        "ext-dom": "*",
+        "ext-fileinfo": "*",
+        "ext-gd": "*",
+        "ext-iconv": "*",
+        "ext-libxml": "*",
+        "ext-mbstring": "*",
+        "ext-simplexml": "*",
+        "ext-xml": "*",
+        "ext-xmlreader": "*",
+        "ext-xmlwriter": "*",
+        "ext-zip": "*",
+        "ext-zlib": "*",
+        "ezyang/htmlpurifier": "^4.15",
+        "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 || ^2.0 || ^3.0"
+    },
+    "require-dev": {
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+        "dompdf/dompdf": "^1.0 || ^2.0",
+        "friendsofphp/php-cs-fixer": "^3.2",
+        "mitoteam/jpgraph": "^10.3",
+        "mpdf/mpdf": "^8.1.1",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^8.5 || ^9.0",
+        "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",
+        "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": {
+            "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests",
+            "PhpOffice\\PhpSpreadsheetInfra\\": "infra"
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
new file mode 100644
index 000000000..e107b2667
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
@@ -0,0 +1,351 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|numeric\\-string, 2\\: '\\+', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|numeric\\-string, 2\\: ',', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|numeric\\-string, 2\\: '\\-', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\: ''\\|numeric\\-string, 2\\: '\\-', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|numeric\\-string, 2\\: ',', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|numeric\\-string, 2\\: '\\-', 3\\?\\: ''\\|numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Offset 8 on array\\{string, string, string, string, string, string, non\\-empty\\-string, numeric\\-string\\} in isset\\(\\) does not exist\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between mixed and null will always evaluate to false\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Calculation.php
+
+		-
+			message: "#^Binary operation \"%%\" between int\\|string and 100 results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
+
+		-
+			message: "#^Binary operation \"%%\" between int\\|string and 4 results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
+
+		-
+			message: "#^Binary operation \"%%\" between int\\|string and 400 results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
+
+		-
+			message: "#^Binary operation \"%%\" between string and 24 results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
+
+		-
+			message: "#^Binary operation \"\\-\" between 1 and array\\|float\\|string results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Engineering/Erf.php
+
+		-
+			message: "#^Cannot call method getTokenSubType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
+			count: 4
+			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: "#^Cannot call method setTokenSubType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
+			count: 5
+			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: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken and null will always evaluate to false\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-falsy\\-string, 2\\?\\: string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Functions.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-falsy\\-string, 2\\?\\: string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Functions.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Information/Value.php
+
+		-
+			message: "#^Offset 6 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Information/Value.php
+
+		-
+			message: "#^Offset 7 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Information/Value.php
+
+		-
+			message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
+
+		-
+			message: "#^Offset 6 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
+
+		-
+			message: "#^Offset 7 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string, 4\\?\\: string, 5\\?\\: string, 6\\?\\: non\\-empty\\-string, 7\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
+
+		-
+			message: "#^Binary operation \"/\" between float\\|int and float\\|string results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
+
+		-
+			message: "#^Binary operation \"\\-\" between 1 and array\\|float\\|string results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
+
+		-
+			message: "#^Binary operation \"\\-\" between 1 and array\\|float\\|string results in an error\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
+
+		-
+			message: "#^Offset 'col' does not exist on array\\{0\\?\\: string, col\\?\\: non\\-empty\\-string, 1\\?\\: non\\-empty\\-string, row\\?\\: non\\-empty\\-string, 2\\?\\: non\\-empty\\-string\\}\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Cell/AddressHelper.php
+
+		-
+			message: "#^Offset 'row' does not exist on array\\{0\\?\\: string, col\\?\\: non\\-empty\\-string, 1\\?\\: non\\-empty\\-string, row\\?\\: non\\-empty\\-string, 2\\?\\: non\\-empty\\-string\\}\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Cell/AddressHelper.php
+
+		-
+			message: "#^Parameter \\#1 \\$num of function dechex expects int, string given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Helper/Html.php
+
+		-
+			message: "#^Offset 'size' does not exist on array\\{0\\?\\: string, size\\?\\: non\\-empty\\-string, 1\\?\\: non\\-empty\\-string, unit\\?\\: non\\-falsy\\-string, 2\\?\\: non\\-falsy\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Helper/Size.php
+
+		-
+			message: "#^Parameter \\#2 \\$length of function fgetcsv expects int\\<0, max\\>\\|null, int\\|null given\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Reader/Csv.php
+
+		-
+			message: "#^Parameter \\#1 \\$namespace of method DOMDocument\\:\\:getElementsByTagNameNS\\(\\) expects string, string\\|null given\\.$#"
+			count: 3
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#1 \\$namespace of method DOMElement\\:\\:getElementsByTagNameNS\\(\\) expects string, string\\|null given\\.$#"
+			count: 7
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#2 \\$tableNs of class PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\AutoFilter constructor expects string, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#2 \\$tableNs of class PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\DefinedNames constructor expects string, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#2 \\$tableNs of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:processMergedCells\\(\\) expects string, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#3 \\$configNs of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForActiveSheet\\(\\) expects string, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Parameter \\#3 \\$configNs of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForSelectedCells\\(\\) expects string, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$officeNs \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$stylesFo \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$stylesNs \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$tableNs \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+
+		-
+			message: "#^Parameter \\#1 \\$column of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:getColumnDimension\\(\\) expects string, \\(float\\|int\\) given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Slk.php
+
+		-
+			message: "#^Offset 4 does not exist on array\\{0\\: string, 1\\: non\\-empty\\-string, 2\\: numeric\\-string, 3\\: string, 4\\?\\: string, 5\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Xlsx.php
+
+		-
+			message: "#^Offset 5 does not exist on array\\{0\\: string, 1\\: non\\-empty\\-string, 2\\: numeric\\-string, 3\\: string, 4\\?\\: string, 5\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Reader/Xlsx.php
+
+		-
+			message: "#^Variable \\$column in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/ReferenceHelper.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-falsy\\-string, 2\\?\\: non\\-empty\\-string\\|numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-falsy\\-string, 2\\?\\: non\\-empty\\-string\\|numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
+
+		-
+			message: "#^Variable \\$language on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
+
+		-
+			message: "#^Offset 'mime' on array\\{0\\: int\\<0, max\\>, 1\\: int\\<0, max\\>, 2\\: int, 3\\: string, mime\\: string, channels\\?\\: int, bits\\?\\: int\\} on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
+
+		-
+			message: "#^Variable \\$rgb in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function fopen expects string, resource\\|string given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/BaseWriter.php
+
+		-
+			message: "#^Parameter \\#1 \\$url of function parse_url expects string, resource\\|string given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/BaseWriter.php
+
+		-
+			message: "#^Offset 'mime' does not exist on array\\{\\}\\|array\\{0\\: int\\<0, max\\>, 1\\: int\\<0, max\\>, 2\\: int, 3\\: string, mime\\: string, channels\\?\\: int, bits\\?\\: int\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Html.php
+
+		-
+			message: "#^Offset 0 does not exist on array\\{\\}\\|array\\{0\\: int\\<0, max\\>, 1\\: int\\<0, max\\>, 2\\: int, 3\\: string, mime\\: string, channels\\?\\: int, bits\\?\\: int\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Html.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{\\}\\|array\\{0\\: int\\<0, max\\>, 1\\: int\\<0, max\\>, 2\\: int, 3\\: string, mime\\: string, channels\\?\\: int, bits\\?\\: int\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Html.php
+
+		-
+			message: "#^Variable \\$column in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Ods/Formula.php
+
+		-
+			message: "#^Variable \\$column in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
+
+		-
+			message: "#^Offset 2 on array\\{0\\: int\\<0, max\\>, 1\\: int\\<0, max\\>, 2\\: int, 3\\: string, mime\\: string, channels\\?\\: int, bits\\?\\: int\\} on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'\\$', 2\\?\\: non\\-falsy\\-string, 3\\?\\: ''\\|'\\$', 4\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
+
+		-
+			message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'\\$', 2\\?\\: numeric\\-string, 3\\?\\: ''\\|'\\$', 4\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
+
+		-
+			message: "#^Offset 4 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'\\$', 2\\?\\: non\\-falsy\\-string, 3\\?\\: ''\\|'\\$', 4\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
+
+		-
+			message: "#^Offset 4 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'\\$', 2\\?\\: numeric\\-string, 3\\?\\: ''\\|'\\$', 4\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
+
+		-
+			message: "#^Parameter \\#2 \\$length of function fread expects int\\<1, max\\>, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+
+		-
+			message: "#^Comparison operation \"\\>\\=\" between int\\<5, 7\\> and 3 is always true\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
+
+		-
+			message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: numeric\\-string\\}\\.$#"
+			count: 1
+			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-conditional.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-conditional.php
new file mode 100644
index 000000000..9b1150b34
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan-conditional.php
@@ -0,0 +1,86 @@
+<?php
+
+$config = [];
+
+if (PHP_VERSION_ID < 80000) {
+    // GdImage not available before PHP8
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Method .* has invalid return type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Shared/Drawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Property .* has unknown class GdImage as its type\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Method .* has invalid return type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Parameter .* of method .* has invalid type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Class GdImage not found\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~^Parameter .* of method .* has invalid type GdImage\.$~',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xls/Worksheet.php',
+        'count' => 1,
+    ];
+    // GdImage with Phpstan 1.9.2
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '~Class GdImage not found.*$~',
+        'path' => __DIR__ . '/tests/PhpSpreadsheetTests/Worksheet/MemoryDrawingTest.php',
+        'count' => 3,
+    ];
+    // Erroneous analysis by Phpstan before PHP8 - 3rd parameter is nullable
+    // Fixed for Php7 with Phpstan 1.9.
+    //$config['parameters']['ignoreErrors'][] = [
+    //    'message' => '#^Parameter \\#3 \\$namespace of method XMLWriter\\:\\:startElementNs\\(\\) expects string, null given\\.$#',
+    //    'path' => __DIR__ . '/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php',
+    //    'count' => 8,
+    //];
+    // Erroneous analysis by Phpstan before PHP8 - mb_strlen does not return false
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:countCharacters\\(\\) should return int but returns int(<0, max>)?\\|false\\.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Shared/StringHelper.php',
+        'count' => 1,
+    ];
+    // New with Phpstan 1.9.2 for Php7 only
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array<int, mixed>\\|false given.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#1 \\$input of function array_chunk expects array, array<int, float\\|int>\\|false given.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#2 \\$array of function array_map expects array, array<int, float|int>\\|false given.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/MathTrig/Random.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array<int, mixed>\\|false given.$#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/TextData/Text.php',
+        'count' => 1,
+    ];
+} else {
+    // Flagged in Php8+ - unsure how to correct code
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Binary operation "/" between float and array[|]float[|]int[|]string results in an error.#',
+        'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php',
+        'count' => 1,
+    ];
+}
+
+return $config;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
new file mode 100644
index 000000000..f49ab2eb6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
@@ -0,0 +1,27 @@
+includes:
+    - phpstan-baseline.neon
+    - phpstan-conditional.php
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+
+parameters:
+    level: 8
+    paths:
+        - src/
+        - tests/
+    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
+    ignoreErrors:
+        - identifier: missingType.iterableValue
+        - '~^Parameter \#1 \$im(age)? of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy|imagepng) expects (GdImage|resource), GdImage\|resource given\.$~'
+        - '~^Parameter \#2 \$src_im(age)? of function imagecopy expects (GdImage|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 type specified\.$~'
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpunit10.xml.dist b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpunit10.xml.dist
new file mode 100644
index 000000000..207d8ec97
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/phpunit10.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/10.1/phpunit.xsd" bootstrap="./tests/bootstrap.php" backupGlobals="true" colors="true" cacheResultFile="/tmp/.phpspreadsheet.phpunit.result.cache">
+  <coverage/>
+  <php>
+    <ini name="memory_limit" value="2048M"/>
+  </php>
+  <testsuite name="PhpSpreadsheet Unit Test Suite">
+    <directory>./tests/PhpSpreadsheetTests</directory>
+  </testsuite>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/Bootstrap.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/Bootstrap.php
deleted file mode 100644
index f15de26a6..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/Bootstrap.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Bootstrap for PhpSpreadsheet classes.
- */
-
-// This sucks, but we have to try to find the composer autoloader
-
-$paths = [
-    __DIR__ . '/../vendor/autoload.php', // In case PhpSpreadsheet is cloned directly
-    __DIR__ . '/../../../autoload.php', // In case PhpSpreadsheet is a composer dependency.
-];
-
-foreach ($paths as $path) {
-    if (file_exists($path)) {
-        require_once $path;
-
-        return;
-    }
-}
-
-throw new \Exception('Composer autoloader could not be found. Install dependencies with `composer install` and try again.');
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
new file mode 100644
index 000000000..1e3f6971d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentHelper;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentProcessor;
+
+trait ArrayEnabled
+{
+    /**
+     * @var ArrayArgumentHelper
+     */
+    private static $arrayArgumentHelper;
+
+    /**
+     * @param array|false $arguments Can be changed to array for Php8.1+
+     */
+    private static function initialiseHelper($arguments): void
+    {
+        if (self::$arrayArgumentHelper === null) {
+            self::$arrayArgumentHelper = new ArrayArgumentHelper();
+        }
+        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().
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArguments(callable $method, ...$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.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsSubset(callable $method, int $limit, ...$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);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function testFalse($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.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsSubsetFrom(callable $method, int $start, ...$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.
+     *
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsIgnore(callable $method, int $ignore, ...$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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
new file mode 100644
index 000000000..5d4f261fc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
@@ -0,0 +1,181 @@
+<?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($str1, $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($str1, $str2): int
+    {
+        return strcmp($str1 ?? '', $str2 ?? '');
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    public static function compare($operand1, $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);
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function evaluateComparison($operand1, $operand2, string $operator, bool $useLowercaseFirstComparison): bool
+    {
+        switch ($operator) {
+            //    Equality
+            case '=':
+                return self::equal($operand1, $operand2);
+            //    Greater than
+            case '>':
+                return self::greaterThan($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Less than
+            case '<':
+                return self::lessThan($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Greater than or equal
+            case '>=':
+                return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Less than or equal
+            case '<=':
+                return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison);
+            //    Inequality
+            case '<>':
+                return self::notEqual($operand1, $operand2);
+            default:
+                throw new Exception('Unsupported binary comparison operator');
+        }
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function equal($operand1, $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;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function greaterThanOrEqual($operand1, $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;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function lessThanOrEqual($operand1, $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;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function greaterThan($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function lessThan($operand1, $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    /**
+     * @param mixed $operand1
+     * @param mixed $operand2
+     */
+    private static function notEqual($operand1, $operand2): bool
+    {
+        return self::equal($operand1, $operand2) !== true;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
index 4ebce2ae1..5061233c7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2,15 +2,24 @@
 
 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\Token\Stack;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+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
 {
@@ -23,11 +32,21 @@ 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\.)?([A-Z][A-Z0-9\.]*)[\s]*\(';
+    const CALCULATION_REGEXP_FUNCTION = '@?(?:_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.])';
-    //    Named Range of cells
-    const CALCULATION_REGEXP_NAMEDRANGE = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)';
+    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
+    //    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})):(?![.*])';
+    //    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}\.]*)';
+    // 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_\/]*[!\?]?';
 
@@ -36,19 +55,26 @@ 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_MATRIX_BRACE = '{';
+    const FORMULA_CLOSE_MATRIX_BRACE = '}';
+    const FORMULA_STRING_QUOTE = '"';
+
+    /** @var string */
     private static $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
 
     /**
      * Instance of this class.
      *
-     * @var Calculation
+     * @var ?Calculation
      */
     private static $instance;
 
     /**
      * Instance of the spreadsheet this Calculation Engine is using.
      *
-     * @var Spreadsheet
+     * @var ?Spreadsheet
      */
     private $spreadsheet;
 
@@ -67,37 +93,35 @@ class Calculation
     private $calculationCacheEnabled = true;
 
     /**
-     * Used to generate unique store keys.
-     *
-     * @var int
+     * @var BranchPruner
      */
-    private $branchStoreKeyCounter = 0;
+    private $branchPruner;
 
+    /**
+     * @var bool
+     */
     private $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,
     ];
 
     /**
@@ -112,17 +136,29 @@ class Calculation
      *        If true, then a user error will be triggered
      *        If false, then an exception will be thrown.
      *
-     * @var bool
+     * @var ?bool
+     *
+     * @deprecated 1.25.2 use setSuppressFormulaErrors() instead
      */
-    public $suppressFormulaErrors = false;
+    public $suppressFormulaErrors;
+
+    /** @var bool */
+    private $suppressFormulaErrorsNew = false;
 
     /**
      * Error message for any error that was raised/thrown by the calculation engine.
      *
-     * @var string
+     * @var null|string
      */
     public $formulaError;
 
+    /**
+     * Reference Helper.
+     *
+     * @var ReferenceHelper
+     */
+    private static $referenceHelper;
+
     /**
      * An array of the nested cell references accessed by the calculation engine, used for the debug log.
      *
@@ -130,6 +166,7 @@ class Calculation
      */
     private $cyclicReferenceStack;
 
+    /** @var array */
     private $cellStack = [];
 
     /**
@@ -141,6 +178,7 @@ class Calculation
      */
     private $cyclicFormulaCounter = 1;
 
+    /** @var string */
     private $cyclicFormulaCell = '';
 
     /**
@@ -150,13 +188,6 @@ class Calculation
      */
     public $cyclicFormulaCount = 1;
 
-    /**
-     * Epsilon Precision used for comparisons in calculations.
-     *
-     * @var float
-     */
-    private $delta = 0.1e-12;
-
     /**
      * The current locale setting.
      *
@@ -181,24 +212,30 @@ class Calculation
      */
     private static $localeArgumentSeparator = ',';
 
+    /** @var array */
     private static $localeFunctions = [];
 
     /**
      * Locale-specific translations for Excel constants (True, False and Null).
      *
-     * @var string[]
+     * @var array<string, string>
      */
-    public static $localeBoolean = [
+    private static $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 string[]
+     * @var array<string, mixed>
      */
     private static $excelConstants = [
         'TRUE' => true,
@@ -206,66 +243,93 @@ class Calculation
         'NULL' => null,
     ];
 
-    // PhpSpreadsheet functions
+    public static function keyInExcelConstants(string $key): bool
+    {
+        return array_key_exists($key, self::$excelConstants);
+    }
+
+    /** @return mixed */
+    public static function getExcelConstants(string $key)
+    {
+        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.
+     *
+     *@var array
+     */
     private static $phpSpreadsheetFunctions = [
         'ABS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'abs',
+            'functionCall' => [MathTrig\Absolute::class, 'evaluate'],
             'argumentCount' => '1',
         ],
         'ACCRINT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'ACCRINT'],
-            'argumentCount' => '4-7',
+            'functionCall' => [Financial\Securities\AccruedInterest::class, 'periodic'],
+            'argumentCount' => '4-8',
         ],
         'ACCRINTM' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'ACCRINTM'],
+            'functionCall' => [Financial\Securities\AccruedInterest::class, 'atMaturity'],
             'argumentCount' => '3-5',
         ],
         'ACOS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'acos',
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'acos'],
             'argumentCount' => '1',
         ],
         'ACOSH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'acosh',
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'acosh'],
             'argumentCount' => '1',
         ],
         'ACOT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ACOT'],
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'acot'],
             'argumentCount' => '1',
         ],
         'ACOTH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ACOTH'],
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'acoth'],
             'argumentCount' => '1',
         ],
         'ADDRESS' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'cellAddress'],
+            'functionCall' => [LookupRef\Address::class, 'cell'],
             'argumentCount' => '2-5',
         ],
+        'AGGREGATE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3+',
+        ],
         'AMORDEGRC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'AMORDEGRC'],
+            'functionCall' => [Financial\Amortization::class, 'AMORDEGRC'],
             'argumentCount' => '6,7',
         ],
         'AMORLINC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'AMORLINC'],
+            'functionCall' => [Financial\Amortization::class, 'AMORLINC'],
             'argumentCount' => '6,7',
         ],
+        'ANCHORARRAY' => [
+            'category' => Category::CATEGORY_UNCATEGORISED,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'AND' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'logicalAnd'],
+            'functionCall' => [Logical\Operations::class, 'logicalAnd'],
             'argumentCount' => '1+',
         ],
         'ARABIC' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ARABIC'],
+            'functionCall' => [MathTrig\Arabic::class, 'evaluate'],
             'argumentCount' => '1',
         ],
         'AREAS' => [
@@ -273,6 +337,11 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '1',
         ],
+        'ARRAYTOTEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'fromArray'],
+            'argumentCount' => '1,2',
+        ],
         'ASC' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [Functions::class, 'DUMMY'],
@@ -280,52 +349,52 @@ class Calculation
         ],
         'ASIN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'asin',
+            'functionCall' => [MathTrig\Trig\Sine::class, 'asin'],
             'argumentCount' => '1',
         ],
         'ASINH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'asinh',
+            'functionCall' => [MathTrig\Trig\Sine::class, 'asinh'],
             'argumentCount' => '1',
         ],
         'ATAN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'atan',
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atan'],
             'argumentCount' => '1',
         ],
         'ATAN2' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ATAN2'],
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atan2'],
             'argumentCount' => '2',
         ],
         'ATANH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'atanh',
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atanh'],
             'argumentCount' => '1',
         ],
         'AVEDEV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'AVEDEV'],
+            'functionCall' => [Statistical\Averages::class, 'averageDeviations'],
             'argumentCount' => '1+',
         ],
         'AVERAGE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'AVERAGE'],
+            'functionCall' => [Statistical\Averages::class, 'average'],
             'argumentCount' => '1+',
         ],
         'AVERAGEA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'AVERAGEA'],
+            'functionCall' => [Statistical\Averages::class, 'averageA'],
             'argumentCount' => '1+',
         ],
         'AVERAGEIF' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'AVERAGEIF'],
+            'functionCall' => [Statistical\Conditional::class, 'AVERAGEIF'],
             'argumentCount' => '2,3',
         ],
         'AVERAGEIFS' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical\Conditional::class, 'AVERAGEIFS'],
             'argumentCount' => '3+',
         ],
         'BAHTTEXT' => [
@@ -335,88 +404,133 @@ class Calculation
         ],
         'BASE' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'BASE'],
+            'functionCall' => [MathTrig\Base::class, 'evaluate'],
             'argumentCount' => '2,3',
         ],
         'BESSELI' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BESSELI'],
+            'functionCall' => [Engineering\BesselI::class, 'BESSELI'],
             'argumentCount' => '2',
         ],
         'BESSELJ' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BESSELJ'],
+            'functionCall' => [Engineering\BesselJ::class, 'BESSELJ'],
             'argumentCount' => '2',
         ],
         'BESSELK' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BESSELK'],
+            'functionCall' => [Engineering\BesselK::class, 'BESSELK'],
             'argumentCount' => '2',
         ],
         'BESSELY' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BESSELY'],
+            'functionCall' => [Engineering\BesselY::class, 'BESSELY'],
             'argumentCount' => '2',
         ],
         'BETADIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'BETADIST'],
+            'functionCall' => [Statistical\Distributions\Beta::class, 'distribution'],
             'argumentCount' => '3-5',
         ],
+        'BETA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4-6',
+        ],
         'BETAINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'BETAINV'],
+            'functionCall' => [Statistical\Distributions\Beta::class, 'inverse'],
+            'argumentCount' => '3-5',
+        ],
+        'BETA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Beta::class, 'inverse'],
             'argumentCount' => '3-5',
         ],
         'BIN2DEC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BINTODEC'],
+            'functionCall' => [Engineering\ConvertBinary::class, 'toDecimal'],
             'argumentCount' => '1',
         ],
         'BIN2HEX' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BINTOHEX'],
+            'functionCall' => [Engineering\ConvertBinary::class, 'toHex'],
             'argumentCount' => '1,2',
         ],
         'BIN2OCT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BINTOOCT'],
+            'functionCall' => [Engineering\ConvertBinary::class, 'toOctal'],
             'argumentCount' => '1,2',
         ],
         'BINOMDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'BINOMDIST'],
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'distribution'],
             'argumentCount' => '4',
         ],
+        'BINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'BINOM.DIST.RANGE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'range'],
+            'argumentCount' => '3,4',
+        ],
+        'BINOM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
         'BITAND' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BITAND'],
+            'functionCall' => [Engineering\BitWise::class, 'BITAND'],
             'argumentCount' => '2',
         ],
         'BITOR' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BITOR'],
+            'functionCall' => [Engineering\BitWise::class, 'BITOR'],
             'argumentCount' => '2',
         ],
         'BITXOR' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BITOR'],
+            'functionCall' => [Engineering\BitWise::class, 'BITXOR'],
             'argumentCount' => '2',
         ],
         'BITLSHIFT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BITLSHIFT'],
+            'functionCall' => [Engineering\BitWise::class, 'BITLSHIFT'],
             'argumentCount' => '2',
         ],
         'BITRSHIFT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'BITRSHIFT'],
+            '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::class, 'CEILING'],
-            'argumentCount' => '2',
+            'functionCall' => [MathTrig\Ceiling::class, 'ceiling'],
+            'argumentCount' => '1-2', // 2 for Excel, 1-2 for Ods/Gnumeric
+        ],
+        'CEILING.MATH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Ceiling::class, 'math'],
+            'argumentCount' => '1-3',
+        ],
+        'CEILING.PRECISE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Ceiling::class, 'precise'],
+            'argumentCount' => '1,2',
         ],
         'CELL' => [
             'category' => Category::CATEGORY_INFORMATION,
@@ -425,178 +539,239 @@ class Calculation
         ],
         'CHAR' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'CHARACTER'],
+            'functionCall' => [TextData\CharacterConvert::class, 'character'],
             'argumentCount' => '1',
         ],
         'CHIDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CHIDIST'],
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionLeftTail'],
+            'argumentCount' => '3',
+        ],
+        'CHISQ.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionRightTail'],
             'argumentCount' => '2',
         ],
         'CHIINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CHIINV'],
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseLeftTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseRightTail'],
             'argumentCount' => '2',
         ],
         'CHITEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'test'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'test'],
             'argumentCount' => '2',
         ],
         'CHOOSE' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'CHOOSE'],
+            '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::class, 'TRIMNONPRINTABLE'],
+            'functionCall' => [TextData\Trim::class, 'nonPrintable'],
             'argumentCount' => '1',
         ],
         'CODE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'ASCIICODE'],
+            'functionCall' => [TextData\CharacterConvert::class, 'code'],
             'argumentCount' => '1',
         ],
         'COLUMN' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'COLUMN'],
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'COLUMN'],
             'argumentCount' => '-1',
+            'passCellReference' => true,
             'passByReference' => [true],
         ],
         'COLUMNS' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'COLUMNS'],
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'COLUMNS'],
             'argumentCount' => '1',
         ],
         'COMBIN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'COMBIN'],
+            'functionCall' => [MathTrig\Combinations::class, 'withoutRepetition'],
+            'argumentCount' => '2',
+        ],
+        'COMBINA' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Combinations::class, 'withRepetition'],
             'argumentCount' => '2',
         ],
         'COMPLEX' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'COMPLEX'],
+            'functionCall' => [Engineering\Complex::class, 'COMPLEX'],
             'argumentCount' => '2,3',
         ],
         'CONCAT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'CONCATENATE'],
+            'functionCall' => [TextData\Concatenate::class, 'CONCATENATE'],
             'argumentCount' => '1+',
         ],
         'CONCATENATE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'CONCATENATE'],
+            'functionCall' => [TextData\Concatenate::class, 'CONCATENATE'],
             'argumentCount' => '1+',
         ],
         'CONFIDENCE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CONFIDENCE'],
+            'functionCall' => [Statistical\Confidence::class, 'CONFIDENCE'],
+            'argumentCount' => '3',
+        ],
+        'CONFIDENCE.NORM' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Confidence::class, 'CONFIDENCE'],
+            'argumentCount' => '3',
+        ],
+        'CONFIDENCE.T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '3',
         ],
         'CONVERT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'CONVERTUOM'],
+            'functionCall' => [Engineering\ConvertUOM::class, 'CONVERT'],
             'argumentCount' => '3',
         ],
         'CORREL' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CORREL'],
+            'functionCall' => [Statistical\Trends::class, 'CORREL'],
             'argumentCount' => '2',
         ],
         'COS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'cos',
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'cos'],
             'argumentCount' => '1',
         ],
         'COSH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'cosh',
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'cosh'],
             'argumentCount' => '1',
         ],
         'COT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'COT'],
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'cot'],
             'argumentCount' => '1',
         ],
         'COTH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'COTH'],
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'coth'],
             'argumentCount' => '1',
         ],
         'COUNT' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COUNT'],
+            'functionCall' => [Statistical\Counts::class, 'COUNT'],
             'argumentCount' => '1+',
         ],
         'COUNTA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COUNTA'],
+            'functionCall' => [Statistical\Counts::class, 'COUNTA'],
             'argumentCount' => '1+',
         ],
         'COUNTBLANK' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COUNTBLANK'],
+            'functionCall' => [Statistical\Counts::class, 'COUNTBLANK'],
             'argumentCount' => '1',
         ],
         'COUNTIF' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COUNTIF'],
+            'functionCall' => [Statistical\Conditional::class, 'COUNTIF'],
             'argumentCount' => '2',
         ],
         'COUNTIFS' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COUNTIFS'],
+            'functionCall' => [Statistical\Conditional::class, 'COUNTIFS'],
             'argumentCount' => '2+',
         ],
         'COUPDAYBS' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPDAYBS'],
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYBS'],
             'argumentCount' => '3,4',
         ],
         'COUPDAYS' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPDAYS'],
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYS'],
             'argumentCount' => '3,4',
         ],
         'COUPDAYSNC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPDAYSNC'],
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYSNC'],
             'argumentCount' => '3,4',
         ],
         'COUPNCD' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPNCD'],
+            'functionCall' => [Financial\Coupons::class, 'COUPNCD'],
             'argumentCount' => '3,4',
         ],
         'COUPNUM' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPNUM'],
+            'functionCall' => [Financial\Coupons::class, 'COUPNUM'],
             'argumentCount' => '3,4',
         ],
         'COUPPCD' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'COUPPCD'],
+            'functionCall' => [Financial\Coupons::class, 'COUPPCD'],
             'argumentCount' => '3,4',
         ],
         'COVAR' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'COVAR'],
+            'functionCall' => [Statistical\Trends::class, 'COVAR'],
+            'argumentCount' => '2',
+        ],
+        'COVARIANCE.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'COVAR'],
+            'argumentCount' => '2',
+        ],
+        'COVARIANCE.S' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2',
         ],
         'CRITBINOM' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CRITBINOM'],
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'inverse'],
             'argumentCount' => '3',
         ],
         'CSC' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'CSC'],
+            'functionCall' => [MathTrig\Trig\Cosecant::class, 'csc'],
             'argumentCount' => '1',
         ],
         'CSCH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'CSCH'],
+            'functionCall' => [MathTrig\Trig\Cosecant::class, 'csch'],
             'argumentCount' => '1',
         ],
         'CUBEKPIMEMBER' => [
@@ -636,152 +811,172 @@ class Calculation
         ],
         'CUMIPMT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'CUMIPMT'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Cumulative::class, 'interest'],
             'argumentCount' => '6',
         ],
         'CUMPRINC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'CUMPRINC'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Cumulative::class, 'principal'],
             'argumentCount' => '6',
         ],
         'DATE' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DATE'],
+            'functionCall' => [DateTimeExcel\Date::class, 'fromYMD'],
             'argumentCount' => '3',
         ],
         'DATEDIF' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DATEDIF'],
+            'functionCall' => [DateTimeExcel\Difference::class, 'interval'],
             'argumentCount' => '2,3',
         ],
+        'DATESTRING' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
         'DATEVALUE' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DATEVALUE'],
+            'functionCall' => [DateTimeExcel\DateValue::class, 'fromString'],
             'argumentCount' => '1',
         ],
         'DAVERAGE' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DAVERAGE'],
+            'functionCall' => [Database\DAverage::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DAYOFMONTH'],
+            'functionCall' => [DateTimeExcel\DateParts::class, 'day'],
             'argumentCount' => '1',
         ],
         'DAYS' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DAYS'],
+            'functionCall' => [DateTimeExcel\Days::class, 'between'],
             'argumentCount' => '2',
         ],
         'DAYS360' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DAYS360'],
+            'functionCall' => [DateTimeExcel\Days360::class, 'between'],
             'argumentCount' => '2,3',
         ],
         'DB' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'DB'],
+            'functionCall' => [Financial\Depreciation::class, 'DB'],
             'argumentCount' => '4,5',
         ],
+        'DBCS' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'DCOUNT' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DCOUNT'],
+            'functionCall' => [Database\DCount::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DCOUNTA' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DCOUNTA'],
+            'functionCall' => [Database\DCountA::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DDB' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'DDB'],
+            'functionCall' => [Financial\Depreciation::class, 'DDB'],
             'argumentCount' => '4,5',
         ],
         'DEC2BIN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'DECTOBIN'],
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toBinary'],
             'argumentCount' => '1,2',
         ],
         'DEC2HEX' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'DECTOHEX'],
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toHex'],
             'argumentCount' => '1,2',
         ],
         'DEC2OCT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'DECTOOCT'],
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toOctal'],
             'argumentCount' => '1,2',
         ],
+        'DECIMAL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'DEGREES' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'rad2deg',
+            'functionCall' => [MathTrig\Angle::class, 'toDegrees'],
             'argumentCount' => '1',
         ],
         'DELTA' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'DELTA'],
+            'functionCall' => [Engineering\Compare::class, 'DELTA'],
             'argumentCount' => '1,2',
         ],
         'DEVSQ' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'DEVSQ'],
+            'functionCall' => [Statistical\Deviations::class, 'sumSquares'],
             'argumentCount' => '1+',
         ],
         'DGET' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DGET'],
+            'functionCall' => [Database\DGet::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DISC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'DISC'],
+            'functionCall' => [Financial\Securities\Rates::class, 'discount'],
             'argumentCount' => '4,5',
         ],
         'DMAX' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DMAX'],
+            'functionCall' => [Database\DMax::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DMIN' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DMIN'],
+            'functionCall' => [Database\DMin::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DOLLAR' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'DOLLAR'],
+            'functionCall' => [TextData\Format::class, 'DOLLAR'],
             'argumentCount' => '1,2',
         ],
         'DOLLARDE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'DOLLARDE'],
+            'functionCall' => [Financial\Dollar::class, 'decimal'],
             'argumentCount' => '2',
         ],
         'DOLLARFR' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'DOLLARFR'],
+            'functionCall' => [Financial\Dollar::class, 'fractional'],
             'argumentCount' => '2',
         ],
         'DPRODUCT' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DPRODUCT'],
+            '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::class, 'DSTDEV'],
+            'functionCall' => [Database\DStDev::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DSTDEVP' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DSTDEVP'],
+            'functionCall' => [Database\DStDevP::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DSUM' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DSUM'],
+            'functionCall' => [Database\DSum::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DURATION' => [
@@ -791,87 +986,107 @@ class Calculation
         ],
         'DVAR' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DVAR'],
+            'functionCall' => [Database\DVar::class, 'evaluate'],
             'argumentCount' => '3',
         ],
         'DVARP' => [
             'category' => Category::CATEGORY_DATABASE,
-            'functionCall' => [Database::class, 'DVARP'],
+            'functionCall' => [Database\DVarP::class, 'evaluate'],
             'argumentCount' => '3',
         ],
+        'ECMA.CEILING' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
         'EDATE' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'EDATE'],
+            'functionCall' => [DateTimeExcel\Month::class, 'adjust'],
             'argumentCount' => '2',
         ],
         'EFFECT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'EFFECT'],
+            'functionCall' => [Financial\InterestRate::class, 'effective'],
             'argumentCount' => '2',
         ],
+        'ENCODEURL' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Web\Service::class, 'urlEncode'],
+            'argumentCount' => '1',
+        ],
         'EOMONTH' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'EOMONTH'],
+            'functionCall' => [DateTimeExcel\Month::class, 'lastDay'],
             'argumentCount' => '2',
         ],
         'ERF' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'ERF'],
+            'functionCall' => [Engineering\Erf::class, 'ERF'],
             'argumentCount' => '1,2',
         ],
         'ERF.PRECISE' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'ERFPRECISE'],
+            'functionCall' => [Engineering\Erf::class, 'ERFPRECISE'],
             'argumentCount' => '1',
         ],
         'ERFC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'ERFC'],
+            'functionCall' => [Engineering\ErfC::class, 'ERFC'],
             'argumentCount' => '1',
         ],
         'ERFC.PRECISE' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'ERFC'],
+            'functionCall' => [Engineering\ErfC::class, 'ERFC'],
             'argumentCount' => '1',
         ],
         'ERROR.TYPE' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'errorType'],
+            'functionCall' => [Information\ExcelError::class, 'type'],
             'argumentCount' => '1',
         ],
         'EVEN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'EVEN'],
+            'functionCall' => [MathTrig\Round::class, 'even'],
             'argumentCount' => '1',
         ],
         'EXACT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'EXACT'],
+            'functionCall' => [TextData\Text::class, 'exact'],
             'argumentCount' => '2',
         ],
         'EXP' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'exp',
+            '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::class, 'EXPONDIST'],
+            'functionCall' => [Statistical\Distributions\Exponential::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'EXPON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Exponential::class, 'distribution'],
             'argumentCount' => '3',
         ],
         'FACT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'FACT'],
+            'functionCall' => [MathTrig\Factorial::class, 'fact'],
             'argumentCount' => '1',
         ],
         'FACTDOUBLE' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'FACTDOUBLE'],
+            'functionCall' => [MathTrig\Factorial::class, 'factDouble'],
             'argumentCount' => '1',
         ],
         'FALSE' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'FALSE'],
+            'functionCall' => [Logical\Boolean::class, 'FALSE'],
             'argumentCount' => '0',
         ],
         'FDIST' => [
@@ -879,14 +1094,34 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '3',
         ],
+        'F.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\F::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'F.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'FILTER' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Filter::class, 'filter'],
+            'argumentCount' => '2-3',
+        ],
+        'FILTERXML' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'FIND' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'SEARCHSENSITIVE'],
+            'functionCall' => [TextData\Search::class, 'sensitive'],
             'argumentCount' => '2,3',
         ],
         'FINDB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'SEARCHSENSITIVE'],
+            'functionCall' => [TextData\Search::class, 'sensitive'],
             'argumentCount' => '2,3',
         ],
         'FINV' => [
@@ -894,34 +1129,79 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '3',
         ],
+        'F.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'F.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
         'FISHER' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'FISHER'],
+            'functionCall' => [Statistical\Distributions\Fisher::class, 'distribution'],
             'argumentCount' => '1',
         ],
         'FISHERINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'FISHERINV'],
+            'functionCall' => [Statistical\Distributions\Fisher::class, 'inverse'],
             'argumentCount' => '1',
         ],
         'FIXED' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'FIXEDFORMAT'],
+            'functionCall' => [TextData\Format::class, 'FIXEDFORMAT'],
             'argumentCount' => '1-3',
         ],
         'FLOOR' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'FLOOR'],
-            'argumentCount' => '2',
+            'functionCall' => [MathTrig\Floor::class, 'floor'],
+            'argumentCount' => '1-2', // Excel requries 2, Ods/Gnumeric 1-2
+        ],
+        'FLOOR.MATH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Floor::class, 'math'],
+            'argumentCount' => '1-3',
+        ],
+        'FLOOR.PRECISE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Floor::class, 'precise'],
+            'argumentCount' => '1-2',
         ],
         'FORECAST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'FORECAST'],
+            'functionCall' => [Statistical\Trends::class, 'FORECAST'],
+            'argumentCount' => '3',
+        ],
+        'FORECAST.ETS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.CONFINT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.SEASONALITY' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'FORECAST.ETS.STAT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.LINEAR' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'FORECAST'],
             'argumentCount' => '3',
         ],
         'FORMULATEXT' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'FORMULATEXT'],
+            'functionCall' => [LookupRef\Formula::class, 'text'],
             'argumentCount' => '1',
             'passCellReference' => true,
             'passByReference' => [true],
@@ -936,44 +1216,74 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2',
         ],
+        'F.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'FV' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'FV'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'futureValue'],
             'argumentCount' => '3-5',
         ],
         'FVSCHEDULE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'FVSCHEDULE'],
+            'functionCall' => [Financial\CashFlow\Single::class, 'futureValue'],
             'argumentCount' => '2',
         ],
+        'GAMMA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'gamma'],
+            'argumentCount' => '1',
+        ],
         'GAMMADIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'GAMMADIST'],
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'GAMMA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'distribution'],
             'argumentCount' => '4',
         ],
         'GAMMAINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'GAMMAINV'],
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'GAMMA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'inverse'],
             'argumentCount' => '3',
         ],
         'GAMMALN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'GAMMALN'],
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'ln'],
+            'argumentCount' => '1',
+        ],
+        'GAMMALN.PRECISE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'ln'],
+            'argumentCount' => '1',
+        ],
+        'GAUSS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'gauss'],
             'argumentCount' => '1',
         ],
         'GCD' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'GCD'],
+            'functionCall' => [MathTrig\Gcd::class, 'evaluate'],
             'argumentCount' => '1+',
         ],
         'GEOMEAN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'GEOMEAN'],
+            'functionCall' => [Statistical\Averages\Mean::class, 'geometric'],
             'argumentCount' => '1+',
         ],
         'GESTEP' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'GESTEP'],
+            'functionCall' => [Engineering\Compare::class, 'GESTEP'],
             'argumentCount' => '1,2',
         ],
         'GETPIVOTDATA' => [
@@ -983,198 +1293,213 @@ class Calculation
         ],
         'GROWTH' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'GROWTH'],
+            'functionCall' => [Statistical\Trends::class, 'GROWTH'],
             'argumentCount' => '1-4',
         ],
         'HARMEAN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'HARMEAN'],
+            'functionCall' => [Statistical\Averages\Mean::class, 'harmonic'],
             'argumentCount' => '1+',
         ],
         'HEX2BIN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'HEXTOBIN'],
+            'functionCall' => [Engineering\ConvertHex::class, 'toBinary'],
             'argumentCount' => '1,2',
         ],
         'HEX2DEC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'HEXTODEC'],
+            'functionCall' => [Engineering\ConvertHex::class, 'toDecimal'],
             'argumentCount' => '1',
         ],
         'HEX2OCT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'HEXTOOCT'],
+            'functionCall' => [Engineering\ConvertHex::class, 'toOctal'],
             'argumentCount' => '1,2',
         ],
         'HLOOKUP' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'HLOOKUP'],
+            'functionCall' => [LookupRef\HLookup::class, 'lookup'],
             'argumentCount' => '3,4',
         ],
         'HOUR' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'HOUROFDAY'],
+            '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::class, 'HYPERLINK'],
+            'functionCall' => [LookupRef\Hyperlink::class, 'set'],
             'argumentCount' => '1,2',
             'passCellReference' => true,
         ],
         'HYPGEOMDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'HYPGEOMDIST'],
+            'functionCall' => [Statistical\Distributions\HyperGeometric::class, 'distribution'],
             'argumentCount' => '4',
         ],
+        'HYPGEOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5',
+        ],
         'IF' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'statementIf'],
+            'functionCall' => [Logical\Conditional::class, 'statementIf'],
             'argumentCount' => '1-3',
         ],
         'IFERROR' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'IFERROR'],
+            'functionCall' => [Logical\Conditional::class, 'IFERROR'],
             'argumentCount' => '2',
         ],
         'IFNA' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'IFNA'],
+            'functionCall' => [Logical\Conditional::class, 'IFNA'],
             'argumentCount' => '2',
         ],
+        'IFS' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'IFS'],
+            'argumentCount' => '2+',
+        ],
         'IMABS' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMABS'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMABS'],
             'argumentCount' => '1',
         ],
         'IMAGINARY' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMAGINARY'],
+            'functionCall' => [Engineering\Complex::class, 'IMAGINARY'],
             'argumentCount' => '1',
         ],
         'IMARGUMENT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMARGUMENT'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMARGUMENT'],
             'argumentCount' => '1',
         ],
         'IMCONJUGATE' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCONJUGATE'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCONJUGATE'],
             'argumentCount' => '1',
         ],
         'IMCOS' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCOS'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOS'],
             'argumentCount' => '1',
         ],
         'IMCOSH' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCOSH'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOSH'],
             'argumentCount' => '1',
         ],
         'IMCOT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCOT'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOT'],
             'argumentCount' => '1',
         ],
         'IMCSC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCSC'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCSC'],
             'argumentCount' => '1',
         ],
         'IMCSCH' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMCSCH'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCSCH'],
             'argumentCount' => '1',
         ],
         'IMDIV' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMDIV'],
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMDIV'],
             'argumentCount' => '2',
         ],
         'IMEXP' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMEXP'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMEXP'],
             'argumentCount' => '1',
         ],
         'IMLN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMLN'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLN'],
             'argumentCount' => '1',
         ],
         'IMLOG10' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMLOG10'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLOG10'],
             'argumentCount' => '1',
         ],
         'IMLOG2' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMLOG2'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLOG2'],
             'argumentCount' => '1',
         ],
         'IMPOWER' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMPOWER'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMPOWER'],
             'argumentCount' => '2',
         ],
         'IMPRODUCT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMPRODUCT'],
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMPRODUCT'],
             'argumentCount' => '1+',
         ],
         'IMREAL' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMREAL'],
+            'functionCall' => [Engineering\Complex::class, 'IMREAL'],
             'argumentCount' => '1',
         ],
         'IMSEC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSEC'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSEC'],
             'argumentCount' => '1',
         ],
         'IMSECH' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSECH'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSECH'],
             'argumentCount' => '1',
         ],
         'IMSIN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSIN'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSIN'],
             'argumentCount' => '1',
         ],
         'IMSINH' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSINH'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSINH'],
             'argumentCount' => '1',
         ],
         'IMSQRT' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSQRT'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSQRT'],
             'argumentCount' => '1',
         ],
         'IMSUB' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSUB'],
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMSUB'],
             'argumentCount' => '2',
         ],
         'IMSUM' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMSUM'],
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMSUM'],
             'argumentCount' => '1+',
         ],
         'IMTAN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'IMTAN'],
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMTAN'],
             'argumentCount' => '1',
         ],
         'INDEX' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'INDEX'],
-            'argumentCount' => '1-4',
+            'functionCall' => [LookupRef\Matrix::class, 'index'],
+            'argumentCount' => '2-4',
         ],
         'INDIRECT' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'INDIRECT'],
+            'functionCall' => [LookupRef\Indirect::class, 'INDIRECT'],
             'argumentCount' => '1,2',
             'passCellReference' => true,
         ],
@@ -1185,101 +1510,118 @@ class Calculation
         ],
         'INT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'INT'],
+            'functionCall' => [MathTrig\IntClass::class, 'evaluate'],
             'argumentCount' => '1',
         ],
         'INTERCEPT' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'INTERCEPT'],
+            'functionCall' => [Statistical\Trends::class, 'INTERCEPT'],
             'argumentCount' => '2',
         ],
         'INTRATE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'INTRATE'],
+            'functionCall' => [Financial\Securities\Rates::class, 'interest'],
             'argumentCount' => '4,5',
         ],
         'IPMT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'IPMT'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'payment'],
             'argumentCount' => '4-6',
         ],
         'IRR' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'IRR'],
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'rate'],
             'argumentCount' => '1,2',
         ],
         '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' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
         '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' => [DateTime::class, 'ISOWEEKNUM'],
+            'functionCall' => [DateTimeExcel\Week::class, 'isoWeekNumber'],
             'argumentCount' => '1',
         ],
         'ISPMT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'ISPMT'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'schedulePayment'],
             'argumentCount' => '4',
         ],
         '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' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
         'JIS' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [Functions::class, 'DUMMY'],
@@ -1287,107 +1629,137 @@ class Calculation
         ],
         'KURT' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'KURT'],
+            'functionCall' => [Statistical\Deviations::class, 'kurtosis'],
             'argumentCount' => '1+',
         ],
+        'LAMBDA' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'LARGE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'LARGE'],
+            'functionCall' => [Statistical\Size::class, 'large'],
             'argumentCount' => '2',
         ],
         'LCM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'LCM'],
+            'functionCall' => [MathTrig\Lcm::class, 'evaluate'],
             'argumentCount' => '1+',
         ],
         'LEFT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'LEFT'],
+            'functionCall' => [TextData\Extract::class, 'left'],
             'argumentCount' => '1,2',
         ],
         'LEFTB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'LEFT'],
+            'functionCall' => [TextData\Extract::class, 'left'],
             'argumentCount' => '1,2',
         ],
         'LEN' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'STRINGLENGTH'],
+            'functionCall' => [TextData\Text::class, 'length'],
             'argumentCount' => '1',
         ],
         'LENB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'STRINGLENGTH'],
+            'functionCall' => [TextData\Text::class, 'length'],
             'argumentCount' => '1',
         ],
+        'LET' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'LINEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'LINEST'],
+            'functionCall' => [Statistical\Trends::class, 'LINEST'],
             'argumentCount' => '1-4',
         ],
         'LN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'log',
+            'functionCall' => [MathTrig\Logarithms::class, 'natural'],
             'argumentCount' => '1',
         ],
         'LOG' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'logBase'],
+            'functionCall' => [MathTrig\Logarithms::class, 'withBase'],
             'argumentCount' => '1,2',
         ],
         'LOG10' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'log10',
+            'functionCall' => [MathTrig\Logarithms::class, 'base10'],
             'argumentCount' => '1',
         ],
         'LOGEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'LOGEST'],
+            'functionCall' => [Statistical\Trends::class, 'LOGEST'],
             'argumentCount' => '1-4',
         ],
         'LOGINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'LOGINV'],
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'inverse'],
             'argumentCount' => '3',
         ],
         'LOGNORMDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'LOGNORMDIST'],
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'cumulative'],
+            'argumentCount' => '3',
+        ],
+        'LOGNORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'LOGNORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'inverse'],
             'argumentCount' => '3',
         ],
         'LOOKUP' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'LOOKUP'],
+            'functionCall' => [LookupRef\Lookup::class, 'lookup'],
             'argumentCount' => '2,3',
         ],
         'LOWER' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'LOWERCASE'],
+            '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::class, 'MATCH'],
+            'functionCall' => [LookupRef\ExcelMatch::class, 'MATCH'],
             'argumentCount' => '2,3',
         ],
         'MAX' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MAX'],
+            'functionCall' => [Statistical\Maximum::class, 'max'],
             'argumentCount' => '1+',
         ],
         'MAXA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MAXA'],
+            'functionCall' => [Statistical\Maximum::class, 'maxA'],
             'argumentCount' => '1+',
         ],
         'MAXIFS' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MAXIFS'],
+            'functionCall' => [Statistical\Conditional::class, 'MAXIFS'],
             'argumentCount' => '3+',
         ],
         'MDETERM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MDETERM'],
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'determinant'],
             'argumentCount' => '1',
         ],
         'MDURATION' => [
@@ -1397,7 +1769,7 @@ class Calculation
         ],
         'MEDIAN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MEDIAN'],
+            'functionCall' => [Statistical\Averages::class, 'median'],
             'argumentCount' => '1+',
         ],
         'MEDIANIF' => [
@@ -1407,167 +1779,212 @@ class Calculation
         ],
         'MID' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'MID'],
+            'functionCall' => [TextData\Extract::class, 'mid'],
             'argumentCount' => '3',
         ],
         'MIDB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'MID'],
+            'functionCall' => [TextData\Extract::class, 'mid'],
             'argumentCount' => '3',
         ],
         'MIN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MIN'],
+            'functionCall' => [Statistical\Minimum::class, 'min'],
             'argumentCount' => '1+',
         ],
         'MINA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MINA'],
+            'functionCall' => [Statistical\Minimum::class, 'minA'],
             'argumentCount' => '1+',
         ],
         'MINIFS' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MINIFS'],
+            'functionCall' => [Statistical\Conditional::class, 'MINIFS'],
             'argumentCount' => '3+',
         ],
         'MINUTE' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'MINUTE'],
+            'functionCall' => [DateTimeExcel\TimeParts::class, 'minute'],
             'argumentCount' => '1',
         ],
         'MINVERSE' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MINVERSE'],
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'inverse'],
             'argumentCount' => '1',
         ],
         'MIRR' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'MIRR'],
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'modifiedRate'],
             'argumentCount' => '3',
         ],
         'MMULT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MMULT'],
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'multiply'],
             'argumentCount' => '2',
         ],
         'MOD' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MOD'],
+            'functionCall' => [MathTrig\Operations::class, 'mod'],
             'argumentCount' => '2',
         ],
         'MODE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MODE'],
+            'functionCall' => [Statistical\Averages::class, 'mode'],
+            'argumentCount' => '1+',
+        ],
+        'MODE.MULT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '1+',
         ],
         'MODE.SNGL' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'MODE'],
+            'functionCall' => [Statistical\Averages::class, 'mode'],
             'argumentCount' => '1+',
         ],
         'MONTH' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'MONTHOFYEAR'],
+            'functionCall' => [DateTimeExcel\DateParts::class, 'month'],
             'argumentCount' => '1',
         ],
         'MROUND' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MROUND'],
+            'functionCall' => [MathTrig\Round::class, 'multiple'],
             'argumentCount' => '2',
         ],
         'MULTINOMIAL' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'MULTINOMIAL'],
+            'functionCall' => [MathTrig\Factorial::class, 'multinomial'],
             'argumentCount' => '1+',
         ],
+        'MUNIT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'identity'],
+            'argumentCount' => '1',
+        ],
         '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' => [Information\ExcelError::class, 'NA'],
             'argumentCount' => '0',
         ],
         'NEGBINOMDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'NEGBINOMDIST'],
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'negative'],
             'argumentCount' => '3',
         ],
+        'NEGBINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
         'NETWORKDAYS' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'NETWORKDAYS'],
-            'argumentCount' => '2+',
+            'functionCall' => [DateTimeExcel\NetworkDays::class, 'count'],
+            'argumentCount' => '2-3',
+        ],
+        'NETWORKDAYS.INTL' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
         ],
         'NOMINAL' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'NOMINAL'],
+            'functionCall' => [Financial\InterestRate::class, 'nominal'],
             'argumentCount' => '2',
         ],
         'NORMDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'NORMDIST'],
+            'functionCall' => [Statistical\Distributions\Normal::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'NORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'distribution'],
             'argumentCount' => '4',
         ],
         'NORMINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'NORMINV'],
+            'functionCall' => [Statistical\Distributions\Normal::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'NORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'inverse'],
             'argumentCount' => '3',
         ],
         'NORMSDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'NORMSDIST'],
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'cumulative'],
             'argumentCount' => '1',
         ],
+        'NORM.S.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'distribution'],
+            'argumentCount' => '1,2',
+        ],
         'NORMSINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'NORMSINV'],
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'inverse'],
+            'argumentCount' => '1',
+        ],
+        'NORM.S.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'inverse'],
             'argumentCount' => '1',
         ],
         'NOT' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'NOT'],
+            'functionCall' => [Logical\Operations::class, 'NOT'],
             'argumentCount' => '1',
         ],
         'NOW' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DATETIMENOW'],
+            'functionCall' => [DateTimeExcel\Current::class, 'now'],
             'argumentCount' => '0',
         ],
         'NPER' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'NPER'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'periods'],
             'argumentCount' => '3-5',
         ],
         'NPV' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'NPV'],
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'presentValue'],
             'argumentCount' => '2+',
         ],
+        'NUMBERSTRING' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
         'NUMBERVALUE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'NUMBERVALUE'],
+            'functionCall' => [TextData\Format::class, 'NUMBERVALUE'],
             'argumentCount' => '1+',
         ],
         'OCT2BIN' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'OCTTOBIN'],
+            'functionCall' => [Engineering\ConvertOctal::class, 'toBinary'],
             'argumentCount' => '1,2',
         ],
         'OCT2DEC' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'OCTTODEC'],
+            'functionCall' => [Engineering\ConvertOctal::class, 'toDecimal'],
             'argumentCount' => '1',
         ],
         'OCT2HEX' => [
             'category' => Category::CATEGORY_ENGINEERING,
-            'functionCall' => [Engineering::class, 'OCTTOHEX'],
+            'functionCall' => [Engineering\ConvertOctal::class, 'toHex'],
             'argumentCount' => '1,2',
         ],
         'ODD' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ODD'],
+            'functionCall' => [MathTrig\Round::class, 'odd'],
             'argumentCount' => '1',
         ],
         'ODDFPRICE' => [
@@ -1592,39 +2009,64 @@ class Calculation
         ],
         'OFFSET' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'OFFSET'],
+            'functionCall' => [LookupRef\Offset::class, 'OFFSET'],
             'argumentCount' => '3-5',
             'passCellReference' => true,
             'passByReference' => [true],
         ],
         'OR' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'logicalOr'],
+            'functionCall' => [Logical\Operations::class, 'logicalOr'],
             'argumentCount' => '1+',
         ],
         'PDURATION' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PDURATION'],
+            'functionCall' => [Financial\CashFlow\Single::class, 'periods'],
             'argumentCount' => '3',
         ],
         'PEARSON' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'CORREL'],
+            'functionCall' => [Statistical\Trends::class, 'CORREL'],
             'argumentCount' => '2',
         ],
         'PERCENTILE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'PERCENTILE'],
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTILE'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTILE'],
             'argumentCount' => '2',
         ],
         'PERCENTRANK' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'PERCENTRANK'],
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTRANK'],
+            'argumentCount' => '2,3',
+        ],
+        'PERCENTRANK.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'PERCENTRANK.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTRANK'],
             'argumentCount' => '2,3',
         ],
         'PERMUT' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'PERMUT'],
+            'functionCall' => [Statistical\Permutations::class, 'PERMUT'],
+            'argumentCount' => '2',
+        ],
+        'PERMUTATIONA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Permutations::class, 'PERMUTATIONA'],
             'argumentCount' => '2',
         ],
         'PHONETIC' => [
@@ -1632,6 +2074,11 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '1',
         ],
+        'PHI' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'PI' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => 'pi',
@@ -1639,37 +2086,42 @@ class Calculation
         ],
         'PMT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PMT'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Payments::class, 'annuity'],
             'argumentCount' => '3-5',
         ],
         'POISSON' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'POISSON'],
+            'functionCall' => [Statistical\Distributions\Poisson::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'POISSON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Poisson::class, 'distribution'],
             'argumentCount' => '3',
         ],
         'POWER' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'POWER'],
+            'functionCall' => [MathTrig\Operations::class, 'power'],
             'argumentCount' => '2',
         ],
         'PPMT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PPMT'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Payments::class, 'interestPayment'],
             'argumentCount' => '4-6',
         ],
         'PRICE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PRICE'],
+            'functionCall' => [Financial\Securities\Price::class, 'price'],
             'argumentCount' => '6,7',
         ],
         'PRICEDISC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PRICEDISC'],
+            'functionCall' => [Financial\Securities\Price::class, 'priceDiscounted'],
             'argumentCount' => '4,5',
         ],
         'PRICEMAT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PRICEMAT'],
+            'functionCall' => [Financial\Securities\Price::class, 'priceAtMaturity'],
             'argumentCount' => '5,6',
         ],
         'PROB' => [
@@ -1679,123 +2131,164 @@ class Calculation
         ],
         'PRODUCT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'PRODUCT'],
+            'functionCall' => [MathTrig\Operations::class, 'product'],
             'argumentCount' => '1+',
         ],
         'PROPER' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'PROPERCASE'],
+            'functionCall' => [TextData\CaseConvert::class, 'proper'],
             'argumentCount' => '1',
         ],
         'PV' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'PV'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'presentValue'],
             'argumentCount' => '3-5',
         ],
         'QUARTILE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'QUARTILE'],
+            'functionCall' => [Statistical\Percentiles::class, 'QUARTILE'],
+            'argumentCount' => '2',
+        ],
+        'QUARTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'QUARTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'QUARTILE'],
             'argumentCount' => '2',
         ],
         'QUOTIENT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'QUOTIENT'],
+            'functionCall' => [MathTrig\Operations::class, 'quotient'],
             'argumentCount' => '2',
         ],
         'RADIANS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'deg2rad',
+            'functionCall' => [MathTrig\Angle::class, 'toRadians'],
             'argumentCount' => '1',
         ],
         'RAND' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'RAND'],
+            'functionCall' => [MathTrig\Random::class, 'rand'],
             'argumentCount' => '0',
         ],
+        'RANDARRAY' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Random::class, 'randArray'],
+            'argumentCount' => '0-5',
+        ],
         'RANDBETWEEN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'RAND'],
+            'functionCall' => [MathTrig\Random::class, 'randBetween'],
             'argumentCount' => '2',
         ],
         'RANK' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'RANK'],
+            'functionCall' => [Statistical\Percentiles::class, 'RANK'],
+            'argumentCount' => '2,3',
+        ],
+        'RANK.AVG' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'RANK.EQ' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'RANK'],
             'argumentCount' => '2,3',
         ],
         'RATE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'RATE'],
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'rate'],
             'argumentCount' => '3-6',
         ],
         'RECEIVED' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'RECEIVED'],
+            '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::class, 'REPLACE'],
+            'functionCall' => [TextData\Replace::class, 'replace'],
             'argumentCount' => '4',
         ],
         'REPLACEB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'REPLACE'],
+            'functionCall' => [TextData\Replace::class, 'replace'],
             'argumentCount' => '4',
         ],
         'REPT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => 'str_repeat',
+            'functionCall' => [TextData\Concatenate::class, 'builtinREPT'],
             'argumentCount' => '2',
         ],
         'RIGHT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'RIGHT'],
+            'functionCall' => [TextData\Extract::class, 'right'],
             'argumentCount' => '1,2',
         ],
         'RIGHTB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'RIGHT'],
+            'functionCall' => [TextData\Extract::class, 'right'],
             'argumentCount' => '1,2',
         ],
         'ROMAN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ROMAN'],
+            'functionCall' => [MathTrig\Roman::class, 'evaluate'],
             'argumentCount' => '1,2',
         ],
         'ROUND' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'round',
+            'functionCall' => [MathTrig\Round::class, 'round'],
             'argumentCount' => '2',
         ],
+        'ROUNDBAHTDOWN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'ROUNDBAHTUP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
         'ROUNDDOWN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ROUNDDOWN'],
+            'functionCall' => [MathTrig\Round::class, 'down'],
             'argumentCount' => '2',
         ],
         'ROUNDUP' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'ROUNDUP'],
+            'functionCall' => [MathTrig\Round::class, 'up'],
             'argumentCount' => '2',
         ],
         'ROW' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'ROW'],
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'ROW'],
             'argumentCount' => '-1',
+            'passCellReference' => true,
             'passByReference' => [true],
         ],
         'ROWS' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'ROWS'],
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'ROWS'],
             'argumentCount' => '1',
         ],
         'RRI' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'RRI'],
+            'functionCall' => [Financial\CashFlow\Single::class, 'interestRate'],
             'argumentCount' => '3',
         ],
         'RSQ' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'RSQ'],
+            'functionCall' => [Statistical\Trends::class, 'RSQ'],
             'argumentCount' => '2',
         ],
         'RTD' => [
@@ -1805,273 +2298,403 @@ class Calculation
         ],
         'SEARCH' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'SEARCHINSENSITIVE'],
+            '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::class, 'SEARCHINSENSITIVE'],
+            'functionCall' => [TextData\Search::class, 'insensitive'],
             'argumentCount' => '2,3',
         ],
         'SEC' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SEC'],
+            'functionCall' => [MathTrig\Trig\Secant::class, 'sec'],
             'argumentCount' => '1',
         ],
         'SECH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SECH'],
+            'functionCall' => [MathTrig\Trig\Secant::class, 'sech'],
             'argumentCount' => '1',
         ],
         'SECOND' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'SECOND'],
+            'functionCall' => [DateTimeExcel\TimeParts::class, 'second'],
             'argumentCount' => '1',
         ],
+        'SEQUENCE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'sequence'],
+            'argumentCount' => '1-4',
+        ],
         'SERIESSUM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SERIESSUM'],
+            'functionCall' => [MathTrig\SeriesSum::class, 'evaluate'],
             'argumentCount' => '4',
         ],
+        'SHEET' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '0,1',
+        ],
+        'SHEETS' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '0,1',
+        ],
         'SIGN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SIGN'],
+            'functionCall' => [MathTrig\Sign::class, 'evaluate'],
             'argumentCount' => '1',
         ],
         'SIN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'sin',
+            'functionCall' => [MathTrig\Trig\Sine::class, 'sin'],
             'argumentCount' => '1',
         ],
+        'SINGLE' => [
+            'category' => Category::CATEGORY_UNCATEGORISED,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'SINH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'sinh',
+            'functionCall' => [MathTrig\Trig\Sine::class, 'sinh'],
             'argumentCount' => '1',
         ],
         'SKEW' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'SKEW'],
+            'functionCall' => [Statistical\Deviations::class, 'skew'],
+            'argumentCount' => '1+',
+        ],
+        'SKEW.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '1+',
         ],
         'SLN' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'SLN'],
+            'functionCall' => [Financial\Depreciation::class, 'SLN'],
             'argumentCount' => '3',
         ],
         'SLOPE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'SLOPE'],
+            'functionCall' => [Statistical\Trends::class, 'SLOPE'],
             'argumentCount' => '2',
         ],
         'SMALL' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'SMALL'],
+            'functionCall' => [Statistical\Size::class, 'small'],
             'argumentCount' => '2',
         ],
+        'SORT' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Sort::class, 'sort'],
+            'argumentCount' => '1-4',
+        ],
+        'SORTBY' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Sort::class, 'sortBy'],
+            'argumentCount' => '2+',
+        ],
         'SQRT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'sqrt',
+            'functionCall' => [MathTrig\Sqrt::class, 'sqrt'],
             'argumentCount' => '1',
         ],
         'SQRTPI' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SQRTPI'],
+            'functionCall' => [MathTrig\Sqrt::class, 'pi'],
             'argumentCount' => '1',
         ],
         'STANDARDIZE' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STANDARDIZE'],
+            'functionCall' => [Statistical\Standardize::class, 'execute'],
             'argumentCount' => '3',
         ],
         'STDEV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEV'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEV'],
             'argumentCount' => '1+',
         ],
         'STDEV.S' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEV'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEV'],
             'argumentCount' => '1+',
         ],
         'STDEV.P' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEVP'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVP'],
             'argumentCount' => '1+',
         ],
         'STDEVA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEVA'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVA'],
             'argumentCount' => '1+',
         ],
         'STDEVP' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEVP'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVP'],
             'argumentCount' => '1+',
         ],
         'STDEVPA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STDEVPA'],
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVPA'],
             'argumentCount' => '1+',
         ],
         'STEYX' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'STEYX'],
+            'functionCall' => [Statistical\Trends::class, 'STEYX'],
             'argumentCount' => '2',
         ],
         'SUBSTITUTE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'SUBSTITUTE'],
+            'functionCall' => [TextData\Replace::class, 'substitute'],
             'argumentCount' => '3,4',
         ],
         'SUBTOTAL' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUBTOTAL'],
+            'functionCall' => [MathTrig\Subtotal::class, 'evaluate'],
             'argumentCount' => '2+',
             'passCellReference' => true,
         ],
         'SUM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUM'],
+            'functionCall' => [MathTrig\Sum::class, 'sumErroringStrings'],
             'argumentCount' => '1+',
         ],
         'SUMIF' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMIF'],
+            'functionCall' => [Statistical\Conditional::class, 'SUMIF'],
             'argumentCount' => '2,3',
         ],
         'SUMIFS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMIFS'],
+            'functionCall' => [Statistical\Conditional::class, 'SUMIFS'],
             'argumentCount' => '3+',
         ],
         'SUMPRODUCT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMPRODUCT'],
+            'functionCall' => [MathTrig\Sum::class, 'product'],
             'argumentCount' => '1+',
         ],
         'SUMSQ' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMSQ'],
+            'functionCall' => [MathTrig\SumSquares::class, 'sumSquare'],
             'argumentCount' => '1+',
         ],
         'SUMX2MY2' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMX2MY2'],
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXSquaredMinusYSquared'],
             'argumentCount' => '2',
         ],
         'SUMX2PY2' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMX2PY2'],
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXSquaredPlusYSquared'],
             'argumentCount' => '2',
         ],
         'SUMXMY2' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'SUMXMY2'],
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXMinusYSquared'],
             'argumentCount' => '2',
         ],
         'SWITCH' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'statementSwitch'],
+            'functionCall' => [Logical\Conditional::class, 'statementSwitch'],
             'argumentCount' => '3+',
         ],
         'SYD' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'SYD'],
+            'functionCall' => [Financial\Depreciation::class, 'SYD'],
             'argumentCount' => '4',
         ],
         'T' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'RETURNSTRING'],
+            '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' => 'tan',
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'tan'],
             'argumentCount' => '1',
         ],
         'TANH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => 'tanh',
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'tanh'],
             'argumentCount' => '1',
         ],
         'TBILLEQ' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'TBILLEQ'],
+            'functionCall' => [Financial\TreasuryBill::class, 'bondEquivalentYield'],
             'argumentCount' => '3',
         ],
         'TBILLPRICE' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'TBILLPRICE'],
+            'functionCall' => [Financial\TreasuryBill::class, 'price'],
             'argumentCount' => '3',
         ],
         'TBILLYIELD' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'TBILLYIELD'],
+            'functionCall' => [Financial\TreasuryBill::class, 'yield'],
             'argumentCount' => '3',
         ],
         'TDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'TDIST'],
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'distribution'],
             'argumentCount' => '3',
         ],
+        'T.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'T.DIST.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'T.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'TEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'TEXTFORMAT'],
+            '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::class, 'TEXTJOIN'],
+            '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'],
+            'argumentCount' => '?',
+        ],
+        'THAIDIGIT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAIMONTHOFYEAR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAINUMSOUND' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAINUMSTRING' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAISTRINGLENGTH' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAIYEAR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
         'TIME' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'TIME'],
+            'functionCall' => [DateTimeExcel\Time::class, 'fromHMS'],
             'argumentCount' => '3',
         ],
         'TIMEVALUE' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'TIMEVALUE'],
+            'functionCall' => [DateTimeExcel\TimeValue::class, 'fromString'],
             'argumentCount' => '1',
         ],
         'TINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'TINV'],
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'inverse'],
+            'argumentCount' => '2',
+        ],
+        'T.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'inverse'],
+            'argumentCount' => '2',
+        ],
+        'T.INV.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2',
         ],
         'TODAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'DATENOW'],
+            '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::class, 'TRANSPOSE'],
+            'functionCall' => [LookupRef\Matrix::class, 'transpose'],
             'argumentCount' => '1',
         ],
         'TREND' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'TREND'],
+            'functionCall' => [Statistical\Trends::class, 'TREND'],
             'argumentCount' => '1-4',
         ],
         'TRIM' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'TRIMSPACES'],
+            'functionCall' => [TextData\Trim::class, 'spaces'],
             'argumentCount' => '1',
         ],
         'TRIMMEAN' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'TRIMMEAN'],
+            'functionCall' => [Statistical\Averages\Mean::class, 'trim'],
             'argumentCount' => '2',
         ],
         'TRUE' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'TRUE'],
+            'functionCall' => [Logical\Boolean::class, 'TRUE'],
             'argumentCount' => '0',
         ],
         'TRUNC' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [MathTrig::class, 'TRUNC'],
+            'functionCall' => [MathTrig\Trunc::class, 'evaluate'],
             'argumentCount' => '1,2',
         ],
         'TTEST' => [
@@ -2079,64 +2702,79 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '4',
         ],
+        'T.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
         'TYPE' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'TYPE'],
+            'functionCall' => [Information\Value::class, 'type'],
             'argumentCount' => '1',
         ],
         'UNICHAR' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'CHARACTER'],
+            'functionCall' => [TextData\CharacterConvert::class, 'character'],
             'argumentCount' => '1',
         ],
         'UNICODE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'ASCIICODE'],
+            'functionCall' => [TextData\CharacterConvert::class, 'code'],
             'argumentCount' => '1',
         ],
+        'UNIQUE' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Unique::class, 'unique'],
+            'argumentCount' => '1+',
+        ],
         'UPPER' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'UPPERCASE'],
+            'functionCall' => [TextData\CaseConvert::class, 'upper'],
             'argumentCount' => '1',
         ],
         'USDOLLAR' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Financial\Dollar::class, 'format'],
             'argumentCount' => '2',
         ],
         'VALUE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData::class, 'VALUE'],
+            'functionCall' => [TextData\Format::class, 'VALUE'],
             'argumentCount' => '1',
         ],
+        'VALUETOTEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'valueToText'],
+            'argumentCount' => '1,2',
+        ],
         'VAR' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARFunc'],
+            'functionCall' => [Statistical\Variances::class, 'VAR'],
             'argumentCount' => '1+',
         ],
         'VAR.P' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARP'],
+            'functionCall' => [Statistical\Variances::class, 'VARP'],
             'argumentCount' => '1+',
         ],
         'VAR.S' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARFunc'],
+            'functionCall' => [Statistical\Variances::class, 'VAR'],
             'argumentCount' => '1+',
         ],
         'VARA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARA'],
+            'functionCall' => [Statistical\Variances::class, 'VARA'],
             'argumentCount' => '1+',
         ],
         'VARP' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARP'],
+            'functionCall' => [Statistical\Variances::class, 'VARP'],
             'argumentCount' => '1+',
         ],
         'VARPA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'VARPA'],
+            'functionCall' => [Statistical\Variances::class, 'VARPA'],
             'argumentCount' => '1+',
         ],
         'VDB' => [
@@ -2146,52 +2784,92 @@ class Calculation
         ],
         'VLOOKUP' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [LookupRef::class, 'VLOOKUP'],
+            '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'],
+            'argumentCount' => '1',
+        ],
         'WEEKDAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'WEEKDAY'],
+            'functionCall' => [DateTimeExcel\Week::class, 'day'],
             'argumentCount' => '1,2',
         ],
         'WEEKNUM' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'WEEKNUM'],
+            'functionCall' => [DateTimeExcel\Week::class, 'number'],
             'argumentCount' => '1,2',
         ],
         'WEIBULL' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'WEIBULL'],
+            'functionCall' => [Statistical\Distributions\Weibull::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'WEIBULL.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Weibull::class, 'distribution'],
             'argumentCount' => '4',
         ],
         'WORKDAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'WORKDAY'],
-            'argumentCount' => '2+',
+            'functionCall' => [DateTimeExcel\WorkDay::class, 'date'],
+            'argumentCount' => '2-3',
+        ],
+        'WORKDAY.INTL' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            '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::class, 'XIRR'],
+            'functionCall' => [Financial\CashFlow\Variable\NonPeriodic::class, 'rate'],
             'argumentCount' => '2,3',
         ],
+        'XLOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
         'XNPV' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'XNPV'],
+            'functionCall' => [Financial\CashFlow\Variable\NonPeriodic::class, 'presentValue'],
             'argumentCount' => '3',
         ],
+        'XMATCH' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
         'XOR' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Logical::class, 'logicalXor'],
+            'functionCall' => [Logical\Operations::class, 'logicalXor'],
             'argumentCount' => '1+',
         ],
         'YEAR' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'YEAR'],
+            'functionCall' => [DateTimeExcel\DateParts::class, 'year'],
             'argumentCount' => '1',
         ],
         'YEARFRAC' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
-            'functionCall' => [DateTime::class, 'YEARFRAC'],
+            'functionCall' => [DateTimeExcel\YearFrac::class, 'fraction'],
             'argumentCount' => '2,3',
         ],
         'YIELD' => [
@@ -2201,42 +2879,60 @@ class Calculation
         ],
         'YIELDDISC' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'YIELDDISC'],
+            'functionCall' => [Financial\Securities\Yields::class, 'yieldDiscounted'],
             'argumentCount' => '4,5',
         ],
         'YIELDMAT' => [
             'category' => Category::CATEGORY_FINANCIAL,
-            'functionCall' => [Financial::class, 'YIELDMAT'],
+            'functionCall' => [Financial\Securities\Yields::class, 'yieldAtMaturity'],
             'argumentCount' => '5,6',
         ],
         'ZTEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Statistical::class, 'ZTEST'],
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'zTest'],
+            'argumentCount' => '2-3',
+        ],
+        'Z.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'zTest'],
             'argumentCount' => '2-3',
         ],
     ];
 
-    //    Internal functions used for special control purposes
+    /**
+     *    Internal functions used for special control purposes.
+     *
+     * @var array
+     */
     private static $controlFunctions = [
         'MKMATRIX' => [
             'argumentCount' => '*',
-            'functionCall' => 'self::mkMatrix',
+            'functionCall' => [Internal\MakeMatrix::class, 'make'],
+        ],
+        'NAME.ERROR' => [
+            'argumentCount' => '*',
+            'functionCall' => [Functions::class, 'NAME'],
+        ],
+        'WILDCARDMATCH' => [
+            'argumentCount' => '2',
+            'functionCall' => [Internal\WildcardMatch::class, 'compare'],
         ],
     ];
 
-    public function __construct(Spreadsheet $spreadsheet = null)
+    public function __construct(?Spreadsheet $spreadsheet = null)
     {
-        $this->delta = 1 * pow(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()
+    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;
@@ -2247,12 +2943,10 @@ class Calculation
     /**
      * Get an instance of this class.
      *
-     * @param Spreadsheet $spreadsheet Injected spreadsheet for working with a PhpSpreadsheet Spreadsheet object,
-     *                                    or NULL to create a standalone claculation engine
-     *
-     * @return Calculation
+     * @param ?Spreadsheet $spreadsheet Injected spreadsheet for working with a PhpSpreadsheet Spreadsheet object,
+     *                                    or NULL to create a standalone calculation engine
      */
-    public static function getInstance(Spreadsheet $spreadsheet = null)
+    public static function getInstance(?Spreadsheet $spreadsheet = null): self
     {
         if ($spreadsheet !== null) {
             $instance = $spreadsheet->getCalculationEngine();
@@ -2272,10 +2966,10 @@ class Calculation
      * Flush the calculation cache for any existing instance of this class
      *        but only if a Calculation instance exists.
      */
-    public function flushInstance()
+    public function flushInstance(): void
     {
         $this->clearCalculationCache();
-        $this->clearBranchStore();
+        $this->branchPruner->clearBranchStore();
     }
 
     /**
@@ -2290,8 +2984,6 @@ class Calculation
 
     /**
      * __clone implementation. Cloning should not be allowed in a Singleton!
-     *
-     * @throws Exception
      */
     final public function __clone()
     {
@@ -2303,7 +2995,7 @@ class Calculation
      *
      * @return string locale-specific translation of TRUE
      */
-    public static function getTRUE()
+    public static function getTRUE(): string
     {
         return self::$localeBoolean['TRUE'];
     }
@@ -2313,7 +3005,7 @@ class Calculation
      *
      * @return string locale-specific translation of FALSE
      */
-    public static function getFALSE()
+    public static function getFALSE(): string
     {
         return self::$localeBoolean['FALSE'];
     }
@@ -2327,9 +3019,11 @@ class Calculation
      */
     public static function setArrayReturnType($returnType)
     {
-        if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
+        if (
+            ($returnType == self::RETURN_ARRAY_AS_VALUE) ||
             ($returnType == self::RETURN_ARRAY_AS_ERROR) ||
-            ($returnType == self::RETURN_ARRAY_AS_ARRAY)) {
+            ($returnType == self::RETURN_ARRAY_AS_ARRAY)
+        ) {
             self::$returnArrayAsType = $returnType;
 
             return true;
@@ -2361,18 +3055,18 @@ class Calculation
     /**
      * Enable/disable calculation cache.
      *
-     * @param bool $pValue
+     * @param bool $calculationCacheEnabled
      */
-    public function setCalculationCacheEnabled($pValue)
+    public function setCalculationCacheEnabled($calculationCacheEnabled): void
     {
-        $this->calculationCacheEnabled = $pValue;
+        $this->calculationCacheEnabled = $calculationCacheEnabled;
         $this->clearCalculationCache();
     }
 
     /**
      * Enable calculation cache.
      */
-    public function enableCalculationCache()
+    public function enableCalculationCache(): void
     {
         $this->setCalculationCacheEnabled(true);
     }
@@ -2380,7 +3074,7 @@ class Calculation
     /**
      * Disable calculation cache.
      */
-    public function disableCalculationCache()
+    public function disableCalculationCache(): void
     {
         $this->setCalculationCacheEnabled(false);
     }
@@ -2388,7 +3082,7 @@ class Calculation
     /**
      * Clear calculation cache.
      */
-    public function clearCalculationCache()
+    public function clearCalculationCache(): void
     {
         $this->calculationCache = [];
     }
@@ -2398,7 +3092,7 @@ class Calculation
      *
      * @param string $worksheetName
      */
-    public function clearCalculationCacheForWorksheet($worksheetName)
+    public function clearCalculationCacheForWorksheet($worksheetName): void
     {
         if (isset($this->calculationCache[$worksheetName])) {
             unset($this->calculationCache[$worksheetName]);
@@ -2411,7 +3105,7 @@ class Calculation
      * @param string $fromWorksheetName
      * @param string $toWorksheetName
      */
-    public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksheetName)
+    public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksheetName): void
     {
         if (isset($this->calculationCache[$fromWorksheetName])) {
             $this->calculationCache[$toWorksheetName] = &$this->calculationCache[$fromWorksheetName];
@@ -2422,29 +3116,24 @@ class Calculation
     /**
      * Enable/disable calculation cache.
      *
-     * @param bool $pValue
      * @param mixed $enabled
      */
-    public function setBranchPruningEnabled($enabled)
+    public function setBranchPruningEnabled($enabled): void
     {
         $this->branchPruningEnabled = $enabled;
+        $this->branchPruner = new BranchPruner($this->branchPruningEnabled);
     }
 
-    public function enableBranchPruning()
+    public function enableBranchPruning(): void
     {
         $this->setBranchPruningEnabled(true);
     }
 
-    public function disableBranchPruning()
+    public function disableBranchPruning(): void
     {
         $this->setBranchPruningEnabled(false);
     }
 
-    public function clearBranchStore()
-    {
-        $this->branchStoreKeyCounter = 0;
-    }
-
     /**
      * Get the currently defined locale code.
      *
@@ -2455,6 +3144,21 @@ class Calculation
         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;
+        if (!file_exists($localeFileName)) {
+            //    If there isn't a locale specific file, look for a language specific file
+            $localeFileName = $localeDir . $language . DIRECTORY_SEPARATOR . $file;
+            if (!file_exists($localeFileName)) {
+                throw new Exception('Locale file not found');
+            }
+        }
+
+        return $localeFileName;
+    }
+
     /**
      * Set the locale code.
      *
@@ -2462,7 +3166,7 @@ class Calculation
      *
      * @return bool
      */
-    public function setLocale($locale)
+    public function setLocale(string $locale)
     {
         //    Identify our locale and language
         $language = $locale = strtolower($locale);
@@ -2472,32 +3176,31 @@ class Calculation
         if (count(self::$validLocaleLanguages) == 1) {
             self::loadLocales();
         }
+
         //    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 = ',';
             self::$localeBoolean = ['TRUE' => 'TRUE', 'FALSE' => 'FALSE', 'NULL' => 'NULL'];
-            //    Default is English, if user isn't requesting english, then read the necessary data from the locale files
-            if ($locale != 'en_us') {
+
+            //    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
-                $functionNamesFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'functions';
-                if (!file_exists($functionNamesFile)) {
-                    //    If there isn't a locale specific function file, look for a language specific function file
-                    $functionNamesFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'functions';
-                    if (!file_exists($functionNamesFile)) {
-                        return false;
-                    }
+                try {
+                    $functionNamesFile = $this->getLocaleFile($localeDir, $locale, $language, 'functions');
+                } catch (Exception $e) {
+                    return false;
                 }
+
                 //    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) {
-                        [$fName, $lfName] = explode('=', $localeFunction);
-                        $fName = trim($fName);
-                        $lfName = trim($lfName);
-                        if ((isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
+                        [$fName, $lfName] = array_map('trim', explode('=', $localeFunction));
+                        if ((substr($fName, 0, 1) === '*' || isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
                             self::$localeFunctions[$fName] = $lfName;
                         }
                     }
@@ -2510,20 +3213,22 @@ class Calculation
                     self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
                 }
 
-                $configFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'config';
-                if (!file_exists($configFile)) {
-                    $configFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'config';
+                try {
+                    $configFile = $this->getLocaleFile($localeDir, $locale, $language, 'config');
+                } catch (Exception $e) {
+                    return false;
                 }
-                if (file_exists($configFile)) {
-                    $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) {
-                            [$settingName, $settingValue] = explode('=', $localeSetting);
-                            $settingName = strtoupper(trim($settingName));
+
+                $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) {
+                        [$settingName, $settingValue] = array_map('trim', explode('=', $localeSetting));
+                        $settingName = strtoupper($settingName);
+                        if ($settingValue !== '') {
                             switch ($settingName) {
                                 case 'ARGUMENTSEPARATOR':
-                                    self::$localeArgumentSeparator = trim($settingValue);
+                                    self::$localeArgumentSeparator = $settingValue;
 
                                     break;
                             }
@@ -2542,30 +3247,28 @@ class Calculation
         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 '{':
-                    $inBraces = true;
+                case $openBrace:
+                    ++$inBracesLevel;
 
                     break;
-                case '}':
-                    $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);
                     }
             }
@@ -2574,59 +3277,83 @@ class Calculation
         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, '"') !== false) {
-                //    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('"', $formula);
-                $i = false;
+            $inFunctionBracesLevel = 0;
+            $inMatrixBracesLevel = 0;
+            //    If there is the possibility of separators within a quoted string, then we treat them as literals
+            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
+                $temp = explode(self::FORMULA_STRING_QUOTE, $formula);
+                $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);
                 //    Then rebuild the formula string
-                $formula = implode('"', $temp);
+                $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;
+    /** @var ?array */
+    private static $functionReplaceFromExcel;
 
-    private static $functionReplaceToLocale = null;
+    /** @var ?array */
+    private static $functionReplaceToLocale;
 
+    /**
+     * @param string $formula
+     *
+     * @return string
+     */
     public function _translateFormulaToLocale($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';
             }
         }
 
@@ -2640,22 +3367,35 @@ class Calculation
             }
         }
 
-        return self::translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$localeArgumentSeparator);
+        return self::translateFormula(
+            self::$functionReplaceFromExcel,
+            self::$functionReplaceToLocale,
+            $formula,
+            ',',
+            self::$localeArgumentSeparator
+        );
     }
 
-    private static $functionReplaceFromLocale = null;
+    /** @var ?array */
+    private static $functionReplaceFromLocale;
 
-    private static $functionReplaceToExcel = null;
+    /** @var ?array */
+    private static $functionReplaceToExcel;
 
+    /**
+     * @param string $formula
+     *
+     * @return string
+     */
     public function _translateFormulaToEnglish($formula)
     {
         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';
             }
         }
 
@@ -2672,6 +3412,11 @@ class Calculation
         return self::translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
     }
 
+    /**
+     * @param string $function
+     *
+     * @return string
+     */
     public static function localeFunc($function)
     {
         if (self::$localeLanguage !== 'en_us') {
@@ -2703,11 +3448,12 @@ class Calculation
                 //    Return Excel errors "as is"
                 return $value;
             }
+
             //    Return strings wrapped in quotes
-            return '"' . $value . '"';
-        //    Convert numeric errors to NaN error
+            return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-            return Functions::NAN();
+            //    Convert numeric errors to NaN error
+            return Information\ExcelError::NAN();
         }
 
         return $value;
@@ -2723,12 +3469,12 @@ class Calculation
     public static function unwrapResult($value)
     {
         if (is_string($value)) {
-            if ((isset($value[0])) && ($value[0] == '"') && (substr($value, -1) == '"')) {
+            if ((isset($value[0])) && ($value[0] == self::FORMULA_STRING_QUOTE) && (substr($value, -1) == self::FORMULA_STRING_QUOTE)) {
                 return substr($value, 1, -1);
             }
             //    Convert numeric errors to NAN error
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-            return Functions::NAN();
+            return Information\ExcelError::NAN();
         }
 
         return $value;
@@ -2738,16 +3484,14 @@ class Calculation
      * Calculate cell value (using formula from a cell ID)
      * Retained for backward compatibility.
      *
-     * @param Cell $pCell Cell to calculate
-     *
-     * @throws Exception
+     * @param Cell $cell Cell to calculate
      *
      * @return mixed
      */
-    public function calculate(Cell $pCell = null)
+    public function calculate(?Cell $cell = null)
     {
         try {
-            return $this->calculateCellValue($pCell);
+            return $this->calculateCellValue($cell);
         } catch (\Exception $e) {
             throw new Exception($e->getMessage());
         }
@@ -2756,16 +3500,14 @@ class Calculation
     /**
      * 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
      *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return mixed
      */
-    public function calculateCellValue(Cell $pCell = null, $resetLog = true)
+    public function calculateCellValue(?Cell $cell = null, $resetLog = true)
     {
-        if ($pCell === null) {
+        if ($cell === null) {
             return null;
         }
 
@@ -2782,26 +3524,47 @@ class Calculation
 
         //    Execute the calculation for the cell formula
         $this->cellStack[] = [
-            'sheet' => $pCell->getWorksheet()->getTitle(),
-            'cell' => $pCell->getCoordinate(),
+            'sheet' => $cell->getWorksheet()->getTitle(),
+            'cell' => $cell->getCoordinate(),
         ];
 
-        try {
-            $result = self::unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
-            $cellAddress = array_pop($this->cellStack);
-            $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
-        } catch (\Exception $e) {
-            $cellAddress = array_pop($this->cellStack);
-            $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
+        $cellAddressAttempted = false;
+        $cellAddress = null;
 
-            throw new Exception($e->getMessage());
+        try {
+            $result = self::unwrapResult($this->_calculateFormulaValue($cell->getValue(), $cell->getCoordinate(), $cell));
+            if ($this->spreadsheet === null) {
+                throw new Exception('null spreadsheet in calculateCellValue');
+            }
+            $cellAddressAttempted = true;
+            $cellAddress = array_pop($this->cellStack);
+            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) {
+            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(), $e->getCode(), $e);
         }
 
         if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
             self::$returnArrayAsType = $returnArrayAsType;
             $testResult = Functions::flattenArray($result);
             if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
-                return Functions::VALUE();
+                return Information\ExcelError::VALUE();
             }
             //    If there's only a single cell in the array, then we allow it
             if (count($testResult) != 1) {
@@ -2809,13 +3572,13 @@ class Calculation
                 $r = array_keys($result);
                 $r = array_shift($r);
                 if (!is_numeric($r)) {
-                    return Functions::VALUE();
+                    return Information\ExcelError::VALUE();
                 }
                 if (is_array($result[$r])) {
                     $c = array_keys($result[$r]);
                     $c = array_shift($c);
                     if (!is_numeric($c)) {
-                        return Functions::VALUE();
+                        return Information\ExcelError::VALUE();
                     }
                 }
             }
@@ -2823,10 +3586,10 @@ class Calculation
         }
         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 Information\ExcelError::NAN();
         }
 
         return $result;
@@ -2853,7 +3616,7 @@ class Calculation
         }
 
         //    Parse the formula and return the token stack
-        return $this->_parseFormula($formula);
+        return $this->internalParseFormula($formula);
     }
 
     /**
@@ -2861,13 +3624,11 @@ class Calculation
      *
      * @param string $formula Formula to parse
      * @param string $cellID Address of the cell to calculate
-     * @param Cell $pCell Cell to calculate
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @param Cell $cell Cell to calculate
      *
      * @return mixed
      */
-    public function calculateFormula($formula, $cellID = null, Cell $pCell = null)
+    public function calculateFormula($formula, $cellID = null, ?Cell $cell = null)
     {
         //    Initialise the logging settings
         $this->formulaError = null;
@@ -2875,9 +3636,9 @@ class Calculation
         $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
@@ -2886,7 +3647,7 @@ class Calculation
 
         //    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());
         }
@@ -2900,18 +3661,15 @@ class Calculation
     }
 
     /**
-     * @param string $cellReference
      * @param mixed $cellValue
-     *
-     * @return bool
      */
-    public function getValueFromCache($cellReference, &$cellValue)
+    public function getValueFromCache(string $cellReference, &$cellValue): bool
     {
+        $this->debugLog->writeDebugLog('Testing cache value for cell %s', $cellReference);
         // Is calculation cacheing enabled?
-        // Is the value present in calculation cache?
-        $this->debugLog->writeDebugLog('Testing cache value for cell ', $cellReference);
+        // 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];
@@ -2926,7 +3684,7 @@ class Calculation
      * @param string $cellReference
      * @param mixed $cellValue
      */
-    public function saveValueToCache($cellReference, $cellValue)
+    public function saveValueToCache($cellReference, $cellValue): void
     {
         if ($this->calculationCacheEnabled) {
             $this->calculationCache[$cellReference] = $cellValue;
@@ -2938,18 +3696,17 @@ class Calculation
      *
      * @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
-     *
-     * @throws Exception
+     * @param Cell $cell Cell to calculate
+     * @param bool $ignoreQuotePrefix If set to true, evaluate the formyla even if the referenced cell is quote prefixed
      *
      * @return mixed
      */
-    public function _calculateFormulaValue($formula, $cellID = null, Cell $pCell = null)
+    public function _calculateFormulaValue($formula, $cellID = null, ?Cell $cell = null, bool $ignoreQuotePrefix = false)
     {
         $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);
         }
 
@@ -2968,13 +3725,14 @@ class Calculation
             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 %s', $wsCellReference);
 
         if (($wsTitle[0] !== "\x00") && ($this->cyclicReferenceStack->onStack($wsCellReference))) {
             if ($this->cyclicFormulaCount <= 0) {
@@ -2996,9 +3754,11 @@ class Calculation
             }
         }
 
+        $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->_parseFormula($formula, $pCell), $cellID, $pCell);
+
+        $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $cell), $cellID, $cell);
         $this->cyclicReferenceStack->pop();
 
         // Save to calculation cache
@@ -3013,8 +3773,8 @@ class Calculation
     /**
      * Ensure that paired matrix operands are both matrices and of the same size.
      *
-     * @param mixed &$operand1 First matrix operand
-     * @param mixed &$operand2 Second matrix operand
+     * @param mixed $operand1 First matrix operand
+     * @param mixed $operand2 Second matrix operand
      * @param int $resize Flag indicating whether the matrices should be resized to match
      *                                        and (if so), whether the smaller dimension should grow or the
      *                                        larger should shrink.
@@ -3058,7 +3818,7 @@ class Calculation
     /**
      * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0.
      *
-     * @param array &$matrix matrix operand
+     * @param array $matrix matrix operand
      *
      * @return int[] An array comprising the number of rows, and number of columns
      */
@@ -3083,14 +3843,14 @@ class Calculation
     /**
      * 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 mixed $matrix1 First matrix operand
+     * @param mixed $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)
+    private static function resizeMatricesShrink(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns): void
     {
         if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
             if ($matrix2Rows < $matrix1Rows) {
@@ -3126,14 +3886,14 @@ class Calculation
     /**
      * 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 mixed $matrix1 First matrix operand
+     * @param mixed $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)
+    private static function resizeMatricesExtend(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns): void
     {
         if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
             if ($matrix2Columns < $matrix1Columns) {
@@ -3198,10 +3958,12 @@ class Calculation
                 }
 
                 return '{ ' . implode($rpad, $returnMatrix) . ' }';
-            } elseif (is_string($value) && (trim($value, '"') == $value)) {
-                return '"' . $value . '"';
+            } elseif (is_string($value) && (trim($value, self::FORMULA_STRING_QUOTE) == $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'];
             }
         }
 
@@ -3244,6 +4006,8 @@ class Calculation
 
             return $typeString . ' with a value of ' . $this->showValue($value);
         }
+
+        return null;
     }
 
     /**
@@ -3253,34 +4017,35 @@ class Calculation
      */
     private function convertMatrixReferences($formula)
     {
-        static $matrixReplaceFrom = ['{', ';', '}'];
+        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, '{') !== false) {
+        if (strpos($formula, self::FORMULA_OPEN_MATRIX_BRACE) !== false) {
             //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-            if (strpos($formula, '"') !== false) {
+            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
-                $temp = explode('"', $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, '{');
-                        $closeCount += substr_count($value, '}');
+                    $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);
                     }
                 }
                 unset($value);
                 //    Then rebuild the formula string
-                $formula = implode('"', $temp);
+                $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, '{');
-                $closeCount = substr_count($formula, '}');
+                $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
@@ -3302,33 +4067,41 @@ class Calculation
         return $formula;
     }
 
-    private static function mkMatrix(...$args)
-    {
-        return $args;
-    }
-
-    //    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
+    /**
+     *    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.
+     *
+     * @var array
+     */
     private static $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
+    /**
+     *    Comparison (Boolean) Operators.
+     *    These operators work on two values, but always return a boolean result.
+     *
+     * @var array
+     */
     private static $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
+    /**
+     *    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.
+     *
+     * @var array
+     */
     private static $operatorPrecedence = [
-        ':' => 8, //    Range
-        '|' => 7, //    Intersect
+        ':' => 9, //    Range
+        '∩' => 8, //    Intersect
+        '∪' => 7, //    Union
         '~' => 6, //    Negation
         '%' => 5, //    Percentage
         '^' => 4, //    Exponentiation
@@ -3342,11 +4115,10 @@ class Calculation
 
     /**
      * @param string $formula
-     * @param null|\PhpOffice\PhpSpreadsheet\Cell\Cell $pCell
      *
-     * @return bool
+     * @return array<int, mixed>|false
      */
-    private function _parseFormula($formula, Cell $pCell = null)
+    private function internalParseFormula($formula, ?Cell $cell = null)
     {
         if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
             return false;
@@ -3354,153 +4126,115 @@ class Calculation
 
         //    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;
+        $pCellParent = ($cell !== null) ? $cell->getWorksheet() : null;
 
-        $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
-                                '|' . self::CALCULATION_REGEXP_CELLREF .
-                                '|' . self::CALCULATION_REGEXP_NUMBER .
-                                '|' . self::CALCULATION_REGEXP_STRING .
-                                '|' . self::CALCULATION_REGEXP_OPENBRACE .
-                                '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
-                                '|' . self::CALCULATION_REGEXP_ERROR .
-                                ')/si';
+        $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
+        //        - 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, ...]
+        //        should be null in a function call
 
         //    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
+
+            // Check for two-character operators (e.g. >=, <=, <>)
             if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula[$index + 1]]))) {
                 $opCharacter .= $formula[++$index];
             }
+            //    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);
 
-            //    Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
-            $isOperandOrFunction = 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]) or $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
-                while ($stack->count() > 0 &&
+            } 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']])) {
+                    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] -= 1;
-                }
+                $this->branchPruner->decrementDepth();
 
-                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $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] -= 1;
-                        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'];
+                        // Scrutinizer says functionCall is unused after this assignment.
+                        // It might be right, but I'm too lazy to confirm.
                         $functionCall = self::$controlFunctions[$functionName]['functionCall'];
+                        self::doNothing($functionCall);
                     } elseif (isset(self::$phpSpreadsheetFunctions[$functionName])) {
                         $expectedArgumentCount = self::$phpSpreadsheetFunctions[$functionName]['argumentCount'];
                         $functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
+                        self::doNothing($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');
                     }
                     //    Check the argument count
                     $argumentCountError = false;
+                    $expectedArgumentCountString = null;
                     if (is_numeric($expectedArgumentCount)) {
                         if ($expectedArgumentCount < 0) {
                             if ($argumentCount > abs($expectedArgumentCount)) {
@@ -3515,7 +4249,8 @@ class Calculation
                         }
                     } elseif ($expectedArgumentCount != '*') {
                         $isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
-                        switch ($argMatch[2]) {
+                        self::doNothing($isOperandOrFunction);
+                        switch ($argMatch[2] ?? '') {
                             case '+':
                                 if ($argumentCount < $argMatch[1]) {
                                     $argumentCountError = true;
@@ -3544,222 +4279,330 @@ class Calculation
                     }
                 }
                 ++$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[] = ['type' => 'Empty Argument', 'value' => self::$excelConstants['NULL'], 'reference' => 'NULL'];
                 }
                 // make sure there was a function
                 $d = $stack->last(2);
-                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $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] += 1;
-                }
-                $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 . '$/i', $val, $matches)) {
-                    $val = preg_replace('/\s/u', '', $val);
+                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $val, $matches)) {
+                    $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);
-                        // 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 a if but we good deeper
-                            if (!empty($pendingStoreKey) && array_key_exists($pendingStoreKey, $parenthesisDepthMap)) {
-                                $parenthesisDepthMap[$pendingStoreKey] += 1;
-                            }
-                        }
-
-                        $stack->push('Function', $valToUpper, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
-                        // tests if the function is closed right after opening
-                        $ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index + $length), $amatch);
-                        if ($ax) {
-                            $stack->push('Operand Count for Function ' . $valToUpper . ')', 0, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
-                            $expectingOperator = true;
-                        } else {
-                            $stack->push('Operand Count for Function ' . $valToUpper . ')', 1, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
-                            $expectingOperator = false;
-                        }
-                        $stack->push('Brace', '(');
-                    } else {    // it's a var w/ implicit multiplication
-                        $output[] = ['type' => 'Value', 'value' => $matches[1], 'reference' => null];
+                    } else {
+                        $valToUpper = 'NAME.ERROR(';
                     }
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
+                    // here $matches[1] will contain values like "IF"
+                    // and $val "IF("
+
+                    $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);
+                        $expectingOperator = true;
+                    } else {
+                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 1);
+                        $expectingOperator = false;
+                    }
+                    $stack->push('Brace', '(');
+                } 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 ($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
-                            $startCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $startCellRef, $startMatches);
-                            if ($startMatches[2] > '') {
-                                $val = $startMatches[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 = Information\ExcelError::REF();
                             }
                         } else {
-                            return $this->raiseFormulaError('3D Range references are not yet supported');
+                            $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) {
+                        $worksheet = $pCellParent->getTitle();
+                        $val = "'{$worksheet}'!{$val}";
                     }
-
-                    $outputItem = $stack->getStackItem('Cell Reference', $val, $val, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                    // unescape any apostrophes or double quotes in worksheet name
+                    $val = str_replace(["''", '""'], ["'", '"'], $val);
+                    $outputItem = $stack->getStackItem('Cell Reference', $val, $val);
 
                     $output[] = $outputItem;
-                } else {    // it's a variable, constant, string, number or boolean
+                } 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;
+                    $expectingOperator = true;
+                } else {
+                    // it's a variable, constant, string, number or boolean
+                    $localeConstant = false;
+                    $stackItemType = 'Value';
+                    $stackItemReference = null;
+
                     //    If the last entry on the stack was a : operator, then we may have a row or column range reference
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
-                        $startRowColRef = $output[count($output) - 1]['value'];
-                        [$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
-                        $rangeSheetRef = $rangeWS1;
-                        if ($rangeWS1 != '') {
-                            $rangeWS1 .= '!';
-                        }
-                        [$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
-                        if ($rangeWS2 != '') {
-                            $rangeWS2 .= '!';
-                        } else {
-                            $rangeWS2 = $rangeWS1;
-                        }
-                        $refSheet = $pCellParent;
-                        if ($pCellParent !== null && $rangeSheetRef !== $pCellParent->getTitle()) {
-                            $refSheet = $pCellParent->getParent()->getSheetByName($rangeSheetRef);
-                        }
-                        if ((is_int($startRowColRef)) && (ctype_digit($val)) &&
-                            ($startRowColRef <= 1048576) && ($val <= 1048576)) {
-                            //    Row range
-                            $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestColumn() : 'XFD'; //    Max 16,384 columns for Excel2007
-                            $output[count($output) - 1]['value'] = $rangeWS1 . 'A' . $startRowColRef;
-                            $val = $rangeWS2 . $endRowColRef . $val;
-                        } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
-                            (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
-                            //    Column range
-                            $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestRow() : 1048576; //    Max 1,048,576 rows for Excel2007
-                            $output[count($output) - 1]['value'] = $rangeWS1 . strtoupper($startRowColRef) . '1';
-                            $val = $rangeWS2 . $val . $endRowColRef;
-                        }
-                    }
+                        $stackItemType = 'Cell Reference';
 
-                    $localeConstant = false;
-                    if ($opCharacter == '"') {
+                        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 (strpos($address, ':') !== false) {
+                                    // 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 === Information\ExcelError::REF()) {
+                            $stackItemReference = $val;
+                        } else {
+                            $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->getParentOrThrow()->getSheetByName($rangeSheetRef);
+                            }
+
+                            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;
+                        }
+                    } elseif ($opCharacter === self::FORMULA_STRING_QUOTE) {
                         //    UnEscape any quotes within the string
-                        $val = self::wrapResult(str_replace('""', '"', self::unwrapResult($val)));
+                        $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);
+                        }
+                        $val = "{$rowRangeReference[2]}{$column}{$rowRangeReference[7]}";
+                        $stackItemReference = $val;
+                    } elseif (
+                        preg_match('/^' . self::CALCULATION_REGEXP_COLUMN_RANGE . '/miu', substr($formula, $index), $columnRangeReference)
+                    ) {
+                        $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);
+                        }
+                        $val = "{$val}{$row}";
+                        $stackItemReference = $val;
+                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', $val, $match)) {
+                        $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 ((strpos((string) $val, '.') !== false) || (stripos((string) $val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
                             $val = (float) $val;
                         } else {
                             $val = (int) $val;
                         }
-                    } elseif (isset(self::$excelConstants[trim(strtoupper($val))])) {
-                        $excelConstant = trim(strtoupper($val));
-                        $val = self::$excelConstants[$excelConstant];
-                    } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
-                        $val = self::$excelConstants[$localeConstant];
                     }
-                    $details = $stack->getStackItem('Value', $val, null, $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[] = ['type' => 'Empty Argument', 'value' => self::$excelConstants['NULL'], 'reference' => '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 occured');
+                return $this->raiseFormulaError('Formula Error: An unexpected error occurred');
             }
             //    Test for end of formula string
             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
-                if (($expectingOperator) && (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
-                    ($output[count($output) - 1]['type'] == 'Cell Reference')) {
-                    while ($stack->count() > 0 &&
+                //        Cell References, Defined Names or Structured References) then we have an INTERSECTION operator
+                $countOutputMinus1 = count($output) - 1;
+                if (
+                    ($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']])) {
+                        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;
@@ -3768,15 +4611,26 @@ class Calculation
         return $output;
     }
 
+    /**
+     * @param array $operandData
+     *
+     * @return mixed
+     */
     private static function dataTestReference(&$operandData)
     {
         $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;
             }
         }
@@ -3784,36 +4638,31 @@ class Calculation
         return $operand;
     }
 
-    // evaluate postfix notation
-
     /**
      * @param mixed $tokens
      * @param null|string $cellID
-     * @param null|Cell $pCell
      *
-     * @return bool
+     * @return array<int, mixed>|false
      */
-    private function processTokenStack($tokens, $cellID = null, Cell $pCell = null)
+    private function processTokenStack($tokens, $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;
+        $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) {
             $token = $tokenData['value'];
-
             // Branch pruning: skip useless resolutions
             $storeKey = $tokenData['storeKey'] ?? null;
             if ($this->branchPruningEnabled && isset($tokenData['onlyIf'])) {
@@ -3823,15 +4672,12 @@ class Calculation
                     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')
-                    )
+                if (
+                    (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])) {
@@ -3858,13 +4704,12 @@ class Calculation
                     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'))
+
+                if (
+                    (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])) {
@@ -3884,8 +4729,34 @@ class Calculation
                 }
             }
 
-            // 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 (strpos($cellRange, ':') !== false) {
+                        $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', Information\ExcelError::REF(), null);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as error value %s', $token->value(), Information\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) {
                     return $this->raiseFormulaError('Internal error - Operand value missing from stack');
@@ -3899,32 +4770,40 @@ class Calculation
 
                 //    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 (strpos($operand1Data['reference'] ?? '', '!') !== false) {
                             [$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true);
                         } else {
-                            $sheet1 = ($pCellParent !== null) ? $pCellWorksheet->getTitle() : '';
+                            $sheet1 = ($pCellWorksheet !== null) ? $pCellWorksheet->getTitle() : '';
                         }
 
                         [$sheet2, $operand2Data['reference']] = Worksheet::extractSheetTitle($operand2Data['reference'], true);
@@ -3932,75 +4811,69 @@ class Calculation
                             $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']));
                             $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 $e) {
+                                    $stack->push('Error', Information\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', Information\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;
                         }
@@ -4010,30 +4883,39 @@ class Calculation
                         //    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))) {
-                            //    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!';
+                        $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
+                            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 2);
+
+                            for ($row = 0; $row < $rows; ++$row) {
+                                for ($column = 0; $column < $columns; ++$column) {
+                                    $operand1[$row][$column] =
+                                        Shared\StringHelper::substring(
+                                            self::boolToString($operand1[$row][$column])
+                                            . self::boolToString($operand2[$row][$column]),
+                                            0,
+                                            DataType::MAX_STRING_LENGTH
+                                        );
+                                }
+                            }
+                            $result = $operand1;
                         } else {
-                            $result = '"' . str_replace('""', '"', self::unwrapResult($operand1) . self::unwrapResult($operand2)) . '"';
+                            // 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.
+                            $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)) {
@@ -4041,7 +4923,7 @@ class Calculation
                         }
 
                         break;
-                    case '|':            //    Intersect
+                    case '∩':            //    Intersect
                         $rowIntersect = array_intersect_key($operand1, $operand2);
                         $cellIntersect = $oCol = $oRow = [];
                         foreach (array_keys($rowIntersect) as $row) {
@@ -4051,51 +4933,60 @@ class Calculation
                                 $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
                             }
                         }
-                        $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
-                        $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
-                        $stack->push('Value', $cellIntersect, $cellRef);
+                        if (count(Functions::flattenArray($cellIntersect)) === 0) {
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
+                            $stack->push('Error', Information\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 %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)) {
+            } 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 = Information\ExcelError::REF();
                     } else {
                         $cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
                         if ($matches[2] > '') {
@@ -4105,27 +4996,27 @@ class Calculation
                                 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 = Information\ExcelError::REF();
                     } else {
                         $cellRef = $matches[6] . $matches[7];
                         if ($matches[2] > '') {
@@ -4134,49 +5025,53 @@ class Calculation
                                 //    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 {
-                                    $cellValue = null;
+                                    $cellRef = ($cellSheet !== null) ? "'{$matches[2]}'!{$cellRef}" : $cellRef;
+                                    $cellValue = ($cellSheet !== null) ? null : Information\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));
                         }
                     }
                 }
-                $stack->push('Value', $cellValue, $cellRef);
+
+                $stack->push('Cell Value', $cellValue, $cellRef);
                 if (isset($storeKey)) {
                     $branchStore[$storeKey] = $cellValue;
                 }
-
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token ?? '', $matches)) {
                 // 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 . '$/i', $token, $matches)) {
-                if ($pCellParent) {
-                    $pCell->attach($pCellParent);
+                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;
+                    $passCellReference = false;
+                    $functionCall = null;
                     if (isset(self::$phpSpreadsheetFunctions[$functionName])) {
                         $functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
                         $passByReference = isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference']);
@@ -4186,28 +5081,33 @@ class Calculation
                         $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) &&
+                        if (
+                            ($passByReference) &&
                             (isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])) &&
-                            (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])) {
+                            (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])
+                        ) {
                             if ($arg['reference'] === null) {
                                 $args[] = $cellID;
-                                if ($functionName != 'MKMATRIX') {
+                                if ($functionName !== 'MKMATRIX') {
                                     $argArrayVals[] = $this->showValue($cellID);
                                 }
                             } else {
                                 $args[] = $arg['reference'];
-                                if ($functionName != 'MKMATRIX') {
+                                if ($functionName !== 'MKMATRIX') {
                                     $argArrayVals[] = $this->showValue($arg['reference']);
                                 }
                             }
                         } else {
+                            $emptyArguments[] = ($arg['type'] === 'Empty Argument');
                             $args[] = self::unwrapResult($arg['value']);
-                            if ($functionName != 'MKMATRIX') {
+                            if ($functionName !== 'MKMATRIX') {
                                 $argArrayVals[] = $this->showValue($arg['value']);
                             }
                         }
@@ -4215,21 +5115,26 @@ class Calculation
 
                     //    Reverse the order of the arguments
                     krsort($args);
+                    krsort($emptyArguments);
+
+                    if ($argCount > 0) {
+                        $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);
+                    $args = $this->addCellReference($args, $passCellReference, $functionCall, $cell);
 
                     if (!is_array($functionCall)) {
                         foreach ($args as &$arg) {
@@ -4240,8 +5145,8 @@ class Calculation
 
                     $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)) {
@@ -4250,32 +5155,37 @@ class Calculation
                 }
             } else {
                 // if the token is a number, boolean, string or an Excel error, push it onto the stack
-                if (isset(self::$excelConstants[strtoupper($token)])) {
+                if (isset(self::$excelConstants[strtoupper($token ?? '')])) {
                     $excelConstant = strtoupper($token);
                     $stack->push('Constant Value', self::$excelConstants[$excelConstant]);
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = self::$excelConstants[$excelConstant];
                     }
-                    $this->debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->showTypeDetails(self::$excelConstants[$excelConstant]));
-                } elseif ((is_numeric($token)) || ($token === null) || (is_bool($token)) || ($token == '') || ($token[0] == '"') || ($token[0] == '#')) {
-                    $stack->push('Value', $token);
+                    $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($tokenData['type'], $token, $tokenData['reference']);
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $token;
                     }
-                    // if the token is a named range, push the named range name onto the stack
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $token, $matches)) {
-                    $namedRange = $matches[6];
-                    $this->debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
+                } 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 ($cell === null || $pCellWorksheet === null) {
+                        return $this->raiseFormulaError("undefined name '$token'");
+                    }
 
-                    $cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellWorksheet : null), false);
-                    $pCell->attach($pCellParent);
-                    $this->debugLog->writeDebugLog('Evaluation Result for named range ', $namedRange, ' is ', $this->showTypeDetails($cellValue));
-                    $stack->push('Named Range', $cellValue, $namedRange);
+                    $this->debugLog->writeDebugLog('Evaluating Defined Name %s', $definedName);
+                    $namedRange = DefinedName::resolveName($definedName, $pCellWorksheet);
+                    if ($namedRange === null) {
+                        return $this->raiseFormulaError("undefined name '$definedName'");
+                    }
+
+                    $result = $this->evaluateDefinedName($cell, $namedRange, $pCellWorksheet, $stack);
                     if (isset($storeKey)) {
-                        $branchStore[$storeKey] = $cellValue;
+                        $branchStore[$storeKey] = $result;
                     }
                 } else {
-                    return $this->raiseFormulaError("undefined variable '$token'");
+                    return $this->raiseFormulaError("undefined name '$token'");
                 }
             }
         }
@@ -4289,6 +5199,12 @@ class Calculation
         return $output;
     }
 
+    /**
+     * @param mixed $operand
+     * @param mixed $stack
+     *
+     * @return bool
+     */
     private function validateBinaryOperand(&$operand, &$stack)
     {
         if (is_array($operand)) {
@@ -4302,7 +5218,7 @@ class Calculation
         if (is_string($operand)) {
             //    We only need special validations for the operand if it is a string
             //    Start by stripping off the quotation marks we use to identify true excel string values internally
-            if ($operand > '' && $operand[0] == '"') {
+            if ($operand > '' && $operand[0] == self::FORMULA_STRING_QUOTE) {
                 $operand = self::unwrapResult($operand);
             }
             //    If the string is a numeric value, we treat it as a numeric, so no further testing
@@ -4310,274 +5226,242 @@ class Calculation
                 //    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
-                    $stack->push('Value', '#VALUE!');
-                    $this->debugLog->writeDebugLog('Evaluation Result is a ', $this->showTypeDetails('#VALUE!'));
+                } 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 %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
-     * @param Stack $stack
+     *
+     * @return array
+     */
+    private function executeArrayComparison($operand1, $operand2, $operation, Stack &$stack, bool $recursingArrays)
+    {
+        $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 %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 %s %s %s', $this->showValue($operand1), $operation, $this->showValue($operandData));
+                $this->executeBinaryComparisonOperation($operand1, $operandData, $operation, $stack);
+                $r = $stack->pop();
+                $result[$x] = $r['value'];
+            }
+        } else {
+            // Operand 1 and Operand 2 are both arrays
+            if (!$recursingArrays) {
+                self::checkMatrixOperands($operand1, $operand2, 2);
+            }
+            foreach ($operand1 as $x => $operandData) {
+                $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 %s', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Array', $result);
+
+        return $result;
+    }
+
+    /**
+     * @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($operand1, $operand2, $operation, Stack &$stack, $recursingArrays = false)
     {
         //    If we're dealing with matrix operations, we want a matrix result
         if ((is_array($operand1)) || (is_array($operand2))) {
-            $result = [];
-            if ((is_array($operand1)) && (!is_array($operand2))) {
-                foreach ($operand1 as $x => $operandData) {
-                    $this->debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operandData), ' ', $operation, ' ', $this->showValue($operand2));
-                    $this->executeBinaryComparisonOperation($cellID, $operandData, $operand2, $operation, $stack);
-                    $r = $stack->pop();
-                    $result[$x] = $r['value'];
-                }
-            } elseif ((!is_array($operand1)) && (is_array($operand2))) {
-                foreach ($operand2 as $x => $operandData) {
-                    $this->debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operand1), ' ', $operation, ' ', $this->showValue($operandData));
-                    $this->executeBinaryComparisonOperation($cellID, $operand1, $operandData, $operation, $stack);
-                    $r = $stack->pop();
-                    $result[$x] = $r['value'];
-                }
-            } else {
-                if (!$recursingArrays) {
-                    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);
-                    $r = $stack->pop();
-                    $result[$x] = $r['value'];
-                }
-            }
-            //    Log the result details
-            $this->debugLog->writeDebugLog('Comparison Evaluation Result is ', $this->showTypeDetails($result));
-            //    And push the result onto the stack
-            $stack->push('Array', $result);
-
-            return $result;
+            return $this->executeArrayComparison($operand1, $operand2, $operation, $stack, $recursingArrays);
         }
 
-        //    Simple validate the two operands if they are string values
-        if (is_string($operand1) && $operand1 > '' && $operand1[0] == '"') {
-            $operand1 = self::unwrapResult($operand1);
-        }
-        if (is_string($operand2) && $operand2 > '' && $operand2[0] == '"') {
-            $operand2 = self::unwrapResult($operand2);
-        }
-
-        // Use case insensitive comparaison if not OpenOffice mode
-        if (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) {
-            if (is_string($operand1)) {
-                $operand1 = strtoupper($operand1);
-            }
-            if (is_string($operand2)) {
-                $operand2 = 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 = strcmp($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 = strcmp($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 = strcmp($operand1, $operand2) <= 0;
-                }
-
-                break;
-            //    Inequality
-            case '<>':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = (abs($operand1 - $operand2) > 1E-14);
-                } else {
-                    $result = strcmp($operand1, $operand2) != 0;
-                }
-
-                break;
-        }
+        $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 string $str1 First string value for the comparison
-     * @param 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);
-    }
-
     /**
      * @param mixed $operand1
      * @param mixed $operand2
-     * @param mixed $operation
-     * @param string $matrixFunction
-     * @param mixed $stack
+     * @param string $operation
+     * @param Stack $stack
      *
      * @return bool|mixed
      */
-    private function executeNumericBinaryOperation($operand1, $operand2, $operation, $matrixFunction, &$stack)
+    private function executeNumericBinaryOperation($operand1, $operand2, $operation, &$stack)
     {
         //    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!';
-            }
-        } 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;
-
-                        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('Value', '#DIV/0!');
-                            $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails('#DIV/0!'));
-
-                            return false;
-                        }
-                            $result = $operand1 / $operand2;
-
-                        break;
-                    //    Power
-                    case '^':
-                        $result = pow($operand1, $operand2);
-
-                        break;
+        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 = Information\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);
                 }
             }
+            if (is_array($operand2)) {
+                foreach ($operand2 as $key => $value) {
+                    $operand2[$key] = Functions::flattenArray($value);
+                }
+            }
+            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 2);
+
+            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]);
+
+                        continue;
+                    }
+                    if ($operand2[$row][$column] === null) {
+                        $operand2[$row][$column] = 0;
+                    } elseif (!self::isNumericOrBool($operand2[$row][$column])) {
+                        $operand1[$row][$column] = self::makeError($operand2[$row][$column]);
+
+                        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] = Information\ExcelError::DIV0();
+                            } else {
+                                $operand1[$row][$column] /= $operand2[$row][$column];
+                            }
+
+                            break;
+                        case '^':
+                            $operand1[$row][$column] = $operand1[$row][$column] ** $operand2[$row][$column];
+
+                            break;
+
+                        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', Information\ExcelError::DIV0());
+                        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails(Information\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)
     {
         $this->formulaError = $errorMessage;
         $this->cyclicReferenceStack->clear();
-        if (!$this->suppressFormulaErrors) {
-            throw new Exception($errorMessage);
+        $suppress = /** @scrutinizer ignore-deprecated */ $this->suppressFormulaErrors ?? $this->suppressFormulaErrorsNew;
+        if (!$suppress) {
+            throw new Exception($errorMessage, $code, $exception);
         }
-        trigger_error($errorMessage, E_USER_ERROR);
 
         return false;
     }
@@ -4585,46 +5469,45 @@ class Calculation
     /**
      * 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.
      */
-    public function extractCellRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true)
+    public function extractCellRange(&$range = 'A1', ?Worksheet $worksheet = null, $resetLog = true)
     {
         // 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) {
+            $worksheetName = $worksheet->getTitle();
+
+            if (strpos($range, '!') !== false) {
+                [$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])) {
+                    $returnValue[$currentRow][$currentCol] = $worksheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
                 } 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)) {
+                        $returnValue[$currentRow][$currentCol] = $worksheet->getCell($reference)->getCalculatedValue($resetLog);
                     } else {
                         $returnValue[$currentRow][$currentCol] = null;
                     }
@@ -4638,47 +5521,46 @@ class Calculation
     /**
      * 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.
      */
-    public function extractNamedRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true)
+    public function extractNamedRange(string &$range = 'A1', ?Worksheet $worksheet = null, $resetLog = true)
     {
         // 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 (strpos($range, '!') !== false) {
+                [$worksheetName, $range] = Worksheet::extractSheetTitle($range, true);
+                $worksheet = ($this->spreadsheet === null) ? null : $this->spreadsheet->getSheetByName($worksheetName);
             }
 
             // Named range?
-            $namedRange = NamedRange::resolveRange($pRange, $pSheet);
-            if ($namedRange !== null) {
-                $pSheet = $namedRange->getWorksheet();
-                $pRange = $namedRange->getRange();
-                $splitRange = Coordinate::splitRange($pRange);
-                //    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];
-                }
-            } else {
-                return Functions::REF();
+            $namedRange = ($worksheet === null) ? null : DefinedName::resolveName($range, $worksheet);
+            if ($namedRange === null) {
+                return Information\ExcelError::REF();
+            }
+
+            $worksheet = $namedRange->getWorksheet();
+            $range = $namedRange->getValue();
+            $splitRange = Coordinate::splitRange($range);
+            //    Convert row and column references
+            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;
                 }
@@ -4687,8 +5569,8 @@ class Calculation
                 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;
                     }
@@ -4702,24 +5584,22 @@ class Calculation
     /**
      * Is a specific function implemented?
      *
-     * @param string $pFunction Function Name
+     * @param string $function Function Name
      *
      * @return bool
      */
-    public function isImplemented($pFunction)
+    public function isImplemented($function)
     {
-        $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;
     }
 
     /**
      * Get a list of all implemented functions as an array of function objects.
-     *
-     * @return array of Category
      */
-    public function getFunctions()
+    public static function getFunctions(): array
     {
         return self::$phpSpreadsheetFunctions;
     }
@@ -4741,55 +5621,179 @@ class Calculation
         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;
+    }
+
+    /**
+     * @return null|mixed
+     */
+    private function getArgumentDefaultValue(ReflectionParameter $methodArgument)
+    {
+        $defaultValue = null;
+
+        if ($methodArgument->isDefaultValueAvailable()) {
+            $defaultValue = $methodArgument->getDefaultValue();
+            if ($methodArgument->isDefaultValueConstant()) {
+                $constantName = $methodArgument->getDefaultValueConstantName() ?? '';
+                // read constant value
+                if (strpos($constantName, '::') !== false) {
+                    [$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 array $args
      * @param bool $passCellReference
      * @param array|string $functionCall
-     * @param null|Cell $pCell
      *
      * @return array
      */
-    private function addCellReference(array $args, $passCellReference, $functionCall, Cell $pCell = null)
+    private function addCellReference(array $args, $passCellReference, $functionCall, ?Cell $cell = null)
     {
         if ($passCellReference) {
             if (is_array($functionCall)) {
                 $className = $functionCall[0];
                 $methodName = $functionCall[1];
 
-                $reflectionMethod = new \ReflectionMethod($className, $methodName);
+                $reflectionMethod = new ReflectionMethod($className, $methodName);
                 $argumentCount = count($reflectionMethod->getParameters());
                 while (count($args) < $argumentCount - 1) {
                     $args[] = null;
                 }
             }
 
-            $args[] = $pCell;
+            $args[] = $cell;
         }
 
         return $args;
     }
 
-    private function getUnusedBranchStoreKey()
+    /**
+     * @return mixed|string
+     */
+    private function evaluateDefinedName(Cell $cell, DefinedName $namedRange, Worksheet $cellWorksheet, Stack $stack)
     {
-        $storeKeyValue = 'storeKey-' . $this->branchStoreKeyCounter;
-        ++$this->branchStoreKeyCounter;
+        $definedNameScope = $namedRange->getScope();
+        if ($definedNameScope !== null && $definedNameScope !== $cellWorksheet) {
+            // The defined name isn't in our current scope, so #REF
+            $result = Information\ExcelError::REF();
+            $stack->push('Error', $result, $namedRange->getName());
 
-        return $storeKeyValue;
+            return $result;
+        }
+
+        $definedNameValue = $namedRange->getValue();
+        $definedNameType = $namedRange->isFormula() ? 'Formula' : 'Range';
+        $definedNameWorksheet = $namedRange->getWorksheet();
+
+        if ($definedNameValue[0] !== '=') {
+            $definedNameValue = '=' . $definedNameValue;
+        }
+
+        $this->debugLog->writeDebugLog('Defined Name is a %s with a value of %s', $definedNameType, $definedNameValue);
+
+        $recursiveCalculationCell = ($definedNameWorksheet !== null && $definedNameWorksheet !== $cellWorksheet)
+            ? $definedNameWorksheet->getCell('A1')
+            : $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($cell->getColumn()) - 1,
+            $cell->getRow() - 1
+        );
+
+        $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, true);
+
+        if ($this->getDebugLog()->getWriteDebugLog()) {
+            $this->debugLog->mergeDebugLog(array_slice($recursiveCalculator->getDebugLog()->getLog(), 3));
+            $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;
     }
 
-    private function getTokensAsString($tokens)
+    public function setSuppressFormulaErrors(bool $suppressFormulaErrors): void
     {
-        $tokensStr = array_map(function ($token) {
-            $value = $token['value'] ?? 'no value';
-            while (is_array($value)) {
-                $value = array_pop($value);
-            }
+        $this->suppressFormulaErrorsNew = $suppressFormulaErrors;
+    }
 
-            return $value;
-        }, $tokens);
+    public function getSuppressFormulaErrors(): bool
+    {
+        return $this->suppressFormulaErrorsNew;
+    }
 
-        return '[ ' . implode(' | ', $tokensStr) . ' ]';
+    /** @param mixed $arg */
+    private static function doNothing($arg): bool
+    {
+        return (bool) $arg;
+    }
+
+    /**
+     * @param mixed $operand1
+     *
+     * @return mixed
+     */
+    private static function boolToString($operand1)
+    {
+        if (is_bool($operand1)) {
+            $operand1 = ($operand1) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+        } elseif ($operand1 === null) {
+            $operand1 = '';
+        }
+
+        return $operand1;
+    }
+
+    /** @param mixed $operand */
+    private static function isNumericOrBool($operand): bool
+    {
+        return is_numeric($operand) || is_bool($operand);
+    }
+
+    /** @param mixed $operand */
+    private static function makeError($operand = ''): string
+    {
+        return Information\ErrorValue::isError($operand) ? $operand : Information\ExcelError::VALUE();
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
index 7574cb476..b661fafec 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
@@ -16,4 +16,6 @@ abstract class Category
     const CATEGORY_MATH_AND_TRIG = 'Math and Trig';
     const CATEGORY_STATISTICAL = 'Statistical';
     const CATEGORY_TEXT_AND_DATA = 'Text and Data';
+    const CATEGORY_WEB = 'Web';
+    const CATEGORY_UNCATEGORISED = 'Uncategorised';
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php
index d31b00dd7..017c57106 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php
@@ -2,126 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
+/**
+ * @deprecated 1.17.0
+ *
+ * @codeCoverageIgnore
+ */
 class Database
 {
-    /**
-     * fieldExtract.
-     *
-     * Extracts the column ID to use for the data field.
-     *
-     * @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 mixed $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.
-     *
-     * @return null|string
-     */
-    private static function fieldExtract($database, $field)
-    {
-        $field = strtoupper(Functions::flattenSingleValue($field));
-        $fieldNames = array_map('strtoupper', array_shift($database));
-
-        if (is_numeric($field)) {
-            $keys = array_keys($fieldNames);
-
-            return $keys[$field - 1];
-        }
-        $key = array_search($field, $fieldNames);
-
-        return ($key) ? $key : null;
-    }
-
-    /**
-     * filter.
-     *
-     * Parses the selection criteria, extracts the database rows that match those criteria, and
-     * returns that subset of rows.
-     *
-     * @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 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 array of mixed
-     */
-    private static function filter($database, $criteria)
-    {
-        $fieldNames = array_shift($database);
-        $criteriaNames = array_shift($criteria);
-
-        //    Convert the criteria into a set of AND/OR conditions with [:placeholders]
-        $testConditions = $testValues = [];
-        $testConditionsCount = 0;
-        foreach ($criteriaNames as $key => $criteriaName) {
-            $testCondition = [];
-            $testConditionCount = 0;
-            foreach ($criteria as $row => $criterion) {
-                if ($criterion[$key] > '') {
-                    $testCondition[] = '[:' . $criteriaName . ']' . Functions::ifCondition($criterion[$key]);
-                    ++$testConditionCount;
-                }
-            }
-            if ($testConditionCount > 1) {
-                $testConditions[] = 'OR(' . implode(',', $testCondition) . ')';
-                ++$testConditionsCount;
-            } elseif ($testConditionCount == 1) {
-                $testConditions[] = $testCondition[0];
-                ++$testConditionsCount;
-            }
-        }
-
-        if ($testConditionsCount > 1) {
-            $testConditionSet = 'AND(' . implode(',', $testConditions) . ')';
-        } elseif ($testConditionsCount == 1) {
-            $testConditionSet = $testConditions[0];
-        }
-
-        //    Loop through each row of the database
-        foreach ($database as $dataRow => $dataValues) {
-            //    Substitute actual values from the database row for our [:placeholders]
-            $testConditionList = $testConditionSet;
-            foreach ($criteriaNames as $key => $criteriaName) {
-                $k = array_search($criteriaName, $fieldNames);
-                if (isset($dataValues[$k])) {
-                    $dataValue = $dataValues[$k];
-                    $dataValue = (is_string($dataValue)) ? Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
-                    $testConditionList = str_replace('[:' . $criteriaName . ']', $dataValue, $testConditionList);
-                }
-            }
-            //    evaluate the criteria against the row data
-            $result = Calculation::getInstance()->_calculateFormulaValue('=' . $testConditionList);
-            //    If the row failed to meet the criteria, remove it from the database
-            if (!$result) {
-                unset($database[$dataRow]);
-            }
-        }
-
-        return $database;
-    }
-
-    private static function getFilteredColumn($database, $field, $criteria)
-    {
-        //    reduce the database to a set of rows that match all the criteria
-        $database = self::filter($database, $criteria);
-        //    extract an array of values for the requested column
-        $colData = [];
-        foreach ($database as $row) {
-            $colData[] = $row[$field];
-        }
-
-        return $colData;
-    }
-
     /**
      * DAVERAGE.
      *
@@ -130,7 +17,9 @@ class Database
      * Excel Function:
      *        DAVERAGE(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DAverage class instead
+     * @see Database\DAverage::evaluate()
      *
      * @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
@@ -151,15 +40,7 @@ class Database
      */
     public static function DAVERAGE($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::AVERAGE(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DAverage::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -171,16 +52,15 @@ class Database
      * Excel Function:
      *        DCOUNT(database,[field],criteria)
      *
-     * Excel Function:
-     *        DAVERAGE(database,field,criteria)
-     *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DCount class instead
+     * @see Database\DCount::evaluate()
      *
      * @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
+     * @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
@@ -191,22 +71,14 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return int
+     * @return int|string
      *
      * @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)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::COUNT(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DCount::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -217,7 +89,9 @@ class Database
      * Excel Function:
      *        DCOUNTA(database,[field],criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DCountA class instead
+     * @see Database\DCountA::evaluate()
      *
      * @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
@@ -234,30 +108,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return int
-     *
-     * @TODO    The field argument is optional. If field is omitted, DCOUNTA counts all records in the
-     *            database that match the criteria.
+     * @return int|string
      */
     public static function DCOUNTA($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        //    reduce the database to a set of rows that match all the criteria
-        $database = self::filter($database, $criteria);
-        //    extract an array of values for the requested column
-        $colData = [];
-        foreach ($database as $row) {
-            $colData[] = $row[$field];
-        }
-
-        // Return
-        return Statistical::COUNTA(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DCountA::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -269,7 +124,9 @@ class Database
      * Excel Function:
      *        DGET(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DGet class instead
+     * @see Database\DGet::evaluate()
      *
      * @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
@@ -290,18 +147,7 @@ class Database
      */
     public static function DGET($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        $colData = self::getFilteredColumn($database, $field, $criteria);
-        if (count($colData) > 1) {
-            return Functions::NAN();
-        }
-
-        return $colData[0];
+        return Database\DGet::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -313,7 +159,9 @@ class Database
      * Excel Function:
      *        DMAX(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DMax class instead
+     * @see Database\DMax::evaluate()
      *
      * @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
@@ -330,19 +178,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return null|float|string
      */
     public static function DMAX($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::MAX(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DMax::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -354,7 +194,9 @@ class Database
      * Excel Function:
      *        DMIN(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DMin class instead
+     * @see Database\DMin::evaluate()
      *
      * @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
@@ -371,19 +213,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return null|float|string
      */
     public static function DMIN($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::MIN(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DMin::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -394,7 +228,9 @@ class Database
      * Excel Function:
      *        DPRODUCT(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DProduct class instead
+     * @see Database\DProduct::evaluate()
      *
      * @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
@@ -411,19 +247,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return float|string
      */
     public static function DPRODUCT($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return MathTrig::PRODUCT(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DProduct::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -435,7 +263,9 @@ class Database
      * Excel Function:
      *        DSTDEV(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DStDev class instead
+     * @see Database\DStDev::evaluate()
      *
      * @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
@@ -456,15 +286,7 @@ class Database
      */
     public static function DSTDEV($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::STDEV(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DStDev::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -476,7 +298,9 @@ class Database
      * Excel Function:
      *        DSTDEVP(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DStDevP class instead
+     * @see Database\DStDevP::evaluate()
      *
      * @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
@@ -497,15 +321,7 @@ class Database
      */
     public static function DSTDEVP($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::STDEVP(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DStDevP::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -516,7 +332,9 @@ class Database
      * Excel Function:
      *        DSUM(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DSum class instead
+     * @see Database\DSum::evaluate()
      *
      * @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
@@ -533,19 +351,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return null|float|string
      */
     public static function DSUM($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return MathTrig::SUM(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DSum::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -557,7 +367,9 @@ class Database
      * Excel Function:
      *        DVAR(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DVar class instead
+     * @see Database\DVar::evaluate()
      *
      * @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
@@ -574,19 +386,11 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function DVAR($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::VARFunc(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DVar::evaluate($database, $field, $criteria);
     }
 
     /**
@@ -598,7 +402,9 @@ class Database
      * Excel Function:
      *        DVARP(database,field,criteria)
      *
-     * @category Database Functions
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the Database\DVarP class instead
+     * @see Database\DVarP::evaluate()
      *
      * @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
@@ -615,18 +421,10 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function DVARP($database, $field, $criteria)
     {
-        $field = self::fieldExtract($database, $field);
-        if ($field === null) {
-            return null;
-        }
-
-        // Return
-        return Statistical::VARP(
-            self::getFilteredColumn($database, $field, $criteria)
-        );
+        return Database\DVarP::evaluate($database, $field, $criteria);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
new file mode 100644
index 000000000..245e970d6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
+
+class DAverage extends DatabaseAbstract
+{
+    /**
+     * DAVERAGE.
+     *
+     * Averages the values in a column of a list or database that match conditions you specify.
+     *
+     * Excel Function:
+     *        DAVERAGE(database,field,criteria)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Averages::average(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
new file mode 100644
index 000000000..66e1987e1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
+
+class DCount extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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|string
+     */
+    public static function evaluate($database, $field, $criteria, bool $returnError = true)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($returnError && $field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Counts::COUNT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
new file mode 100644
index 000000000..214c20b7b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
+
+class DCountA extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 int|string
+     */
+    public static function evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Counts::COUNTA(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
new file mode 100644
index 000000000..5647cba5c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class DGet extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        $columnData = self::getFilteredColumn($database, $field, $criteria);
+        if (count($columnData) > 1) {
+            return ExcelError::NAN();
+        }
+
+        $row = array_pop($columnData);
+
+        return array_pop($row);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
new file mode 100644
index 000000000..748fd2fc8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Maximum;
+
+class DMax extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria, bool $returnError = true)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnError ? ExcelError::VALUE() : null;
+        }
+
+        return Maximum::max(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
new file mode 100644
index 000000000..544cbffef
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
+
+class DMin extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria, bool $returnError = true)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnError ? ExcelError::VALUE() : null;
+        }
+
+        return Minimum::min(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
new file mode 100644
index 000000000..351ee6fc2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class DProduct extends DatabaseAbstract
+{
+    /**
+     * DPRODUCT.
+     *
+     * Multiplies the values in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DPRODUCT(database,field,criteria)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return MathTrig\Operations::product(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
new file mode 100644
index 000000000..a1c56532f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
+
+class DStDev extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return StandardDeviations::STDEV(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
new file mode 100644
index 000000000..5bca4e723
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
+
+class DStDevP extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return StandardDeviations::STDEVP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
new file mode 100644
index 000000000..ef4d10e80
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class DSum extends DatabaseAbstract
+{
+    /**
+     * DSUM.
+     *
+     * Adds the numbers in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSUM(database,field,criteria)
+     *
+     * @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 evaluate($database, $field, $criteria, bool $returnNull = false)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnNull ? null : ExcelError::VALUE();
+        }
+
+        return MathTrig\Sum::sumIgnoringStrings(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
new file mode 100644
index 000000000..9cfa97148
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
+
+class DVar extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Variances::VAR(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
new file mode 100644
index 000000000..67dbd6841
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
+
+class DVarP extends DatabaseAbstract
+{
+    /**
+     * 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)
+     *
+     * @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 evaluate($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Variances::VARP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
new file mode 100644
index 000000000..0b8c36dab
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+
+abstract class DatabaseAbstract
+{
+    /**
+     * @param array $database
+     * @param int|string $field
+     * @param array $criteria
+     *
+     * @return null|float|int|string
+     */
+    abstract public static function evaluate($database, $field, $criteria);
+
+    /**
+     * fieldExtract.
+     *
+     * Extracts the column ID to use for the data field.
+     *
+     * @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 mixed $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.
+     */
+    protected static function fieldExtract(array $database, $field): ?int
+    {
+        $field = strtoupper(Functions::flattenSingleValue($field) ?? '');
+        if ($field === '') {
+            return null;
+        }
+
+        $fieldNames = array_map('strtoupper', array_shift($database));
+        if (is_numeric($field)) {
+            $field = (int) $field - 1;
+            if ($field < 0 || $field >= count($fieldNames)) {
+                return null;
+            }
+
+            return $field;
+        }
+        $key = array_search($field, array_values($fieldNames), true);
+
+        return ($key !== false) ? (int) $key : null;
+    }
+
+    /**
+     * filter.
+     *
+     * Parses the selection criteria, extracts the database rows that match those criteria, and
+     * returns that subset of rows.
+     *
+     * @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 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[]
+     */
+    protected static function filter(array $database, array $criteria): array
+    {
+        $fieldNames = array_shift($database);
+        $criteriaNames = array_shift($criteria);
+
+        //    Convert the criteria into a set of AND/OR conditions with [:placeholders]
+        $query = self::buildQuery($criteriaNames, $criteria);
+
+        //    Loop through each row of the database
+        return self::executeQuery($database, $query, $criteriaNames, $fieldNames);
+    }
+
+    protected static function getFilteredColumn(array $database, ?int $field, array $criteria): array
+    {
+        //    reduce the database to a set of rows that match all the criteria
+        $database = self::filter($database, $criteria);
+        $defaultReturnColumnValue = ($field === null) ? 1 : null;
+
+        //    extract an array of values for the requested column
+        $columnData = [];
+        foreach ($database as $rowKey => $row) {
+            $keys = array_keys($row);
+            $key = $keys[$field] ?? null;
+            $columnKey = $key ?? 'A';
+            $columnData[$rowKey][$columnKey] = $row[$key] ?? $defaultReturnColumnValue;
+        }
+
+        return $columnData;
+    }
+
+    private static function buildQuery(array $criteriaNames, array $criteria): string
+    {
+        $baseQuery = [];
+        foreach ($criteria as $key => $criterion) {
+            foreach ($criterion as $field => $value) {
+                $criterionName = $criteriaNames[$field];
+                if ($value !== null) {
+                    $condition = self::buildCondition($value, $criterionName);
+                    $baseQuery[$key][] = $condition;
+                }
+            }
+        }
+
+        $rowQuery = array_map(
+            function ($rowValue) {
+                return (count($rowValue) > 1) ? 'AND(' . implode(',', $rowValue) . ')' : ($rowValue[0] ?? '');
+            },
+            $baseQuery
+        );
+
+        return (count($rowQuery) > 1) ? 'OR(' . implode(',', $rowQuery) . ')' : ($rowQuery[0] ?? '');
+    }
+
+    /**
+     * @param mixed $criterion
+     */
+    private static function buildCondition($criterion, string $criterionName): string
+    {
+        $ifCondition = Functions::ifCondition($criterion);
+
+        // Check for wildcard characters used in the condition
+        $result = preg_match('/(?<operator>[^"]*)(?<operand>".*[*?].*")/ui', $ifCondition, $matches);
+        if ($result !== 1) {
+            return "[:{$criterionName}]{$ifCondition}";
+        }
+
+        $trueFalse = ($matches['operator'] !== '<>');
+        $wildcard = WildcardMatch::wildcard($matches['operand']);
+        $condition = "WILDCARDMATCH([:{$criterionName}],{$wildcard})";
+        if ($trueFalse === false) {
+            $condition = "NOT({$condition})";
+        }
+
+        return $condition;
+    }
+
+    private static function executeQuery(array $database, string $query, array $criteria, array $fields): array
+    {
+        foreach ($database as $dataRow => $dataValues) {
+            //    Substitute actual values from the database row for our [:placeholders]
+            $conditions = $query;
+            foreach ($criteria as $criterion) {
+                $conditions = self::processCondition($criterion, $fields, $dataValues, $conditions);
+            }
+
+            //    evaluate the criteria against the row data
+            $result = Calculation::getInstance()->_calculateFormulaValue('=' . $conditions);
+
+            //    If the row failed to meet the criteria, remove it from the database
+            if ($result !== true) {
+                unset($database[$dataRow]);
+            }
+        }
+
+        return $database;
+    }
+
+    /**
+     * @return mixed
+     */
+    private static function processCondition(string $criterion, array $fields, array $dataValues, string $conditions)
+    {
+        $key = array_search($criterion, $fields, true);
+
+        $dataValue = 'NULL';
+        if (is_bool($dataValues[$key])) {
+            $dataValue = ($dataValues[$key]) ? 'TRUE' : 'FALSE';
+        } elseif ($dataValues[$key] !== null) {
+            $dataValue = $dataValues[$key];
+            // escape quotes if we have a string containing quotes
+            if (is_string($dataValue) && strpos($dataValue, '"') !== false) {
+                $dataValue = str_replace('"', '""', $dataValue);
+            }
+            $dataValue = (is_string($dataValue)) ? Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
+        }
+
+        return str_replace('[:' . $criterion . ']', $dataValue, $conditions);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php
index 4f85edeb9..26b667ca4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php
@@ -2,129 +2,47 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use DateTimeInterface;
 
+/**
+ * @deprecated 1.18.0
+ */
 class DateTime
 {
     /**
      * Identify if a year is a leap year or not.
      *
+     * @deprecated 1.18.0
+     *      Use the isLeapYear method in the DateTimeExcel\Helpers class instead
+     * @see DateTimeExcel\Helpers::isLeapYear()
+     *
      * @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 (($year % 4) === 0) && (($year % 100) !== 0) || (($year % 400) === 0);
-    }
-
-    /**
-     * Return the number of days between two dates based on a 360 day calendar.
-     *
-     * @param int $startDay Day of month of the start date
-     * @param int $startMonth Month of the start date
-     * @param int $startYear Year of the start date
-     * @param int $endDay Day of month of the start date
-     * @param int $endMonth Month of the start date
-     * @param int $endYear Year of the start date
-     * @param bool $methodUS Whether to use the US method or the European method of calculation
-     *
-     * @return int Number of days between the start date and the end date
-     */
-    private static function dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS)
-    {
-        if ($startDay == 31) {
-            --$startDay;
-        } elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::isLeapYear($startYear))))) {
-            $startDay = 30;
-        }
-        if ($endDay == 31) {
-            if ($methodUS && $startDay != 30) {
-                $endDay = 1;
-                if ($endMonth == 12) {
-                    ++$endYear;
-                    $endMonth = 1;
-                } else {
-                    ++$endMonth;
-                }
-            } else {
-                $endDay = 30;
-            }
-        }
-
-        return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
+        return DateTimeExcel\Helpers::isLeapYear($year);
     }
 
     /**
      * getDateValue.
      *
-     * @param string $dateValue
+     * @deprecated 1.18.0
+     *      Use the getDateValue method in the DateTimeExcel\Helpers class instead
+     * @see DateTimeExcel\Helpers::getDateValue()
+     *
+     * @param mixed $dateValue
      *
      * @return mixed Excel date/time serial value, or string if error
      */
     public static function getDateValue($dateValue)
     {
-        if (!is_numeric($dateValue)) {
-            if ((is_string($dateValue)) &&
-                (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
-                return Functions::VALUE();
-            }
-            if ((is_object($dateValue)) && ($dateValue instanceof \DateTimeInterface)) {
-                $dateValue = Date::PHPToExcel($dateValue);
-            } else {
-                $saveReturnDateType = Functions::getReturnDateType();
-                Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
-                $dateValue = self::DATEVALUE($dateValue);
-                Functions::setReturnDateType($saveReturnDateType);
-            }
+        try {
+            return DateTimeExcel\Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
         }
-
-        return $dateValue;
-    }
-
-    /**
-     * getTimeValue.
-     *
-     * @param string $timeValue
-     *
-     * @return mixed Excel date/time serial value, or string if error
-     */
-    private static function getTimeValue($timeValue)
-    {
-        $saveReturnDateType = Functions::getReturnDateType();
-        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
-        $timeValue = self::TIMEVALUE($timeValue);
-        Functions::setReturnDateType($saveReturnDateType);
-
-        return $timeValue;
-    }
-
-    private static function adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0)
-    {
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-        $oMonth = (int) $PHPDateObject->format('m');
-        $oYear = (int) $PHPDateObject->format('Y');
-
-        $adjustmentMonthsString = (string) $adjustmentMonths;
-        if ($adjustmentMonths > 0) {
-            $adjustmentMonthsString = '+' . $adjustmentMonths;
-        }
-        if ($adjustmentMonths != 0) {
-            $PHPDateObject->modify($adjustmentMonthsString . ' months');
-        }
-        $nMonth = (int) $PHPDateObject->format('m');
-        $nYear = (int) $PHPDateObject->format('Y');
-
-        $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
-        if ($monthDiff != $adjustmentMonths) {
-            $adjustDays = (int) $PHPDateObject->format('d');
-            $adjustDaysString = '-' . $adjustDays . ' days';
-            $PHPDateObject->modify($adjustDaysString);
-        }
-
-        return $PHPDateObject;
     }
 
     /**
@@ -141,33 +59,16 @@ class DateTime
      * Excel Function:
      *        NOW()
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the now method in the DateTimeExcel\Current class instead
+     * @see DateTimeExcel\Current::now()
      *
      * @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()
     {
-        $saveTimeZone = date_default_timezone_get();
-        date_default_timezone_set('UTC');
-        $retValue = false;
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                $retValue = (float) Date::PHPToExcel(time());
-
-                break;
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                $retValue = (int) time();
-
-                break;
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                $retValue = new \DateTime();
-
-                break;
-        }
-        date_default_timezone_set($saveTimeZone);
-
-        return $retValue;
+        return DateTimeExcel\Current::now();
     }
 
     /**
@@ -184,34 +85,16 @@ class DateTime
      * Excel Function:
      *        TODAY()
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the today method in the DateTimeExcel\Current class instead
+     * @see DateTimeExcel\Current::today()
      *
      * @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()
     {
-        $saveTimeZone = date_default_timezone_get();
-        date_default_timezone_set('UTC');
-        $retValue = false;
-        $excelDateTime = floor(Date::PHPToExcel(time()));
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                $retValue = (float) $excelDateTime;
-
-                break;
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                $retValue = (int) Date::excelToTimestamp($excelDateTime);
-
-                break;
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                $retValue = Date::excelToDateTimeObject($excelDateTime);
-
-                break;
-        }
-        date_default_timezone_set($saveTimeZone);
-
-        return $retValue;
+        return DateTimeExcel\Current::today();
     }
 
     /**
@@ -222,15 +105,18 @@ class DateTime
      * 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
+     *      Use the fromYMD method in the DateTimeExcel\Date class instead
+     * @see DateTimeExcel\Date::fromYMD()
+     *
      * 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.
      *
-     * @category Date/Time Functions
-     *
      * @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.
@@ -267,69 +153,7 @@ class DateTime
      */
     public static function DATE($year = 0, $month = 1, $day = 1)
     {
-        $year = Functions::flattenSingleValue($year);
-        $month = Functions::flattenSingleValue($month);
-        $day = Functions::flattenSingleValue($day);
-
-        if (($month !== null) && (!is_numeric($month))) {
-            $month = Date::monthStringToNumber($month);
-        }
-
-        if (($day !== null) && (!is_numeric($day))) {
-            $day = Date::dayStringToNumber($day);
-        }
-
-        $year = ($year !== null) ? StringHelper::testStringAsNumeric($year) : 0;
-        $month = ($month !== null) ? StringHelper::testStringAsNumeric($month) : 0;
-        $day = ($day !== null) ? StringHelper::testStringAsNumeric($day) : 0;
-        if ((!is_numeric($year)) ||
-            (!is_numeric($month)) ||
-            (!is_numeric($day))) {
-            return Functions::VALUE();
-        }
-        $year = (int) $year;
-        $month = (int) $month;
-        $day = (int) $day;
-
-        $baseYear = Date::getExcelCalendar();
-        // Validate parameters
-        if ($year < ($baseYear - 1900)) {
-            return Functions::NAN();
-        }
-        if ((($baseYear - 1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
-            return Functions::NAN();
-        }
-
-        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
-            $year += 1900;
-        }
-
-        if ($month < 1) {
-            //    Handle year/month adjustment if month < 1
-            --$month;
-            $year += ceil($month / 12) - 1;
-            $month = 13 - abs($month % 12);
-        } elseif ($month > 12) {
-            //    Handle year/month adjustment if month > 12
-            $year += floor($month / 12);
-            $month = ($month % 12);
-        }
-
-        // Re-validate the year parameter after adjustments
-        if (($year < $baseYear) || ($year >= 10000)) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $excelDateValue = Date::formattedPHPToExcel($year, $month, $day);
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                return (float) $excelDateValue;
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                return (int) Date::excelToTimestamp($excelDateValue);
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                return Date::excelToDateTimeObject($excelDateValue);
-        }
+        return DateTimeExcel\Date::fromYMD($year, $month, $day);
     }
 
     /**
@@ -343,7 +167,9 @@ class DateTime
      * Excel Function:
      *        TIME(hour,minute,second)
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the fromHMS method in the DateTimeExcel\Time class instead
+     * @see DateTimeExcel\Time::fromHMS()
      *
      * @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
@@ -362,85 +188,7 @@ class DateTime
      */
     public static function TIME($hour = 0, $minute = 0, $second = 0)
     {
-        $hour = Functions::flattenSingleValue($hour);
-        $minute = Functions::flattenSingleValue($minute);
-        $second = Functions::flattenSingleValue($second);
-
-        if ($hour == '') {
-            $hour = 0;
-        }
-        if ($minute == '') {
-            $minute = 0;
-        }
-        if ($second == '') {
-            $second = 0;
-        }
-
-        if ((!is_numeric($hour)) || (!is_numeric($minute)) || (!is_numeric($second))) {
-            return Functions::VALUE();
-        }
-        $hour = (int) $hour;
-        $minute = (int) $minute;
-        $second = (int) $second;
-
-        if ($second < 0) {
-            $minute += floor($second / 60);
-            $second = 60 - abs($second % 60);
-            if ($second == 60) {
-                $second = 0;
-            }
-        } elseif ($second >= 60) {
-            $minute += floor($second / 60);
-            $second = $second % 60;
-        }
-        if ($minute < 0) {
-            $hour += floor($minute / 60);
-            $minute = 60 - abs($minute % 60);
-            if ($minute == 60) {
-                $minute = 0;
-            }
-        } elseif ($minute >= 60) {
-            $hour += floor($minute / 60);
-            $minute = $minute % 60;
-        }
-
-        if ($hour > 23) {
-            $hour = $hour % 24;
-        } elseif ($hour < 0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                $date = 0;
-                $calendar = Date::getExcelCalendar();
-                if ($calendar != Date::CALENDAR_WINDOWS_1900) {
-                    $date = 1;
-                }
-
-                return (float) Date::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                return (int) Date::excelToTimestamp(Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                $dayAdjust = 0;
-                if ($hour < 0) {
-                    $dayAdjust = floor($hour / 24);
-                    $hour = 24 - abs($hour % 24);
-                    if ($hour == 24) {
-                        $hour = 0;
-                    }
-                } elseif ($hour >= 24) {
-                    $dayAdjust = floor($hour / 24);
-                    $hour = $hour % 24;
-                }
-                $phpDateObject = new \DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
-                if ($dayAdjust != 0) {
-                    $phpDateObject->modify($dayAdjust . ' days');
-                }
-
-                return $phpDateObject;
-        }
+        return DateTimeExcel\Time::fromHMS($hour, $minute, $second);
     }
 
     /**
@@ -456,7 +204,9 @@ class DateTime
      * Excel Function:
      *        DATEVALUE(dateValue)
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the fromString method in the DateTimeExcel\DateValue class instead
+     * @see DateTimeExcel\DateValue::fromString()
      *
      * @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
@@ -470,112 +220,9 @@ class DateTime
      * @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 = 1)
+    public static function DATEVALUE($dateValue)
     {
-        $dateValue = trim(Functions::flattenSingleValue($dateValue), '"');
-        //    Strip any ordinals because they're allowed in Excel (English only)
-        $dateValue = 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);
-
-        $yearFound = false;
-        $t1 = explode(' ', $dateValue);
-        foreach ($t1 as &$t) {
-            if ((is_numeric($t)) && ($t > 31)) {
-                if ($yearFound) {
-                    return Functions::VALUE();
-                }
-                if ($t < 100) {
-                    $t += 1900;
-                }
-                $yearFound = true;
-            }
-        }
-        if ((count($t1) == 1) && (strpos($t, ':') !== false)) {
-            //    We've been fed a time value without any date
-            return 0.0;
-        } elseif (count($t1) == 2) {
-            //    We only have two parts of the date: either day/month or month/year
-            if ($yearFound) {
-                array_unshift($t1, 1);
-            } else {
-                if ($t1[1] > 29) {
-                    $t1[1] += 1900;
-                    array_unshift($t1, 1);
-                } else {
-                    $t1[] = date('Y');
-                }
-            }
-        }
-        unset($t);
-        $dateValue = implode(' ', $t1);
-
-        $PHPDateArray = date_parse($dateValue);
-        if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-            $testVal1 = strtok($dateValue, '- ');
-            if ($testVal1 !== false) {
-                $testVal2 = strtok('- ');
-                if ($testVal2 !== false) {
-                    $testVal3 = strtok('- ');
-                    if ($testVal3 === false) {
-                        $testVal3 = strftime('%Y');
-                    }
-                } else {
-                    return Functions::VALUE();
-                }
-            } else {
-                return Functions::VALUE();
-            }
-            if ($testVal1 < 31 && $testVal2 < 12 && $testVal3 < 12 && strlen($testVal3) == 2) {
-                $testVal3 += 2000;
-            }
-            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
-            if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
-                if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                    return Functions::VALUE();
-                }
-            }
-        }
-
-        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
-            // Execute function
-            if ($PHPDateArray['year'] == '') {
-                $PHPDateArray['year'] = strftime('%Y');
-            }
-            if ($PHPDateArray['year'] < 1900) {
-                return Functions::VALUE();
-            }
-            if ($PHPDateArray['month'] == '') {
-                $PHPDateArray['month'] = strftime('%m');
-            }
-            if ($PHPDateArray['day'] == '') {
-                $PHPDateArray['day'] = strftime('%d');
-            }
-            if (!checkdate($PHPDateArray['month'], $PHPDateArray['day'], $PHPDateArray['year'])) {
-                return Functions::VALUE();
-            }
-            $excelDateValue = floor(
-                Date::formattedPHPToExcel(
-                    $PHPDateArray['year'],
-                    $PHPDateArray['month'],
-                    $PHPDateArray['day'],
-                    $PHPDateArray['hour'],
-                    $PHPDateArray['minute'],
-                    $PHPDateArray['second']
-                )
-            );
-            switch (Functions::getReturnDateType()) {
-                case Functions::RETURNDATE_EXCEL:
-                    return (float) $excelDateValue;
-                case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                    return (int) Date::excelToTimestamp($excelDateValue);
-                case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                    return new \DateTime($PHPDateArray['year'] . '-' . $PHPDateArray['month'] . '-' . $PHPDateArray['day'] . ' 00:00:00');
-            }
-        }
-
-        return Functions::VALUE();
+        return DateTimeExcel\DateValue::fromString($dateValue);
     }
 
     /**
@@ -591,7 +238,9 @@ class DateTime
      * Excel Function:
      *        TIMEVALUE(timeValue)
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the fromString method in the DateTimeExcel\TimeValue class instead
+     * @see DateTimeExcel\TimeValue::fromString()
      *
      * @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
@@ -603,163 +252,30 @@ class DateTime
      */
     public static function TIMEVALUE($timeValue)
     {
-        $timeValue = trim(Functions::flattenSingleValue($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);
-            $timeValue = implode(':', $arraySplit);
-        }
-
-        $PHPDateArray = date_parse($timeValue);
-        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $excelDateValue = Date::formattedPHPToExcel(
-                    $PHPDateArray['year'],
-                    $PHPDateArray['month'],
-                    $PHPDateArray['day'],
-                    $PHPDateArray['hour'],
-                    $PHPDateArray['minute'],
-                    $PHPDateArray['second']
-                );
-            } else {
-                $excelDateValue = Date::formattedPHPToExcel(1900, 1, 1, $PHPDateArray['hour'], $PHPDateArray['minute'], $PHPDateArray['second']) - 1;
-            }
-
-            switch (Functions::getReturnDateType()) {
-                case Functions::RETURNDATE_EXCEL:
-                    return (float) $excelDateValue;
-                case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                    return (int) $phpDateValue = Date::excelToTimestamp($excelDateValue + 25569) - 3600;
-                case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                    return new \DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
-            }
-        }
-
-        return Functions::VALUE();
+        return DateTimeExcel\TimeValue::fromString($timeValue);
     }
 
     /**
      * DATEDIF.
      *
+     * Excel Function:
+     *        DATEDIF(startdate, enddate, unit)
+     *
+     * @deprecated 1.18.0
+     *      Use the interval method in the DateTimeExcel\Difference class instead
+     * @see DateTimeExcel\Difference::interval()
+     *
      * @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
+     * @param array|string $unit
      *
-     * @return int|string Interval between the dates
+     * @return array|int|string Interval between the dates
      */
     public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D')
     {
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDate = Functions::flattenSingleValue($endDate);
-        $unit = strtoupper(Functions::flattenSingleValue($unit));
-
-        if (is_string($startDate = self::getDateValue($startDate))) {
-            return Functions::VALUE();
-        }
-        if (is_string($endDate = self::getDateValue($endDate))) {
-            return Functions::VALUE();
-        }
-
-        // Validate parameters
-        if ($startDate > $endDate) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $difference = $endDate - $startDate;
-
-        $PHPStartDateObject = Date::excelToDateTimeObject($startDate);
-        $startDays = $PHPStartDateObject->format('j');
-        $startMonths = $PHPStartDateObject->format('n');
-        $startYears = $PHPStartDateObject->format('Y');
-
-        $PHPEndDateObject = Date::excelToDateTimeObject($endDate);
-        $endDays = $PHPEndDateObject->format('j');
-        $endMonths = $PHPEndDateObject->format('n');
-        $endYears = $PHPEndDateObject->format('Y');
-
-        switch ($unit) {
-            case 'D':
-                $retVal = (int) $difference;
-
-                break;
-            case 'M':
-                $retVal = (int) ($endMonths - $startMonths) + ((int) ($endYears - $startYears) * 12);
-                //    We're only interested in full months
-                if ($endDays < $startDays) {
-                    --$retVal;
-                }
-
-                break;
-            case 'Y':
-                $retVal = (int) ($endYears - $startYears);
-                //    We're only interested in full months
-                if ($endMonths < $startMonths) {
-                    --$retVal;
-                } elseif (($endMonths == $startMonths) && ($endDays < $startDays)) {
-                    // Remove start month
-                    --$retVal;
-                    // Remove end month
-                    --$retVal;
-                }
-
-                break;
-            case 'MD':
-                if ($endDays < $startDays) {
-                    $retVal = $endDays;
-                    $PHPEndDateObject->modify('-' . $endDays . ' days');
-                    $adjustDays = $PHPEndDateObject->format('j');
-                    $retVal += ($adjustDays - $startDays);
-                } else {
-                    $retVal = $endDays - $startDays;
-                }
-
-                break;
-            case 'YM':
-                $retVal = (int) ($endMonths - $startMonths);
-                if ($retVal < 0) {
-                    $retVal += 12;
-                }
-                //    We're only interested in full months
-                if ($endDays < $startDays) {
-                    --$retVal;
-                }
-
-                break;
-            case 'YD':
-                $retVal = (int) $difference;
-                if ($endYears > $startYears) {
-                    $isLeapStartYear = $PHPStartDateObject->format('L');
-                    $wasLeapEndYear = $PHPEndDateObject->format('L');
-
-                    // Adjust end year to be as close as possible as start year
-                    while ($PHPEndDateObject >= $PHPStartDateObject) {
-                        $PHPEndDateObject->modify('-1 year');
-                        $endYears = $PHPEndDateObject->format('Y');
-                    }
-                    $PHPEndDateObject->modify('+1 year');
-
-                    // Get the result
-                    $retVal = $PHPEndDateObject->diff($PHPStartDateObject)->days;
-
-                    // Adjust for leap years cases
-                    $isLeapEndYear = $PHPEndDateObject->format('L');
-                    $limit = new \DateTime($PHPEndDateObject->format('Y-02-29'));
-                    if (!$isLeapStartYear && !$wasLeapEndYear && $isLeapEndYear && $PHPEndDateObject >= $limit) {
-                        --$retVal;
-                    }
-                }
-
-                break;
-            default:
-                $retVal = Functions::VALUE();
-        }
-
-        return $retVal;
+        return DateTimeExcel\Difference::interval($startDate, $endDate, $unit);
     }
 
     /**
@@ -770,42 +286,20 @@ class DateTime
      * Excel Function:
      *        DAYS(endDate, startDate)
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the between method in the DateTimeExcel\Days class instead
+     * @see DateTimeExcel\Days::between()
      *
-     * @param \DateTimeImmutable|float|int|string $endDate Excel date serial value (float),
+     * @param array|DateTimeInterface|float|int|string $endDate Excel date serial value (float),
      * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     * @param \DateTimeImmutable|float|int|string $startDate Excel date serial value (float),
+     * @param array|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
+     * @return array|int|string Number of days between start date and end date or an error
      */
     public static function DAYS($endDate = 0, $startDate = 0)
     {
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDate = Functions::flattenSingleValue($endDate);
-
-        $startDate = self::getDateValue($startDate);
-        if (is_string($startDate)) {
-            return Functions::VALUE();
-        }
-
-        $endDate = self::getDateValue($endDate);
-        if (is_string($endDate)) {
-            return Functions::VALUE();
-        }
-
-        // Execute function
-        $PHPStartDateObject = Date::excelToDateTimeObject($startDate);
-        $PHPEndDateObject = Date::excelToDateTimeObject($endDate);
-
-        $diff = $PHPStartDateObject->diff($PHPEndDateObject);
-        $days = $diff->days;
-
-        if ($diff->invert) {
-            $days = -$days;
-        }
-
-        return $days;
+        return DateTimeExcel\Days::between($endDate, $startDate);
     }
 
     /**
@@ -818,13 +312,15 @@ class DateTime
      * Excel Function:
      *        DAYS360(startDate,endDate[,method])
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the between method in the DateTimeExcel\Days360 class instead
+     * @see DateTimeExcel\Days360::between()
      *
      * @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
+     * @param array|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
@@ -836,36 +332,11 @@ class DateTime
      *                                        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
+     * @return array|int|string Number of days between start date and end date
      */
     public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
     {
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDate = Functions::flattenSingleValue($endDate);
-
-        if (is_string($startDate = self::getDateValue($startDate))) {
-            return Functions::VALUE();
-        }
-        if (is_string($endDate = self::getDateValue($endDate))) {
-            return Functions::VALUE();
-        }
-
-        if (!is_bool($method)) {
-            return Functions::VALUE();
-        }
-
-        // Execute function
-        $PHPStartDateObject = Date::excelToDateTimeObject($startDate);
-        $startDay = $PHPStartDateObject->format('j');
-        $startMonth = $PHPStartDateObject->format('n');
-        $startYear = $PHPStartDateObject->format('Y');
-
-        $PHPEndDateObject = Date::excelToDateTimeObject($endDate);
-        $endDay = $PHPEndDateObject->format('j');
-        $endMonth = $PHPEndDateObject->format('n');
-        $endYear = $PHPEndDateObject->format('Y');
-
-        return self::dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
+        return DateTimeExcel\Days360::between($startDate, $endDate, $method);
     }
 
     /**
@@ -878,98 +349,30 @@ class DateTime
      *
      * Excel Function:
      *        YEARFRAC(startDate,endDate[,method])
+     *
+     * @deprecated 1.18.0
+     *      Use the fraction method in the DateTimeExcel\YearFrac class instead
+     * @see DateTimeExcel\YearFrac::fraction()
+     *
      * See https://lists.oasis-open.org/archives/office-formula/200806/msg00039.html
      *     for description of algorithm used in Excel
      *
-     * @category Date/Time Functions
-     *
      * @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
+     * @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
      *
-     * @return float|string fraction of the year, or a string containing an error
+     * @return array|float|string fraction of the year, or a string containing an error
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDate = Functions::flattenSingleValue($endDate);
-        $method = Functions::flattenSingleValue($method);
-
-        if (is_string($startDate = self::getDateValue($startDate))) {
-            return Functions::VALUE();
-        }
-        if (is_string($endDate = self::getDateValue($endDate))) {
-            return Functions::VALUE();
-        }
-        if ($startDate > $endDate) {
-            $temp = $startDate;
-            $startDate = $endDate;
-            $endDate = $temp;
-        }
-
-        if (((is_numeric($method)) && (!is_string($method))) || ($method == '')) {
-            switch ($method) {
-                case 0:
-                    return self::DAYS360($startDate, $endDate) / 360;
-                case 1:
-                    $days = self::DATEDIF($startDate, $endDate);
-                    $startYear = self::YEAR($startDate);
-                    $endYear = self::YEAR($endDate);
-                    $years = $endYear - $startYear + 1;
-                    $startMonth = self::MONTHOFYEAR($startDate);
-                    $startDay = self::DAYOFMONTH($startDate);
-                    $endMonth = self::MONTHOFYEAR($endDate);
-                    $endDay = self::DAYOFMONTH($endDate);
-                    $startMonthDay = 100 * $startMonth + $startDay;
-                    $endMonthDay = 100 * $endMonth + $endDay;
-                    if ($years == 1) {
-                        if (self::isLeapYear($endYear)) {
-                            $tmpCalcAnnualBasis = 366;
-                        } else {
-                            $tmpCalcAnnualBasis = 365;
-                        }
-                    } elseif ($years == 2 && $startMonthDay >= $endMonthDay) {
-                        if (self::isLeapYear($startYear)) {
-                            if ($startMonthDay <= 229) {
-                                $tmpCalcAnnualBasis = 366;
-                            } else {
-                                $tmpCalcAnnualBasis = 365;
-                            }
-                        } elseif (self::isLeapYear($endYear)) {
-                            if ($endMonthDay >= 229) {
-                                $tmpCalcAnnualBasis = 366;
-                            } else {
-                                $tmpCalcAnnualBasis = 365;
-                            }
-                        } else {
-                            $tmpCalcAnnualBasis = 365;
-                        }
-                    } else {
-                        $tmpCalcAnnualBasis = 0;
-                        for ($year = $startYear; $year <= $endYear; ++$year) {
-                            $tmpCalcAnnualBasis += self::isLeapYear($year) ? 366 : 365;
-                        }
-                        $tmpCalcAnnualBasis /= $years;
-                    }
-
-                    return $days / $tmpCalcAnnualBasis;
-                case 2:
-                    return self::DATEDIF($startDate, $endDate) / 360;
-                case 3:
-                    return self::DATEDIF($startDate, $endDate) / 365;
-                case 4:
-                    return self::DAYS360($startDate, $endDate, true) / 360;
-            }
-        }
-
-        return Functions::VALUE();
+        return DateTimeExcel\YearFrac::fraction($startDate, $endDate, $method);
     }
 
     /**
@@ -983,73 +386,21 @@ class DateTime
      * Excel Function:
      *        NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the count method in the DateTimeExcel\NetworkDays class instead
+     * @see DateTimeExcel\NetworkDays::count()
      *
      * @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
+     * @return array|int|string Interval between the dates
      */
     public static function NETWORKDAYS($startDate, $endDate, ...$dateArgs)
     {
-        //    Retrieve the mandatory start and end date that are referenced in the function definition
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDate = Functions::flattenSingleValue($endDate);
-        //    Get the optional days
-        $dateArgs = Functions::flattenArray($dateArgs);
-
-        //    Validate the start and end dates
-        if (is_string($startDate = $sDate = self::getDateValue($startDate))) {
-            return Functions::VALUE();
-        }
-        $startDate = (float) floor($startDate);
-        if (is_string($endDate = $eDate = self::getDateValue($endDate))) {
-            return Functions::VALUE();
-        }
-        $endDate = (float) floor($endDate);
-
-        if ($sDate > $eDate) {
-            $startDate = $eDate;
-            $endDate = $sDate;
-        }
-
-        // Execute function
-        $startDoW = 6 - self::WEEKDAY($startDate, 2);
-        if ($startDoW < 0) {
-            $startDoW = 0;
-        }
-        $endDoW = self::WEEKDAY($endDate, 2);
-        if ($endDoW >= 6) {
-            $endDoW = 0;
-        }
-
-        $wholeWeekDays = floor(($endDate - $startDate) / 7) * 5;
-        $partWeekDays = $endDoW + $startDoW;
-        if ($partWeekDays > 5) {
-            $partWeekDays -= 5;
-        }
-
-        //    Test any extra holiday parameters
-        $holidayCountedArray = [];
-        foreach ($dateArgs as $holidayDate) {
-            if (is_string($holidayDate = self::getDateValue($holidayDate))) {
-                return Functions::VALUE();
-            }
-            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-                if ((self::WEEKDAY($holidayDate, 2) < 6) && (!in_array($holidayDate, $holidayCountedArray))) {
-                    --$partWeekDays;
-                    $holidayCountedArray[] = $holidayDate;
-                }
-            }
-        }
-
-        if ($sDate > $eDate) {
-            return 0 - ($wholeWeekDays + $partWeekDays);
-        }
-
-        return $wholeWeekDays + $partWeekDays;
+        return DateTimeExcel\NetworkDays::count($startDate, $endDate, ...$dateArgs);
     }
 
     /**
@@ -1063,104 +414,23 @@ class DateTime
      * Excel Function:
      *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
      *
-     * @category Date/Time Functions
+     * @deprecated 1.18.0
+     *      Use the date method in the DateTimeExcel\WorkDay class instead
+     * @see DateTimeExcel\WorkDay::date()
      *
      * @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)
     {
-        //    Retrieve the mandatory start date and days that are referenced in the function definition
-        $startDate = Functions::flattenSingleValue($startDate);
-        $endDays = Functions::flattenSingleValue($endDays);
-        //    Get the optional days
-        $dateArgs = Functions::flattenArray($dateArgs);
-
-        if ((is_string($startDate = self::getDateValue($startDate))) || (!is_numeric($endDays))) {
-            return Functions::VALUE();
-        }
-        $startDate = (float) floor($startDate);
-        $endDays = (int) floor($endDays);
-        //    If endDays is 0, we always return startDate
-        if ($endDays == 0) {
-            return $startDate;
-        }
-
-        $decrementing = $endDays < 0;
-
-        //    Adjust the start date if it falls over a weekend
-
-        $startDoW = self::WEEKDAY($startDate, 3);
-        if (self::WEEKDAY($startDate, 3) >= 5) {
-            $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
-            ($decrementing) ? $endDays++ : $endDays--;
-        }
-
-        //    Add endDays
-        $endDate = (float) $startDate + ((int) ($endDays / 5) * 7) + ($endDays % 5);
-
-        //    Adjust the calculated end date if it falls over a weekend
-        $endDoW = self::WEEKDAY($endDate, 3);
-        if ($endDoW >= 5) {
-            $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
-        }
-
-        //    Test any extra holiday parameters
-        if (!empty($dateArgs)) {
-            $holidayCountedArray = $holidayDates = [];
-            foreach ($dateArgs as $holidayDate) {
-                if (($holidayDate !== null) && (trim($holidayDate) > '')) {
-                    if (is_string($holidayDate = self::getDateValue($holidayDate))) {
-                        return Functions::VALUE();
-                    }
-                    if (self::WEEKDAY($holidayDate, 3) < 5) {
-                        $holidayDates[] = $holidayDate;
-                    }
-                }
-            }
-            if ($decrementing) {
-                rsort($holidayDates, SORT_NUMERIC);
-            } else {
-                sort($holidayDates, SORT_NUMERIC);
-            }
-            foreach ($holidayDates as $holidayDate) {
-                if ($decrementing) {
-                    if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
-                        if (!in_array($holidayDate, $holidayCountedArray)) {
-                            --$endDate;
-                            $holidayCountedArray[] = $holidayDate;
-                        }
-                    }
-                } else {
-                    if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-                        if (!in_array($holidayDate, $holidayCountedArray)) {
-                            ++$endDate;
-                            $holidayCountedArray[] = $holidayDate;
-                        }
-                    }
-                }
-                //    Adjust the calculated end date if it falls over a weekend
-                $endDoW = self::WEEKDAY($endDate, 3);
-                if ($endDoW >= 5) {
-                    $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
-                }
-            }
-        }
-
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                return (float) $endDate;
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                return (int) Date::excelToTimestamp($endDate);
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                return Date::excelToDateTimeObject($endDate);
-        }
+        return DateTimeExcel\WorkDay::date($startDate, $endDays, ...$dateArgs);
     }
 
     /**
@@ -1172,33 +442,18 @@ class DateTime
      * Excel Function:
      *        DAY(dateValue)
      *
+     * @deprecated 1.18.0
+     *      Use the day method in the DateTimeExcel\DateParts class instead
+     * @see DateTimeExcel\DateParts::day()
+     *
      * @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
+     * @return array|int|string Day of the month
      */
     public static function DAYOFMONTH($dateValue = 1)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-
-        if ($dateValue === null) {
-            $dateValue = 1;
-        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        }
-
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
-            if ($dateValue < 0.0) {
-                return Functions::NAN();
-            } elseif ($dateValue < 1.0) {
-                return 0;
-            }
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-
-        return (int) $PHPDateObject->format('j');
+        return DateTimeExcel\DateParts::day($dateValue);
     }
 
     /**
@@ -1210,90 +465,184 @@ class DateTime
      * Excel Function:
      *        WEEKDAY(dateValue[,style])
      *
-     * @param int $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     * @deprecated 1.18.0
+     *      Use the day method in the DateTimeExcel\Week class instead
+     * @see DateTimeExcel\Week::day()
+     *
+     * @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
+     * @return array|int|string Day of the week value
      */
     public static function WEEKDAY($dateValue = 1, $style = 1)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-        $style = Functions::flattenSingleValue($style);
-
-        if (!is_numeric($style)) {
-            return Functions::VALUE();
-        } elseif (($style < 1) || ($style > 3)) {
-            return Functions::NAN();
-        }
-        $style = floor($style);
-
-        if ($dateValue === null) {
-            $dateValue = 1;
-        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        } elseif ($dateValue < 0.0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-        $DoW = (int) $PHPDateObject->format('w');
-
-        $firstDay = 1;
-        switch ($style) {
-            case 1:
-                ++$DoW;
-
-                break;
-            case 2:
-                if ($DoW === 0) {
-                    $DoW = 7;
-                }
-
-                break;
-            case 3:
-                if ($DoW === 0) {
-                    $DoW = 7;
-                }
-                $firstDay = 0;
-                --$DoW;
-
-                break;
-        }
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
-            //    Test for Excel's 1900 leap year, and introduce the error as required
-            if (($PHPDateObject->format('Y') == 1900) && ($PHPDateObject->format('n') <= 2)) {
-                --$DoW;
-                if ($DoW < $firstDay) {
-                    $DoW += 7;
-                }
-            }
-        }
-
-        return $DoW;
+        return DateTimeExcel\Week::day($dateValue, $style);
     }
 
+    /**
+     * STARTWEEK_SUNDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_SUNDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_SUNDAY
+     */
     const STARTWEEK_SUNDAY = 1;
+
+    /**
+     * STARTWEEK_MONDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_MONDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_MONDAY
+     */
     const STARTWEEK_MONDAY = 2;
+
+    /**
+     * STARTWEEK_MONDAY_ALT.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_MONDAY_ALT
+     * @see DateTimeExcel\Constants::STARTWEEK_MONDAY_ALT
+     */
     const STARTWEEK_MONDAY_ALT = 11;
+
+    /**
+     * STARTWEEK_TUESDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_TUESDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_TUESDAY
+     */
     const STARTWEEK_TUESDAY = 12;
+
+    /**
+     * STARTWEEK_WEDNESDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_WEDNESDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_WEDNESDAY
+     */
     const STARTWEEK_WEDNESDAY = 13;
+
+    /**
+     * STARTWEEK_THURSDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_THURSDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_THURSDAY
+     */
     const STARTWEEK_THURSDAY = 14;
+
+    /**
+     * STARTWEEK_FRIDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_FRIDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_FRIDAY
+     */
     const STARTWEEK_FRIDAY = 15;
+
+    /**
+     * STARTWEEK_SATURDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_SATURDAY
+     * @see DateTimeExcel\Constants::STARTWEEK_SATURDAY
+     */
     const STARTWEEK_SATURDAY = 16;
+
+    /**
+     * STARTWEEK_SUNDAY_ALT.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_SUNDAY_ALT
+     * @see DateTimeExcel\Constants::STARTWEEK_SUNDAY_ALT
+     */
     const STARTWEEK_SUNDAY_ALT = 17;
+
+    /**
+     * DOW_SUNDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_SUNDAY
+     * @see DateTimeExcel\Constants::DOW_SUNDAY
+     */
     const DOW_SUNDAY = 1;
+
+    /**
+     * DOW_MONDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_MONDAY
+     * @see DateTimeExcel\Constants::DOW_MONDAY
+     */
     const DOW_MONDAY = 2;
+
+    /**
+     * DOW_TUESDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_TUESDAY
+     * @see DateTimeExcel\Constants::DOW_TUESDAY
+     */
     const DOW_TUESDAY = 3;
+
+    /**
+     * DOW_WEDNESDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_WEDNESDAY
+     * @see DateTimeExcel\Constants::DOW_WEDNESDAY
+     */
     const DOW_WEDNESDAY = 4;
+
+    /**
+     * DOW_THURSDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_THURSDAY
+     * @see DateTimeExcel\Constants::DOW_THURSDAY
+     */
     const DOW_THURSDAY = 5;
+
+    /**
+     * DOW_FRIDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_FRIDAY
+     * @see DateTimeExcel\Constants::DOW_FRIDAY
+     */
     const DOW_FRIDAY = 6;
+
+    /**
+     * DOW_SATURDAY.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::DOW_SATURDAY
+     * @see DateTimeExcel\Constants::DOW_SATURDAY
+     */
     const DOW_SATURDAY = 7;
+
+    /**
+     * STARTWEEK_MONDAY_ISO.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::STARTWEEK_MONDAY_ISO
+     * @see DateTimeExcel\Constants::STARTWEEK_MONDAY_ISO
+     */
     const STARTWEEK_MONDAY_ISO = 21;
+
+    /**
+     * METHODARR.
+     *
+     * @deprecated 1.18.0
+     *  Use DateTimeExcel\Constants::METHODARR
+     * @see DateTimeExcel\Constants::METHODARR
+     */
     const METHODARR = [
         self::STARTWEEK_SUNDAY => self::DOW_SUNDAY,
         self::DOW_MONDAY,
@@ -1305,7 +654,7 @@ class DateTime
         self::DOW_SATURDAY,
         self::DOW_SUNDAY,
         self::STARTWEEK_MONDAY_ISO => self::STARTWEEK_MONDAY_ISO,
-        ];
+    ];
 
     /**
      * WEEKNUM.
@@ -1320,6 +669,10 @@ class DateTime
      * Excel Function:
      *        WEEKNUM(dateValue[,style])
      *
+     * @deprecated 1.18.0
+     *      Use the number method in the DateTimeExcel\Week class instead
+     * @see DateTimeExcel\Week::number()
+     *
      * @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
@@ -1334,44 +687,11 @@ class DateTime
      *                                        17               Week begins on Sunday.
      *                                        21               ISO (Jan. 4 is week 1, begins on Monday).
      *
-     * @return int|string Week Number
+     * @return array|int|string Week Number
      */
-    public static function WEEKNUM($dateValue = 1, $method = self::STARTWEEK_SUNDAY)
+    public static function WEEKNUM($dateValue = 1, $method = /** @scrutinizer ignore-deprecated */ self::STARTWEEK_SUNDAY)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-        $method = Functions::flattenSingleValue($method);
-
-        if (!is_numeric($method)) {
-            return Functions::VALUE();
-        }
-        $method = (int) $method;
-        if (!array_key_exists($method, self::METHODARR)) {
-            return Functions::NaN();
-        }
-        $method = self::METHODARR[$method];
-
-        $dateValue = self::getDateValue($dateValue);
-        if (is_string($dateValue)) {
-            return Functions::VALUE();
-        }
-        if ($dateValue < 0.0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-        if ($method == self::STARTWEEK_MONDAY_ISO) {
-            return (int) $PHPDateObject->format('W');
-        }
-        $dayOfYear = $PHPDateObject->format('z');
-        $PHPDateObject->modify('-' . $dayOfYear . ' days');
-        $firstDayOfFirstWeek = $PHPDateObject->format('w');
-        $daysInFirstWeek = (6 - $firstDayOfFirstWeek + $method) % 7;
-        $daysInFirstWeek += 7 * !$daysInFirstWeek;
-        $endFirstWeek = $daysInFirstWeek - 1;
-        $weekOfYear = floor(($dayOfYear - $endFirstWeek + 13) / 7);
-
-        return (int) $weekOfYear;
+        return DateTimeExcel\Week::number($dateValue, $method);
     }
 
     /**
@@ -1382,27 +702,18 @@ class DateTime
      * Excel Function:
      *        ISOWEEKNUM(dateValue)
      *
+     * @deprecated 1.18.0
+     *      Use the isoWeekNumber method in the DateTimeExcel\Week class instead
+     * @see DateTimeExcel\Week::isoWeekNumber()
+     *
      * @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
+     * @return array|int|string Week Number
      */
     public static function ISOWEEKNUM($dateValue = 1)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-
-        if ($dateValue === null) {
-            $dateValue = 1;
-        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        } elseif ($dateValue < 0.0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-
-        return (int) $PHPDateObject->format('W');
+        return DateTimeExcel\Week::isoWeekNumber($dateValue);
     }
 
     /**
@@ -1414,28 +725,18 @@ class DateTime
      * Excel Function:
      *        MONTH(dateValue)
      *
+     * @deprecated 1.18.0
+     *      Use the month method in the DateTimeExcel\DateParts class instead
+     * @see DateTimeExcel\DateParts::month()
+     *
      * @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
+     * @return array|int|string Month of the year
      */
     public static function MONTHOFYEAR($dateValue = 1)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-
-        if (empty($dateValue)) {
-            $dateValue = 1;
-        }
-        if (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        } elseif ($dateValue < 0.0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-
-        return (int) $PHPDateObject->format('n');
+        return DateTimeExcel\DateParts::month($dateValue);
     }
 
     /**
@@ -1447,27 +748,18 @@ class DateTime
      * Excel Function:
      *        YEAR(dateValue)
      *
+     * @deprecated 1.18.0
+     *      Use the ear method in the DateTimeExcel\DateParts class instead
+     * @see DateTimeExcel\DateParts::year()
+     *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      *
-     * @return int|string Year
+     * @return array|int|string Year
      */
     public static function YEAR($dateValue = 1)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-
-        if ($dateValue === null) {
-            $dateValue = 1;
-        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        } elseif ($dateValue < 0.0) {
-            return Functions::NAN();
-        }
-
-        // Execute function
-        $PHPDateObject = Date::excelToDateTimeObject($dateValue);
-
-        return (int) $PHPDateObject->format('Y');
+        return DateTimeExcel\DateParts::year($dateValue);
     }
 
     /**
@@ -1479,36 +771,18 @@ class DateTime
      * Excel Function:
      *        HOUR(timeValue)
      *
+     * @deprecated 1.18.0
+     *      Use the hour method in the DateTimeExcel\TimeParts class instead
+     * @see DateTimeExcel\TimeParts::hour()
+     *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Hour
+     * @return array|int|string Hour
      */
     public static function HOUROFDAY($timeValue = 0)
     {
-        $timeValue = Functions::flattenSingleValue($timeValue);
-
-        if (!is_numeric($timeValue)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                $testVal = strtok($timeValue, '/-: ');
-                if (strlen($testVal) < strlen($timeValue)) {
-                    return Functions::VALUE();
-                }
-            }
-            $timeValue = self::getTimeValue($timeValue);
-            if (is_string($timeValue)) {
-                return Functions::VALUE();
-            }
-        }
-        // Execute function
-        if ($timeValue >= 1) {
-            $timeValue = fmod($timeValue, 1);
-        } elseif ($timeValue < 0.0) {
-            return Functions::NAN();
-        }
-        $timeValue = Date::excelToTimestamp($timeValue);
-
-        return (int) gmdate('G', $timeValue);
+        return DateTimeExcel\TimeParts::hour($timeValue);
     }
 
     /**
@@ -1520,36 +794,18 @@ class DateTime
      * Excel Function:
      *        MINUTE(timeValue)
      *
+     * @deprecated 1.18.0
+     *      Use the minute method in the DateTimeExcel\TimeParts class instead
+     * @see DateTimeExcel\TimeParts::minute()
+     *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Minute
+     * @return array|int|string Minute
      */
     public static function MINUTE($timeValue = 0)
     {
-        $timeValue = $timeTester = Functions::flattenSingleValue($timeValue);
-
-        if (!is_numeric($timeValue)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                $testVal = strtok($timeValue, '/-: ');
-                if (strlen($testVal) < strlen($timeValue)) {
-                    return Functions::VALUE();
-                }
-            }
-            $timeValue = self::getTimeValue($timeValue);
-            if (is_string($timeValue)) {
-                return Functions::VALUE();
-            }
-        }
-        // Execute function
-        if ($timeValue >= 1) {
-            $timeValue = fmod($timeValue, 1);
-        } elseif ($timeValue < 0.0) {
-            return Functions::NAN();
-        }
-        $timeValue = Date::excelToTimestamp($timeValue);
-
-        return (int) gmdate('i', $timeValue);
+        return DateTimeExcel\TimeParts::minute($timeValue);
     }
 
     /**
@@ -1561,36 +817,18 @@ class DateTime
      * Excel Function:
      *        SECOND(timeValue)
      *
+     * @deprecated 1.18.0
+     *      Use the second method in the DateTimeExcel\TimeParts class instead
+     * @see DateTimeExcel\TimeParts::second()
+     *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      *
-     * @return int|string Second
+     * @return array|int|string Second
      */
     public static function SECOND($timeValue = 0)
     {
-        $timeValue = Functions::flattenSingleValue($timeValue);
-
-        if (!is_numeric($timeValue)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                $testVal = strtok($timeValue, '/-: ');
-                if (strlen($testVal) < strlen($timeValue)) {
-                    return Functions::VALUE();
-                }
-            }
-            $timeValue = self::getTimeValue($timeValue);
-            if (is_string($timeValue)) {
-                return Functions::VALUE();
-            }
-        }
-        // Execute function
-        if ($timeValue >= 1) {
-            $timeValue = fmod($timeValue, 1);
-        } elseif ($timeValue < 0.0) {
-            return Functions::NAN();
-        }
-        $timeValue = Date::excelToTimestamp($timeValue);
-
-        return (int) gmdate('s', $timeValue);
+        return DateTimeExcel\TimeParts::second($timeValue);
     }
 
     /**
@@ -1604,6 +842,10 @@ class DateTime
      * Excel Function:
      *        EDATE(dateValue,adjustmentMonths)
      *
+     * @deprecated 1.18.0
+     *      Use the adjust method in the DateTimeExcel\Edate class instead
+     * @see DateTimeExcel\Month::adjust()
+     *
      * @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.
@@ -1615,29 +857,7 @@ class DateTime
      */
     public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
-
-        if (!is_numeric($adjustmentMonths)) {
-            return Functions::VALUE();
-        }
-        $adjustmentMonths = floor($adjustmentMonths);
-
-        if (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        }
-
-        // Execute function
-        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths);
-
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                return (float) Date::PHPToExcel($PHPDateObject);
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                return (int) Date::excelToTimestamp(Date::PHPToExcel($PHPDateObject));
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                return $PHPDateObject;
-        }
+        return DateTimeExcel\Month::adjust($dateValue, $adjustmentMonths);
     }
 
     /**
@@ -1650,6 +870,10 @@ class DateTime
      * Excel Function:
      *        EOMONTH(dateValue,adjustmentMonths)
      *
+     * @deprecated 1.18.0
+     *      Use the lastDay method in the DateTimeExcel\EoMonth class instead
+     * @see DateTimeExcel\Month::lastDay()
+     *
      * @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.
@@ -1661,31 +885,6 @@ class DateTime
      */
     public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
-
-        if (!is_numeric($adjustmentMonths)) {
-            return Functions::VALUE();
-        }
-        $adjustmentMonths = floor($adjustmentMonths);
-
-        if (is_string($dateValue = self::getDateValue($dateValue))) {
-            return Functions::VALUE();
-        }
-
-        // Execute function
-        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
-        $adjustDays = (int) $PHPDateObject->format('d');
-        $adjustDaysString = '-' . $adjustDays . ' days';
-        $PHPDateObject->modify($adjustDaysString);
-
-        switch (Functions::getReturnDateType()) {
-            case Functions::RETURNDATE_EXCEL:
-                return (float) Date::PHPToExcel($PHPDateObject);
-            case Functions::RETURNDATE_UNIX_TIMESTAMP:
-                return (int) Date::excelToTimestamp(Date::PHPToExcel($PHPDateObject));
-            case Functions::RETURNDATE_PHP_DATETIME_OBJECT:
-                return $PHPDateObject;
-        }
+        return DateTimeExcel\Month::lastDay($dateValue, $adjustmentMonths);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php
new file mode 100644
index 000000000..1165eb1fe
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+class Constants
+{
+    // Constants currently used by WeekNum; will eventually be used by WEEKDAY
+    const STARTWEEK_SUNDAY = 1;
+    const STARTWEEK_MONDAY = 2;
+    const STARTWEEK_MONDAY_ALT = 11;
+    const STARTWEEK_TUESDAY = 12;
+    const STARTWEEK_WEDNESDAY = 13;
+    const STARTWEEK_THURSDAY = 14;
+    const STARTWEEK_FRIDAY = 15;
+    const STARTWEEK_SATURDAY = 16;
+    const STARTWEEK_SUNDAY_ALT = 17;
+    const DOW_SUNDAY = 1;
+    const DOW_MONDAY = 2;
+    const DOW_TUESDAY = 3;
+    const DOW_WEDNESDAY = 4;
+    const DOW_THURSDAY = 5;
+    const DOW_FRIDAY = 6;
+    const DOW_SATURDAY = 7;
+    const STARTWEEK_MONDAY_ISO = 21;
+
+    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,
+    ];
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
new file mode 100644
index 000000000..5de671d3c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTimeImmutable;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Current
+{
+    /**
+     * 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()
+     *
+     * @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 today()
+    {
+        $dti = new DateTimeImmutable();
+        $dateArray = Helpers::dateParse($dti->format('c'));
+
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : ExcelError::VALUE();
+    }
+
+    /**
+     * 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()
+     *
+     * @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 now()
+    {
+        $dti = new DateTimeImmutable();
+        $dateArray = Helpers::dateParse($dti->format('c'));
+
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
new file mode 100644
index 000000000..6b55e791d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Date
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * 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 array|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 array|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 array|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
+     *         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)
+    {
+        if (is_array($year) || is_array($month) || is_array($day)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $year, $month, $day);
+        }
+
+        $baseYear = SharedDateHelper::getExcelCalendar();
+
+        try {
+            $year = self::getYear($year, $baseYear); // must be int - Scrutinizer is wrong
+            $month = self::getMonth($month);
+            $day = self::getDay($day);
+            self::adjustYearMonth(/** @scrutinizer ignore-type */ $year, $month, $baseYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $excelDateValue = SharedDateHelper::formattedPHPToExcel(/** @scrutinizer ignore-type */ $year, $month, $day);
+
+        return Helpers::returnIn3FormatsFloat($excelDateValue);
+    }
+
+    /**
+     * Convert year from multiple formats to int.
+     *
+     * @param mixed $year
+     */
+    private static function getYear($year, int $baseYear): int
+    {
+        $year = ($year !== null) ? StringHelper::testStringAsNumeric((string) $year) : 0;
+        if (!is_numeric($year)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $year = (int) $year;
+
+        if ($year < ($baseYear - 1900)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        if ((($baseYear - 1900) !== 0) && ($year < $baseYear) && ($year >= 1900)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
+            $year += 1900;
+        }
+
+        return (int) $year;
+    }
+
+    /**
+     * Convert month from multiple formats to int.
+     *
+     * @param mixed $month
+     */
+    private static function getMonth($month): int
+    {
+        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(ExcelError::VALUE());
+        }
+
+        return (int) $month;
+    }
+
+    /**
+     * Convert day from multiple formats to int.
+     *
+     * @param mixed $day
+     */
+    private static function getDay($day): int
+    {
+        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(ExcelError::VALUE());
+        }
+
+        return (int) $day;
+    }
+
+    private static function adjustYearMonth(int &$year, int &$month, int $baseYear): void
+    {
+        if ($month < 1) {
+            //    Handle year/month adjustment if month < 1
+            --$month;
+            $year += ceil($month / 12) - 1;
+            $month = 13 - abs($month % 12);
+        } elseif ($month > 12) {
+            //    Handle year/month adjustment if month > 12
+            $year += floor($month / 12);
+            $month = ($month % 12);
+        }
+
+        // Re-validate the year parameter after adjustments
+        if (($year < $baseYear) || ($year >= 10000)) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
new file mode 100644
index 000000000..b669eb0a1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
@@ -0,0 +1,151 @@
+<?php
+
+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.
+     *
+     * 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)
+     *
+     * @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 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)
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        $weirdResult = self::weirdCondition($dateValue);
+        if ($weirdResult >= 0) {
+            return $weirdResult;
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+
+        return (int) $PHPDateObject->format('j');
+    }
+
+    /**
+     * 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)
+     *
+     * @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 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)
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        if ($dateValue < 1 && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900) {
+            return 1;
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+
+        return (int) $PHPDateObject->format('n');
+    }
+
+    /**
+     * YEAR.
+     *
+     * Returns the year corresponding to a date.
+     * The year is returned as an integer in the range 1900-9999.
+     *
+     * Excel Function:
+     *        YEAR(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 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)
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($dateValue < 1 && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900) {
+            return 1900;
+        }
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+
+        return (int) $PHPDateObject->format('Y');
+    }
+
+    /**
+     * @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
+    {
+        // Excel does not treat 0 consistently for DAY vs. (MONTH or YEAR)
+        if (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900 && Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
+            if (is_bool($dateValue)) {
+                return (int) $dateValue;
+            }
+            if ($dateValue === null) {
+                return 0;
+            }
+            if (is_numeric($dateValue) && $dateValue < 1 && $dateValue >= 0) {
+                return 0;
+            }
+        }
+
+        return -1;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
new file mode 100644
index 000000000..1d59988c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTimeImmutable;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class DateValue
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * @param null|array|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.
+     *                         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,
+     *                        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)
+    {
+        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($dateValue ?? '', '"');
+        //    Strip any ordinals because they're allowed in Excel (English only)
+        $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);
+
+        $yearFound = false;
+        $t1 = explode(' ', $dateValue);
+        $t = '';
+        foreach ($t1 as &$t) {
+            if ((is_numeric($t)) && ($t > 31)) {
+                if ($yearFound) {
+                    return ExcelError::VALUE();
+                }
+                if ($t < 100) {
+                    $t += 1900;
+                }
+                $yearFound = true;
+            }
+        }
+        if (count($t1) === 1) {
+            //    We've been fed a time value without any date
+            return ((strpos((string) $t, ':') === false)) ? ExcelError::Value() : 0.0;
+        }
+        unset($t);
+
+        $dateValue = self::t1ToString($t1, $dti, $yearFound);
+
+        $PHPDateArray = self::setUpArray($dateValue, $dti);
+
+        return self::finalResults($PHPDateArray, $dti, $baseYear);
+    }
+
+    private static function t1ToString(array $t1, DateTimeImmutable $dti, bool $yearFound): string
+    {
+        if (count($t1) == 2) {
+            //    We only have two parts of the date: either day/month or month/year
+            if ($yearFound) {
+                array_unshift($t1, 1);
+            } else {
+                if (is_numeric($t1[1]) && $t1[1] > 29) {
+                    $t1[1] += 1900;
+                    array_unshift($t1, 1);
+                } else {
+                    $t1[] = $dti->format('Y');
+                }
+            }
+        }
+        $dateValue = implode(' ', $t1);
+
+        return $dateValue;
+    }
+
+    /**
+     * Parse date.
+     */
+    private static function setUpArray(string $dateValue, DateTimeImmutable $dti): array
+    {
+        $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.
+            $testVal1 = strtok($dateValue, '- ');
+            $testVal2 = strtok('- ');
+            $testVal3 = strtok('- ') ?: $dti->format('Y');
+            Helpers::adjustYear((string) $testVal1, (string) $testVal2, $testVal3);
+            $PHPDateArray = Helpers::dateParse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
+            if (!Helpers::dateParseSucceeded($PHPDateArray)) {
+                $PHPDateArray = Helpers::dateParse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
+            }
+        }
+
+        return $PHPDateArray;
+    }
+
+    /**
+     * Final results.
+     *
+     * @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
+     */
+    private static function finalResults(array $PHPDateArray, DateTimeImmutable $dti, int $baseYear)
+    {
+        $retValue = ExcelError::Value();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
+            // Execute function
+            Helpers::replaceIfEmpty($PHPDateArray['year'], $dti->format('Y'));
+            if ($PHPDateArray['year'] < $baseYear) {
+                return ExcelError::VALUE();
+            }
+            Helpers::replaceIfEmpty($PHPDateArray['month'], $dti->format('m'));
+            Helpers::replaceIfEmpty($PHPDateArray['day'], $dti->format('d'));
+            $PHPDateArray['hour'] = 0;
+            $PHPDateArray['minute'] = 0;
+            $PHPDateArray['second'] = 0;
+            $month = (int) $PHPDateArray['month'];
+            $day = (int) $PHPDateArray['day'];
+            $year = (int) $PHPDateArray['year'];
+            if (!checkdate($month, $day, $year)) {
+                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : ExcelError::VALUE();
+            }
+            $retValue = Helpers::returnIn3FormatsArray($PHPDateArray, true);
+        }
+
+        return $retValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
new file mode 100644
index 000000000..a3b974510
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Days
+{
+    use ArrayEnabled;
+
+    /**
+     * DAYS.
+     *
+     * Returns the number of days between two dates
+     *
+     * Excel Function:
+     *        DAYS(endDate, startDate)
+     *
+     * @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 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)
+    {
+        if (is_array($endDate) || is_array($startDate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $endDate, $startDate);
+        }
+
+        try {
+            $startDate = Helpers::getDateValue($startDate);
+            $endDate = Helpers::getDateValue($endDate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+
+        $days = ExcelError::VALUE();
+        $diff = $PHPStartDateObject->diff($PHPEndDateObject);
+        if ($diff !== false && !is_bool($diff->days)) {
+            $days = $diff->days;
+            if ($diff->invert) {
+                $days = -$days;
+            }
+        }
+
+        return $days;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
new file mode 100644
index 000000000..6f71621ea
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Days360
+{
+    use ArrayEnabled;
+
+    /**
+     * 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])
+     *
+     * @param array|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 array|mixed $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|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
+     *                                        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.
+     *                         Or can be an array of methods
+     *
+     * @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)
+    {
+        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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (!is_bool($method)) {
+            return ExcelError::VALUE();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $startDay = $PHPStartDateObject->format('j');
+        $startMonth = $PHPStartDateObject->format('n');
+        $startYear = $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+        $endDay = $PHPEndDateObject->format('j');
+        $endMonth = $PHPEndDateObject->format('n');
+        $endYear = $PHPEndDateObject->format('Y');
+
+        return self::dateDiff360((int) $startDay, (int) $startMonth, (int) $startYear, (int) $endDay, (int) $endMonth, (int) $endYear, !$method);
+    }
+
+    /**
+     * Return the number of days between two dates based on a 360 day calendar.
+     */
+    private static function dateDiff360(int $startDay, int $startMonth, int $startYear, int $endDay, int $endMonth, int $endYear, bool $methodUS): int
+    {
+        $startDay = self::getStartDay($startDay, $startMonth, $startYear, $methodUS);
+        $endDay = self::getEndDay($endDay, $endMonth, $endYear, $startDay, $methodUS);
+
+        return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
+    }
+
+    private static function getStartDay(int $startDay, int $startMonth, int $startYear, bool $methodUS): int
+    {
+        if ($startDay == 31) {
+            --$startDay;
+        } elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !Helpers::isLeapYear($startYear))))) {
+            $startDay = 30;
+        }
+
+        return $startDay;
+    }
+
+    private static function getEndDay(int $endDay, int &$endMonth, int &$endYear, int $startDay, bool $methodUS): int
+    {
+        if ($endDay == 31) {
+            if ($methodUS && $startDay != 30) {
+                $endDay = 1;
+                if ($endMonth == 12) {
+                    ++$endYear;
+                    $endMonth = 1;
+                } else {
+                    ++$endMonth;
+                }
+            } else {
+                $endDay = 30;
+            }
+        }
+
+        return $endDay;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
new file mode 100644
index 000000000..fd71c9b3d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateInterval;
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+     *                         Or can be an array of date values
+     * @param array|string $unit
+     *                         Or can be an array of unit values
+     *
+     * @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')
+    {
+        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($unit);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $startDays = (int) $PHPStartDateObject->format('j');
+        //$startMonths = (int) $PHPStartDateObject->format('n');
+        $startYears = (int) $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+        $endDays = (int) $PHPEndDateObject->format('j');
+        //$endMonths = (int) $PHPEndDateObject->format('n');
+        $endYears = (int) $PHPEndDateObject->format('Y');
+
+        $PHPDiffDateObject = $PHPEndDateObject->diff($PHPStartDateObject);
+
+        $retVal = false;
+        $retVal = self::replaceRetValue($retVal, $unit, 'D') ?? self::datedifD($difference);
+        $retVal = self::replaceRetValue($retVal, $unit, 'M') ?? self::datedifM($PHPDiffDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'MD') ?? self::datedifMD($startDays, $endDays, $PHPEndDateObject, $PHPDiffDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'Y') ?? self::datedifY($PHPDiffDateObject);
+        $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) ? ExcelError::VALUE() : $retVal;
+    }
+
+    private static function initialDiff(float $startDate, float $endDate): float
+    {
+        // Validate parameters
+        if ($startDate > $endDate) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $endDate - $startDate;
+    }
+
+    /**
+     * 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)
+    {
+        if ($retVal !== false || $unit !== $compare) {
+            return $retVal;
+        }
+
+        return null;
+    }
+
+    private static function datedifD(float $difference): int
+    {
+        return (int) $difference;
+    }
+
+    private static function datedifM(DateInterval $PHPDiffDateObject): int
+    {
+        return 12 * (int) $PHPDiffDateObject->format('%y') + (int) $PHPDiffDateObject->format('%m');
+    }
+
+    private static function datedifMD(int $startDays, int $endDays, DateTime $PHPEndDateObject, DateInterval $PHPDiffDateObject): int
+    {
+        if ($endDays < $startDays) {
+            $retVal = $endDays;
+            $PHPEndDateObject->modify('-' . $endDays . ' days');
+            $adjustDays = (int) $PHPEndDateObject->format('j');
+            $retVal += ($adjustDays - $startDays);
+        } else {
+            $retVal = (int) $PHPDiffDateObject->format('%d');
+        }
+
+        return $retVal;
+    }
+
+    private static function datedifY(DateInterval $PHPDiffDateObject): int
+    {
+        return (int) $PHPDiffDateObject->format('%y');
+    }
+
+    private static function datedifYD(float $difference, int $startYears, int $endYears, DateTime $PHPStartDateObject, DateTime $PHPEndDateObject): int
+    {
+        $retVal = (int) $difference;
+        if ($endYears > $startYears) {
+            $isLeapStartYear = $PHPStartDateObject->format('L');
+            $wasLeapEndYear = $PHPEndDateObject->format('L');
+
+            // Adjust end year to be as close as possible as start year
+            while ($PHPEndDateObject >= $PHPStartDateObject) {
+                $PHPEndDateObject->modify('-1 year');
+                //$endYears = $PHPEndDateObject->format('Y');
+            }
+            $PHPEndDateObject->modify('+1 year');
+
+            // Get the result
+            $retVal = (int) $PHPEndDateObject->diff($PHPStartDateObject)->days;
+
+            // Adjust for leap years cases
+            $isLeapEndYear = $PHPEndDateObject->format('L');
+            $limit = new DateTime($PHPEndDateObject->format('Y-02-29'));
+            if (!$isLeapStartYear && !$wasLeapEndYear && $isLeapEndYear && $PHPEndDateObject >= $limit) {
+                --$retVal;
+            }
+        }
+
+        return (int) $retVal;
+    }
+
+    private static function datedifYM(DateInterval $PHPDiffDateObject): int
+    {
+        return (int) $PHPDiffDateObject->format('%m');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
new file mode 100644
index 000000000..238451534
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
@@ -0,0 +1,307 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+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
+{
+    /**
+     * Identify if a year is a leap year or not.
+     *
+     * @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): bool
+    {
+        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
+    {
+        if (is_object($dateValue)) {
+            $retval = SharedDateHelper::PHPToExcel($dateValue);
+            if (is_bool($retval)) {
+                throw new Exception(ExcelError::VALUE());
+            }
+
+            return $retval;
+        }
+
+        self::nullFalseTrueToNumber($dateValue, $allowBool);
+        if (!is_numeric($dateValue)) {
+            $saveReturnDateType = Functions::getReturnDateType();
+            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+            $dateValue = DateValue::fromString($dateValue);
+            Functions::setReturnDateType($saveReturnDateType);
+            if (!is_numeric($dateValue)) {
+                throw new Exception(ExcelError::VALUE());
+            }
+        }
+        if ($dateValue < 0 && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return (float) $dateValue;
+    }
+
+    /**
+     * getTimeValue.
+     *
+     * @param string $timeValue
+     *
+     * @return mixed Excel date/time serial value, or string if error
+     */
+    public static function getTimeValue($timeValue)
+    {
+        $saveReturnDateType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        $timeValue = TimeValue::fromString($timeValue);
+        Functions::setReturnDateType($saveReturnDateType);
+
+        return $timeValue;
+    }
+
+    /**
+     * Adjust date by given months.
+     *
+     * @param mixed $dateValue
+     */
+    public static function adjustDateByMonths($dateValue = 0, float $adjustmentMonths = 0): DateTime
+    {
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        $oMonth = (int) $PHPDateObject->format('m');
+        $oYear = (int) $PHPDateObject->format('Y');
+
+        $adjustmentMonthsString = (string) $adjustmentMonths;
+        if ($adjustmentMonths > 0) {
+            $adjustmentMonthsString = '+' . $adjustmentMonths;
+        }
+        if ($adjustmentMonths != 0) {
+            $PHPDateObject->modify($adjustmentMonthsString . ' months');
+        }
+        $nMonth = (int) $PHPDateObject->format('m');
+        $nYear = (int) $PHPDateObject->format('Y');
+
+        $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
+        if ($monthDiff != $adjustmentMonths) {
+            $adjustDays = (int) $PHPDateObject->format('d');
+            $adjustDaysString = '-' . $adjustDays . ' days';
+            $PHPDateObject->modify($adjustDaysString);
+        }
+
+        return $PHPDateObject;
+    }
+
+    /**
+     * Help reduce perceived complexity of some tests.
+     *
+     * @param mixed $value
+     * @param mixed $altValue
+     */
+    public static function replaceIfEmpty(&$value, $altValue): void
+    {
+        $value = $value ?: $altValue;
+    }
+
+    /**
+     * Adjust year in ambiguous situations.
+     */
+    public static function adjustYear(string $testVal1, string $testVal2, string &$testVal3): void
+    {
+        if (!is_numeric($testVal1) || $testVal1 < 31) {
+            if (!is_numeric($testVal2) || $testVal2 < 12) {
+                if (is_numeric($testVal3) && $testVal3 < 12) {
+                    $testVal3 += 2000;
+                }
+            }
+        }
+    }
+
+    /**
+     * Return result in one of three formats.
+     *
+     * @return mixed
+     */
+    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false)
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
+            return new DateTime(
+                $dateArray['year']
+                . '-' . $dateArray['month']
+                . '-' . $dateArray['day']
+                . ' ' . $dateArray['hour']
+                . ':' . $dateArray['minute']
+                . ':' . $dateArray['second']
+            );
+        }
+        $excelDateValue =
+            SharedDateHelper::formattedPHPToExcel(
+                $dateArray['year'],
+                $dateArray['month'],
+                $dateArray['day'],
+                $dateArray['hour'],
+                $dateArray['minute'],
+                $dateArray['second']
+            );
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return $noFrac ? floor($excelDateValue) : (float) $excelDateValue;
+        }
+        // RETURNDATE_UNIX_TIMESTAMP)
+
+        return (int) SharedDateHelper::excelToTimestamp($excelDateValue);
+    }
+
+    /**
+     * Return result in one of three formats.
+     *
+     * @return mixed
+     */
+    public static function returnIn3FormatsFloat(float $excelDateValue)
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return $excelDateValue;
+        }
+        if ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
+            return (int) SharedDateHelper::excelToTimestamp($excelDateValue);
+        }
+        // RETURNDATE_PHP_DATETIME_OBJECT
+
+        return SharedDateHelper::excelToDateTimeObject($excelDateValue);
+    }
+
+    /**
+     * Return result in one of three formats.
+     *
+     * @return mixed
+     */
+    public static function returnIn3FormatsObject(DateTime $PHPDateObject)
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
+            return $PHPDateObject;
+        }
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return (float) SharedDateHelper::PHPToExcel($PHPDateObject);
+        }
+        // RETURNDATE_UNIX_TIMESTAMP
+        $stamp = SharedDateHelper::PHPToExcel($PHPDateObject);
+        $stamp = is_bool($stamp) ? ((int) $stamp) : $stamp;
+
+        return (int) SharedDateHelper::excelToTimestamp($stamp);
+    }
+
+    private static function baseDate(): int
+    {
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return 0;
+        }
+        if (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904) {
+            return 0;
+        }
+
+        return 1;
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @param mixed $number
+     */
+    public static function nullFalseTrueToNumber(&$number, bool $allowBool = true): void
+    {
+        $number = Functions::flattenSingleValue($number);
+        $nullVal = self::baseDate();
+        if ($number === null) {
+            $number = $nullVal;
+        } elseif ($allowBool && is_bool($number)) {
+            $number = $nullVal + (int) $number;
+        }
+    }
+
+    /**
+     * Many functions accept null argument treated as 0.
+     *
+     * @param mixed $number
+     *
+     * @return float|int
+     */
+    public static function validateNumericNull($number)
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null) {
+            return 0;
+        }
+        if (is_int($number)) {
+            return $number;
+        }
+        if (is_numeric($number)) {
+            return (float) $number;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @param mixed $number
+     *
+     * @return float
+     */
+    public static function validateNotNegative($number)
+    {
+        if (!is_numeric($number)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        if ($number >= 0) {
+            return (float) $number;
+        }
+
+        throw new Exception(ExcelError::NAN());
+    }
+
+    public static function silly1900(DateTime $PHPDateObject, string $mod = '-1 day'): void
+    {
+        $isoDate = $PHPDateObject->format('c');
+        if ($isoDate < '1900-03-01') {
+            $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($dateArray): array
+    {
+        return is_array($dateArray) ? $dateArray : ['error_count' => 1];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
new file mode 100644
index 000000000..5c42eac08
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Month
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * @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
+     * @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 array|mixed 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)
+    {
+        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
+        $PHPDateObject = Helpers::adjustDateByMonths($dateValue, $adjustmentMonths);
+
+        return Helpers::returnIn3FormatsObject($PHPDateObject);
+    }
+
+    /**
+     * 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)
+     *
+     * @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
+     * @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 array|mixed 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)
+    {
+        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
+        $PHPDateObject = Helpers::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
+        $adjustDays = (int) $PHPDateObject->format('d');
+        $adjustDaysString = '-' . $adjustDays . ' days';
+        $PHPDateObject->modify($adjustDaysString);
+
+        return Helpers::returnIn3FormatsObject($PHPDateObject);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
new file mode 100644
index 000000000..3b8942baf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
@@ -0,0 +1,119 @@
+<?php
+
+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.
+     *
+     * 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[,...]]])
+     *
+     * @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
+     *                         Or can be an array of date values
+     * @param mixed $dateArgs An array of dates (such as holidays) to exclude from the calculation
+     *
+     * @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)
+    {
+        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);
+            $eDate = Helpers::getDateValue($endDate);
+            $startDate = min($sDate, $eDate);
+            $endDate = max($sDate, $eDate);
+            //    Get the optional days
+            $dateArgs = Functions::flattenArray($dateArgs);
+            //    Test any extra holiday parameters
+            $holidayArray = [];
+            foreach ($dateArgs as $holidayDate) {
+                $holidayArray[] = Helpers::getDateValue($holidayDate);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $startDow = self::calcStartDow($startDate);
+        $endDow = self::calcEndDow($endDate);
+        $wholeWeekDays = (int) floor(($endDate - $startDate) / 7) * 5;
+        $partWeekDays = self::calcPartWeekDays($startDow, $endDow);
+
+        //    Test any extra holiday parameters
+        $holidayCountedArray = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                if ((Week::day($holidayDate, 2) < 6) && (!in_array($holidayDate, $holidayCountedArray))) {
+                    --$partWeekDays;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+        }
+
+        return self::applySign($wholeWeekDays + $partWeekDays, $sDate, $eDate);
+    }
+
+    private static function calcStartDow(float $startDate): int
+    {
+        $startDow = 6 - (int) Week::day($startDate, 2);
+        if ($startDow < 0) {
+            $startDow = 5;
+        }
+
+        return $startDow;
+    }
+
+    private static function calcEndDow(float $endDate): int
+    {
+        $endDow = (int) Week::day($endDate, 2);
+        if ($endDow >= 6) {
+            $endDow = 0;
+        }
+
+        return $endDow;
+    }
+
+    private static function calcPartWeekDays(int $startDow, int $endDow): int
+    {
+        $partWeekDays = $endDow + $startDow;
+        if ($partWeekDays > 5) {
+            $partWeekDays -= 5;
+        }
+
+        return $partWeekDays;
+    }
+
+    private static function applySign(int $result, float $sDate, float $eDate): int
+    {
+        return ($sDate > $eDate) ? -$result : $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
new file mode 100644
index 000000000..4ff71983f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
@@ -0,0 +1,130 @@
+<?php
+
+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.
+     *
+     * 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)
+     *
+     * @param array|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 array|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 array|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
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     *
+     * @return array|mixed 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)
+    {
+        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);
+            $second = self::toIntWithNullBool($second);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        self::adjustSecond($second, $minute);
+        self::adjustMinute($minute, $hour);
+
+        if ($hour > 23) {
+            $hour = $hour % 24;
+        } elseif ($hour < 0) {
+            return ExcelError::NAN();
+        }
+
+        // Execute function
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            $calendar = SharedDateHelper::getExcelCalendar();
+            $date = (int) ($calendar !== SharedDateHelper::CALENDAR_WINDOWS_1900);
+
+            return (float) SharedDateHelper::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
+        }
+        if ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
+            return (int) SharedDateHelper::excelToTimestamp(SharedDateHelper::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
+        }
+        // RETURNDATE_PHP_DATETIME_OBJECT
+        // Hour has already been normalized (0-23) above
+        $phpDateObject = new DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
+
+        return $phpDateObject;
+    }
+
+    private static function adjustSecond(int &$second, int &$minute): void
+    {
+        if ($second < 0) {
+            $minute += floor($second / 60);
+            $second = 60 - abs($second % 60);
+            if ($second == 60) {
+                $second = 0;
+            }
+        } elseif ($second >= 60) {
+            $minute += floor($second / 60);
+            $second = $second % 60;
+        }
+    }
+
+    private static function adjustMinute(int &$minute, int &$hour): void
+    {
+        if ($minute < 0) {
+            $hour += floor($minute / 60);
+            $minute = 60 - abs($minute % 60);
+            if ($minute == 60) {
+                $minute = 0;
+            }
+        } elseif ($minute >= 60) {
+            $hour += floor($minute / 60);
+            $minute = $minute % 60;
+        }
+    }
+
+    /**
+     * @param mixed $value expect int
+     */
+    private static function toIntWithNullBool($value): int
+    {
+        $value = $value ?? 0;
+        if (is_bool($value)) {
+            $value = (int) $value;
+        }
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
new file mode 100644
index 000000000..d9b99f3c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class TimeParts
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * @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 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)
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+
+        return (int) $timeValue->format('H');
+    }
+
+    /**
+     * MINUTE.
+     *
+     * Returns the minutes of a time value.
+     * The minute is given as an integer, ranging from 0 to 59.
+     *
+     * Excel 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 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)
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+
+        return (int) $timeValue->format('i');
+    }
+
+    /**
+     * SECOND.
+     *
+     * Returns the seconds of a time value.
+     * The minute is given as an integer, ranging from 0 to 59.
+     *
+     * Excel Function:
+     *        SECOND(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 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)
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+
+        return (int) $timeValue->format('s');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
new file mode 100644
index 000000000..78d67b837
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
@@ -0,0 +1,83 @@
+<?php
+
+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.
+     *
+     * 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)
+     *
+     * @param null|array|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,
+     *                        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)
+    {
+        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($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);
+            $timeValue = implode(':', $arraySplit);
+        }
+
+        $PHPDateArray = Helpers::dateParse($timeValue);
+        $retValue = ExcelError::VALUE();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
+            /** @var int */
+            $hour = $PHPDateArray['hour'];
+            /** @var int */
+            $minute = $PHPDateArray['minute'];
+            /** @var int */
+            $second = $PHPDateArray['second'];
+            // OpenOffice-specific code removed - it works just like Excel
+            $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) SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
+            } else {
+                $retValue = new DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
+            }
+        }
+
+        return $retValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
new file mode 100644
index 000000000..2f69007d1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Week
+{
+    use ArrayEnabled;
+
+    /**
+     * 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])
+     *
+     * @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
+     * @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.
+     *                                        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).
+     *                         Or can be an array of methods
+     *
+     * @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)
+    {
+        if (is_array($dateValue) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $method);
+        }
+
+        $origDateValueNull = empty($dateValue);
+
+        try {
+            $method = self::validateMethod($method);
+            if ($dateValue === null) { // boolean not allowed
+                $dateValue = (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904 || $method === Constants::DOW_SUNDAY) ? 0 : 1;
+            }
+            $dateValue = self::validateDateValue($dateValue);
+            if (!$dateValue && self::buggyWeekNum1900($method)) {
+                // This seems to be an additional Excel bug.
+                return 0;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        if ($method == Constants::STARTWEEK_MONDAY_ISO) {
+            Helpers::silly1900($PHPDateObject);
+
+            return (int) $PHPDateObject->format('W');
+        }
+        if (self::buggyWeekNum1904($method, $origDateValueNull, $PHPDateObject)) {
+            return 0;
+        }
+        Helpers::silly1900($PHPDateObject, '+ 5 years'); // 1905 calendar matches
+        $dayOfYear = (int) $PHPDateObject->format('z');
+        $PHPDateObject->modify('-' . $dayOfYear . ' days');
+        $firstDayOfFirstWeek = (int) $PHPDateObject->format('w');
+        $daysInFirstWeek = (6 - $firstDayOfFirstWeek + $method) % 7;
+        $daysInFirstWeek += 7 * !$daysInFirstWeek;
+        $endFirstWeek = $daysInFirstWeek - 1;
+        $weekOfYear = floor(($dayOfYear - $endFirstWeek + 13) / 7);
+
+        return (int) $weekOfYear;
+    }
+
+    /**
+     * ISOWEEKNUM.
+     *
+     * Returns the ISO 8601 week number of the year for a specified date.
+     *
+     * Excel Function:
+     *        ISOWEEKNUM(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 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)
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        if (self::apparentBug($dateValue)) {
+            return 52;
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        Helpers::silly1900($PHPDateObject);
+
+        return (int) $PHPDateObject->format('W');
+    }
+
+    /**
+     * 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])
+     *
+     * @param null|array|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 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)
+    {
+        if (is_array($dateValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $style);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+            $style = self::validateStyle($style);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        Helpers::silly1900($PHPDateObject);
+        $DoW = (int) $PHPDateObject->format('w');
+
+        switch ($style) {
+            case 1:
+                ++$DoW;
+
+                break;
+            case 2:
+                $DoW = self::dow0Becomes7($DoW);
+
+                break;
+            case 3:
+                $DoW = self::dow0Becomes7($DoW) - 1;
+
+                break;
+        }
+
+        return $DoW;
+    }
+
+    /**
+     * @param mixed $style expect int
+     */
+    private static function validateStyle($style): int
+    {
+        if (!is_numeric($style)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $style = (int) $style;
+        if (($style < 1) || ($style > 3)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $style;
+    }
+
+    private static function dow0Becomes7(int $DoW): int
+    {
+        return ($DoW === 0) ? 7 : $DoW;
+    }
+
+    /**
+     * @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
+    {
+        if (SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
+            if (is_bool($dateValue)) {
+                return true;
+            }
+            if (is_numeric($dateValue) && !((int) $dateValue)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Validate dateValue parameter.
+     *
+     * @param mixed $dateValue
+     */
+    private static function validateDateValue($dateValue): float
+    {
+        if (is_bool($dateValue)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return Helpers::getDateValue($dateValue);
+    }
+
+    /**
+     * Validate method parameter.
+     *
+     * @param mixed $method
+     */
+    private static function validateMethod($method): int
+    {
+        if ($method === null) {
+            $method = Constants::STARTWEEK_SUNDAY;
+        }
+
+        if (!is_numeric($method)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $method = (int) $method;
+        if (!array_key_exists($method, Constants::METHODARR)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        $method = Constants::METHODARR[$method];
+
+        return $method;
+    }
+
+    private static function buggyWeekNum1900(int $method): bool
+    {
+        return $method === Constants::DOW_SUNDAY && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900;
+    }
+
+    private static function buggyWeekNum1904(int $method, bool $origNull, DateTime $dateObject): bool
+    {
+        // 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';
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
new file mode 100644
index 000000000..1f5735e8e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class WorkDay
+{
+    use ArrayEnabled;
+
+    /**
+     * 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[,...]]])
+     *
+     * @param array|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 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.
+     *                         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 array|mixed 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)
+    {
+        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);
+            $holidayArray = array_map([Helpers::class, 'getDateValue'], Functions::flattenArray($dateArgs));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $startDate = (float) floor($startDate);
+        $endDays = (int) floor($endDays);
+        //    If endDays is 0, we always return startDate
+        if ($endDays == 0) {
+            return $startDate;
+        }
+        if ($endDays < 0) {
+            return self::decrementing($startDate, $endDays, $holidayArray);
+        }
+
+        return self::incrementing($startDate, $endDays, $holidayArray);
+    }
+
+    /**
+     * Use incrementing logic to determine Workday.
+     *
+     * @return mixed
+     */
+    private static function incrementing(float $startDate, int $endDays, array $holidayArray)
+    {
+        //    Adjust the start date if it falls over a weekend
+        $startDoW = self::getWeekDay($startDate, 3);
+        if ($startDoW >= 5) {
+            $startDate += 7 - $startDoW;
+            --$endDays;
+        }
+
+        //    Add endDays
+        $endDate = (float) $startDate + ((int) ($endDays / 5) * 7);
+        $endDays = $endDays % 5;
+        while ($endDays > 0) {
+            ++$endDate;
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDow = self::getWeekDay($endDate, 3);
+            if ($endDow >= 5) {
+                $endDate += 7 - $endDow;
+            }
+            --$endDays;
+        }
+
+        //    Test any extra holiday parameters
+        if (!empty($holidayArray)) {
+            $endDate = self::incrementingArray($startDate, $endDate, $holidayArray);
+        }
+
+        return Helpers::returnIn3FormatsFloat($endDate);
+    }
+
+    private static function incrementingArray(float $startDate, float $endDate, array $holidayArray): float
+    {
+        $holidayCountedArray = $holidayDates = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (self::getWeekDay($holidayDate, 3) < 5) {
+                $holidayDates[] = $holidayDate;
+            }
+        }
+        sort($holidayDates, SORT_NUMERIC);
+        foreach ($holidayDates as $holidayDate) {
+            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                if (!in_array($holidayDate, $holidayCountedArray)) {
+                    ++$endDate;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDoW = self::getWeekDay($endDate, 3);
+            if ($endDoW >= 5) {
+                $endDate += 7 - $endDoW;
+            }
+        }
+
+        return $endDate;
+    }
+
+    /**
+     * Use decrementing logic to determine Workday.
+     *
+     * @return mixed
+     */
+    private static function decrementing(float $startDate, int $endDays, array $holidayArray)
+    {
+        //    Adjust the start date if it falls over a weekend
+        $startDoW = self::getWeekDay($startDate, 3);
+        if ($startDoW >= 5) {
+            $startDate += -$startDoW + 4;
+            ++$endDays;
+        }
+
+        //    Add endDays
+        $endDate = (float) $startDate + ((int) ($endDays / 5) * 7);
+        $endDays = $endDays % 5;
+        while ($endDays < 0) {
+            --$endDate;
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDow = self::getWeekDay($endDate, 3);
+            if ($endDow >= 5) {
+                $endDate += 4 - $endDow;
+            }
+            ++$endDays;
+        }
+
+        //    Test any extra holiday parameters
+        if (!empty($holidayArray)) {
+            $endDate = self::decrementingArray($startDate, $endDate, $holidayArray);
+        }
+
+        return Helpers::returnIn3FormatsFloat($endDate);
+    }
+
+    private static function decrementingArray(float $startDate, float $endDate, array $holidayArray): float
+    {
+        $holidayCountedArray = $holidayDates = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (self::getWeekDay($holidayDate, 3) < 5) {
+                $holidayDates[] = $holidayDate;
+            }
+        }
+        rsort($holidayDates, SORT_NUMERIC);
+        foreach ($holidayDates as $holidayDate) {
+            if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
+                if (!in_array($holidayDate, $holidayCountedArray)) {
+                    --$endDate;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDoW = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
+            if ($endDoW >= 5) {
+                $endDate += -$endDoW + 4;
+            }
+        }
+
+        return $endDate;
+    }
+
+    private static function getWeekDay(float $date, int $wd): int
+    {
+        $result = Functions::scalar(Week::day($date, $wd));
+
+        return is_int($result) ? $result : -1;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
new file mode 100644
index 000000000..394c6b732
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
@@ -0,0 +1,133 @@
+<?php
+
+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.
+     *
+     * 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])
+     * 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
+     *                         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
+     *                         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 array|float|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)
+    {
+        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);
+            $eDate = Helpers::getDateValue($endDate);
+            $sDate = self::excelBug($sDate, $startDate, $endDate, $method);
+            $eDate = self::excelBug($eDate, $endDate, $startDate, $method);
+            $startDate = min($sDate, $eDate);
+            $endDate = max($sDate, $eDate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        switch ($method) {
+            case 0:
+                return Functions::scalar(Days360::between($startDate, $endDate)) / 360;
+            case 1:
+                return self::method1($startDate, $endDate);
+            case 2:
+                return Functions::scalar(Difference::interval($startDate, $endDate)) / 360;
+            case 3:
+                return Functions::scalar(Difference::interval($startDate, $endDate)) / 365;
+            case 4:
+                return Functions::scalar(Days360::between($startDate, $endDate, true)) / 360;
+        }
+
+        return 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
+    {
+        if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE && SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
+            if ($endDate === null && $startDate !== null) {
+                if (DateParts::month($sDate) == 12 && DateParts::day($sDate) === 31 && $method === 0) {
+                    $sDate += 2;
+                } else {
+                    ++$sDate;
+                }
+            }
+        }
+
+        return $sDate;
+    }
+
+    private static function method1(float $startDate, float $endDate): float
+    {
+        $days = Functions::scalar(Difference::interval($startDate, $endDate));
+        $startYear = (int) DateParts::year($startDate);
+        $endYear = (int) DateParts::year($endDate);
+        $years = $endYear - $startYear + 1;
+        $startMonth = (int) DateParts::month($startDate);
+        $startDay = (int) DateParts::day($startDate);
+        $endMonth = (int) DateParts::month($endDate);
+        $endDay = (int) DateParts::day($endDate);
+        $startMonthDay = 100 * $startMonth + $startDay;
+        $endMonthDay = 100 * $endMonth + $endDay;
+        if ($years == 1) {
+            $tmpCalcAnnualBasis = 365 + (int) Helpers::isLeapYear($endYear);
+        } elseif ($years == 2 && $startMonthDay >= $endMonthDay) {
+            if (Helpers::isLeapYear($startYear)) {
+                $tmpCalcAnnualBasis = 365 + (int) ($startMonthDay <= 229);
+            } elseif (Helpers::isLeapYear($endYear)) {
+                $tmpCalcAnnualBasis = 365 + (int) ($endMonthDay >= 229);
+            } else {
+                $tmpCalcAnnualBasis = 365;
+            }
+        } else {
+            $tmpCalcAnnualBasis = 0;
+            for ($year = $startYear; $year <= $endYear; ++$year) {
+                $tmpCalcAnnualBasis += 365 + (int) Helpers::isLeapYear($year);
+            }
+            $tmpCalcAnnualBasis /= $years;
+        }
+
+        return $days / $tmpCalcAnnualBasis;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
new file mode 100644
index 000000000..fae9d9009
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class ArrayArgumentHelper
+{
+    /**
+     * @var int
+     */
+    protected $indexStart = 0;
+
+    /**
+     * @var array
+     */
+    protected $arguments;
+
+    /**
+     * @var int
+     */
+    protected $argumentCount;
+
+    /**
+     * @var array
+     */
+    protected $rows;
+
+    /**
+     * @var array
+     */
+    protected $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(
+            function ($argument) {
+                return is_countable($argument) ? count($argument) : 1;
+            },
+            $arguments
+        );
+    }
+
+    private function columns(array $arguments): array
+    {
+        return array_map(
+            function ($argument) {
+                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,
+            function ($value) {
+                return $value > 1;
+            }
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
new file mode 100644
index 000000000..3e69d77ff
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class ArrayArgumentProcessor
+{
+    /**
+     * @var ArrayArgumentHelper
+     */
+    private static $arrayArgumentHelper;
+
+    /**
+     * @param mixed ...$arguments
+     */
+    public static function processArguments(
+        ArrayArgumentHelper $arrayArgumentHelper,
+        callable $method,
+        ...$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!'];
+    }
+
+    /**
+     * @param mixed ...$arguments
+     */
+    private static function evaluateVectorMatrixPair(callable $method, array $matrixIndexes, ...$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;
+    }
+
+    /**
+     * @param mixed ...$arguments
+     */
+    private static function evaluateMatrixPair(callable $method, array $matrixIndexes, ...$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;
+    }
+
+    /**
+     * @param mixed ...$arguments
+     */
+    private static function evaluateVectorPair(callable $method, int $rowIndex, int $columnIndex, ...$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.
+     *
+     * @param mixed ...$arguments
+     */
+    private static function evaluateNthArgumentAsArray(callable $method, int $nthArgument, ...$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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
new file mode 100644
index 000000000..9cd767e6a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class BranchPruner
+{
+    /**
+     * @var bool
+     */
+    protected $branchPruningEnabled = true;
+
+    /**
+     * Used to generate unique store keys.
+     *
+     * @var int
+     */
+    private $branchStoreKeyCounter = 0;
+
+    /**
+     * currently pending storeKey (last item of the storeKeysStack.
+     *
+     * @var ?string
+     */
+    protected $pendingStoreKey;
+
+    /**
+     * @var string[]
+     */
+    protected $storeKeysStack = [];
+
+    /**
+     * @var bool[]
+     */
+    protected $conditionMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected $thenMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected $elseMap = [];
+
+    /**
+     * @var int[]
+     */
+    protected $braceDepthMap = [];
+
+    /**
+     * @var null|string
+     */
+    protected $currentCondition;
+
+    /**
+     * @var null|string
+     */
+    protected $currentOnlyIf;
+
+    /**
+     * @var null|string
+     */
+    protected $currentOnlyIfNot;
+
+    /**
+     * @var null|string
+     */
+    protected $previousStoreKey;
+
+    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');
+            }
+        }
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function closingBrace($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
index 5a54d83ac..b688e0563 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
@@ -26,7 +26,7 @@ class CyclicReferenceStack
      *
      * @param mixed $value
      */
-    public function push($value)
+    public function push($value): void
     {
         $this->stack[$value] = $value;
     }
@@ -56,7 +56,7 @@ class CyclicReferenceStack
     /**
      * Clear the stack.
      */
-    public function clear()
+    public function clear(): void
     {
         $this->stack = [];
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
new file mode 100644
index 000000000..331fa448b
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
index 6793dade7..256c3effb 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
@@ -39,8 +39,6 @@ class Logger
 
     /**
      * Instantiate a Calculation engine logger.
-     *
-     * @param CyclicReferenceStack $stack
      */
     public function __construct(CyclicReferenceStack $stack)
     {
@@ -50,11 +48,11 @@ class Logger
     /**
      * Enable/Disable Calculation engine logging.
      *
-     * @param bool $pValue
+     * @param bool $writeDebugLog
      */
-    public function setWriteDebugLog($pValue)
+    public function setWriteDebugLog($writeDebugLog): void
     {
-        $this->writeDebugLog = $pValue;
+        $this->writeDebugLog = $writeDebugLog;
     }
 
     /**
@@ -70,11 +68,11 @@ class Logger
     /**
      * Enable/Disable echoing of debug log information.
      *
-     * @param bool $pValue
+     * @param bool $echoDebugLog
      */
-    public function setEchoDebugLog($pValue)
+    public function setEchoDebugLog($echoDebugLog): void
     {
-        $this->echoDebugLog = $pValue;
+        $this->echoDebugLog = $echoDebugLog;
     }
 
     /**
@@ -89,18 +87,20 @@ class Logger
 
     /**
      * Write an entry to the calculation engine debug log.
+     *
+     * @param mixed $args
      */
-    public function writeDebugLog(...$args)
+    public function writeDebugLog(string $message, ...$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 ? ' => ' : '') .
@@ -108,10 +108,24 @@ class Logger
         }
     }
 
+    /**
+     * Write a series of entries to the calculation engine debug log.
+     *
+     * @param string[] $args
+     */
+    public function mergeDebugLog(array $args): void
+    {
+        if ($this->writeDebugLog) {
+            foreach ($args as $entry) {
+                $this->writeDebugLog($entry);
+            }
+        }
+    }
+
     /**
      * Clear the calculation engine debug log.
      */
-    public function clearLog()
+    public function clearLog(): void
     {
         $this->debugLog = [];
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php
new file mode 100644
index 000000000..05264c3f1
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
new file mode 100644
index 000000000..59cc3e3d2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
@@ -0,0 +1,344 @@
+<?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;
+
+final class StructuredReference implements Operand
+{
+    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 (strpos($srStringRemainder, self::OPEN_BRACE) !== false) {
+                ++$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();
+
+        return $cellRange;
+    }
+
+    private function isRowReference(): bool
+    {
+        return strpos($this->value, '[@') !== false
+            || strpos($this->value, '[' . self::ITEM_SPECIFIER_THIS_ROW . ']') !== false;
+    }
+
+    /**
+     * @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];
+
+        $this->columns = $this->getColumns($cell, $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) {
+            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);
+        }
+
+        /** @var string $reference */
+        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
+    {
+        switch ($reference) {
+            case self::ITEM_SPECIFIER_ALL:
+            case self::ITEM_SPECIFIER_HEADERS:
+                return $this->headersRow ?? $this->firstDataRow;
+            case self::ITEM_SPECIFIER_DATA:
+                return $this->firstDataRow;
+            case self::ITEM_SPECIFIER_TOTALS:
+                return $this->totalsRow ?? $this->lastDataRow;
+        }
+
+        return $this->headersRow ?? $this->firstDataRow;
+    }
+
+    private function getMaximumRow(string $reference): int
+    {
+        switch ($reference) {
+            case self::ITEM_SPECIFIER_HEADERS:
+                return $this->headersRow ?? $this->firstDataRow;
+            case self::ITEM_SPECIFIER_DATA:
+                return $this->lastDataRow;
+            case self::ITEM_SPECIFIER_ALL:
+            case self::ITEM_SPECIFIER_TOTALS:
+                return $this->totalsRow ?? $this->lastDataRow;
+        }
+
+        return $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';
+            /** @var string $reference */
+            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;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php
index c3942b2b2..fdee7503e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php
@@ -3,769 +3,22 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
 use Complex\Complex;
-use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ComplexFunctions;
+use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ComplexOperations;
 
+/**
+ * @deprecated 1.18.0
+ */
 class Engineering
 {
     /**
      * EULER.
+     *
+     * @deprecated 1.18.0
+     *      Use Engineering\Constants::EULER instead
+     * @see Engineering\Constants::EULER
      */
-    const EULER = 2.71828182845904523536;
-
-    /**
-     * Details of the Units of measure that can be used in CONVERTUOM().
-     *
-     * @var mixed[]
-     */
-    private static $conversionUnits = [
-        'g' => ['Group' => 'Mass', 'Unit Name' => 'Gram', 'AllowPrefix' => true],
-        'sg' => ['Group' => 'Mass', 'Unit Name' => 'Slug', 'AllowPrefix' => false],
-        'lbm' => ['Group' => 'Mass', 'Unit Name' => 'Pound mass (avoirdupois)', 'AllowPrefix' => false],
-        'u' => ['Group' => 'Mass', 'Unit Name' => 'U (atomic mass unit)', 'AllowPrefix' => true],
-        'ozm' => ['Group' => 'Mass', 'Unit Name' => 'Ounce mass (avoirdupois)', 'AllowPrefix' => false],
-        'm' => ['Group' => 'Distance', 'Unit Name' => 'Meter', 'AllowPrefix' => true],
-        'mi' => ['Group' => 'Distance', 'Unit Name' => 'Statute mile', 'AllowPrefix' => false],
-        'Nmi' => ['Group' => 'Distance', 'Unit Name' => 'Nautical mile', 'AllowPrefix' => false],
-        'in' => ['Group' => 'Distance', 'Unit Name' => 'Inch', 'AllowPrefix' => false],
-        'ft' => ['Group' => 'Distance', 'Unit Name' => 'Foot', 'AllowPrefix' => false],
-        'yd' => ['Group' => 'Distance', 'Unit Name' => 'Yard', 'AllowPrefix' => false],
-        'ang' => ['Group' => 'Distance', 'Unit Name' => 'Angstrom', 'AllowPrefix' => true],
-        'Pica' => ['Group' => 'Distance', 'Unit Name' => 'Pica (1/72 in)', 'AllowPrefix' => false],
-        'yr' => ['Group' => 'Time', 'Unit Name' => 'Year', 'AllowPrefix' => false],
-        'day' => ['Group' => 'Time', 'Unit Name' => 'Day', 'AllowPrefix' => false],
-        'hr' => ['Group' => 'Time', 'Unit Name' => 'Hour', 'AllowPrefix' => false],
-        'mn' => ['Group' => 'Time', 'Unit Name' => 'Minute', 'AllowPrefix' => false],
-        'sec' => ['Group' => 'Time', 'Unit Name' => 'Second', 'AllowPrefix' => true],
-        'Pa' => ['Group' => 'Pressure', 'Unit Name' => 'Pascal', 'AllowPrefix' => true],
-        'p' => ['Group' => 'Pressure', 'Unit Name' => 'Pascal', 'AllowPrefix' => true],
-        'atm' => ['Group' => 'Pressure', 'Unit Name' => 'Atmosphere', 'AllowPrefix' => true],
-        'at' => ['Group' => 'Pressure', 'Unit Name' => 'Atmosphere', 'AllowPrefix' => true],
-        'mmHg' => ['Group' => 'Pressure', 'Unit Name' => 'mm of Mercury', 'AllowPrefix' => true],
-        'N' => ['Group' => 'Force', 'Unit Name' => 'Newton', 'AllowPrefix' => true],
-        'dyn' => ['Group' => 'Force', 'Unit Name' => 'Dyne', 'AllowPrefix' => true],
-        'dy' => ['Group' => 'Force', 'Unit Name' => 'Dyne', 'AllowPrefix' => true],
-        'lbf' => ['Group' => 'Force', 'Unit Name' => 'Pound force', 'AllowPrefix' => false],
-        'J' => ['Group' => 'Energy', 'Unit Name' => 'Joule', 'AllowPrefix' => true],
-        'e' => ['Group' => 'Energy', 'Unit Name' => 'Erg', 'AllowPrefix' => true],
-        'c' => ['Group' => 'Energy', 'Unit Name' => 'Thermodynamic calorie', 'AllowPrefix' => true],
-        'cal' => ['Group' => 'Energy', 'Unit Name' => 'IT calorie', 'AllowPrefix' => true],
-        'eV' => ['Group' => 'Energy', 'Unit Name' => 'Electron volt', 'AllowPrefix' => true],
-        'ev' => ['Group' => 'Energy', 'Unit Name' => 'Electron volt', 'AllowPrefix' => true],
-        'HPh' => ['Group' => 'Energy', 'Unit Name' => 'Horsepower-hour', 'AllowPrefix' => false],
-        'hh' => ['Group' => 'Energy', 'Unit Name' => 'Horsepower-hour', 'AllowPrefix' => false],
-        'Wh' => ['Group' => 'Energy', 'Unit Name' => 'Watt-hour', 'AllowPrefix' => true],
-        'wh' => ['Group' => 'Energy', 'Unit Name' => 'Watt-hour', 'AllowPrefix' => true],
-        'flb' => ['Group' => 'Energy', 'Unit Name' => 'Foot-pound', 'AllowPrefix' => false],
-        'BTU' => ['Group' => 'Energy', 'Unit Name' => 'BTU', 'AllowPrefix' => false],
-        'btu' => ['Group' => 'Energy', 'Unit Name' => 'BTU', 'AllowPrefix' => false],
-        'HP' => ['Group' => 'Power', 'Unit Name' => 'Horsepower', 'AllowPrefix' => false],
-        'h' => ['Group' => 'Power', 'Unit Name' => 'Horsepower', 'AllowPrefix' => false],
-        'W' => ['Group' => 'Power', 'Unit Name' => 'Watt', 'AllowPrefix' => true],
-        'w' => ['Group' => 'Power', 'Unit Name' => 'Watt', 'AllowPrefix' => true],
-        'T' => ['Group' => 'Magnetism', 'Unit Name' => 'Tesla', 'AllowPrefix' => true],
-        'ga' => ['Group' => 'Magnetism', 'Unit Name' => 'Gauss', 'AllowPrefix' => true],
-        'C' => ['Group' => 'Temperature', 'Unit Name' => 'Celsius', 'AllowPrefix' => false],
-        'cel' => ['Group' => 'Temperature', 'Unit Name' => 'Celsius', 'AllowPrefix' => false],
-        'F' => ['Group' => 'Temperature', 'Unit Name' => 'Fahrenheit', 'AllowPrefix' => false],
-        'fah' => ['Group' => 'Temperature', 'Unit Name' => 'Fahrenheit', 'AllowPrefix' => false],
-        'K' => ['Group' => 'Temperature', 'Unit Name' => 'Kelvin', 'AllowPrefix' => false],
-        'kel' => ['Group' => 'Temperature', 'Unit Name' => 'Kelvin', 'AllowPrefix' => false],
-        'tsp' => ['Group' => 'Liquid', 'Unit Name' => 'Teaspoon', 'AllowPrefix' => false],
-        'tbs' => ['Group' => 'Liquid', 'Unit Name' => 'Tablespoon', 'AllowPrefix' => false],
-        'oz' => ['Group' => 'Liquid', 'Unit Name' => 'Fluid Ounce', 'AllowPrefix' => false],
-        'cup' => ['Group' => 'Liquid', 'Unit Name' => 'Cup', 'AllowPrefix' => false],
-        'pt' => ['Group' => 'Liquid', 'Unit Name' => 'U.S. Pint', 'AllowPrefix' => false],
-        'us_pt' => ['Group' => 'Liquid', 'Unit Name' => 'U.S. Pint', 'AllowPrefix' => false],
-        'uk_pt' => ['Group' => 'Liquid', 'Unit Name' => 'U.K. Pint', 'AllowPrefix' => false],
-        'qt' => ['Group' => 'Liquid', 'Unit Name' => 'Quart', 'AllowPrefix' => false],
-        'gal' => ['Group' => 'Liquid', 'Unit Name' => 'Gallon', 'AllowPrefix' => false],
-        'l' => ['Group' => 'Liquid', 'Unit Name' => 'Litre', 'AllowPrefix' => true],
-        'lt' => ['Group' => 'Liquid', 'Unit Name' => 'Litre', 'AllowPrefix' => true],
-    ];
-
-    /**
-     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
-     *
-     * @var mixed[]
-     */
-    private static $conversionMultipliers = [
-        'Y' => ['multiplier' => 1E24, 'name' => 'yotta'],
-        'Z' => ['multiplier' => 1E21, 'name' => 'zetta'],
-        'E' => ['multiplier' => 1E18, 'name' => 'exa'],
-        'P' => ['multiplier' => 1E15, 'name' => 'peta'],
-        'T' => ['multiplier' => 1E12, 'name' => 'tera'],
-        'G' => ['multiplier' => 1E9, 'name' => 'giga'],
-        'M' => ['multiplier' => 1E6, 'name' => 'mega'],
-        'k' => ['multiplier' => 1E3, 'name' => 'kilo'],
-        'h' => ['multiplier' => 1E2, 'name' => 'hecto'],
-        'e' => ['multiplier' => 1E1, 'name' => 'deka'],
-        'd' => ['multiplier' => 1E-1, 'name' => 'deci'],
-        'c' => ['multiplier' => 1E-2, 'name' => 'centi'],
-        'm' => ['multiplier' => 1E-3, 'name' => 'milli'],
-        'u' => ['multiplier' => 1E-6, 'name' => 'micro'],
-        'n' => ['multiplier' => 1E-9, 'name' => 'nano'],
-        'p' => ['multiplier' => 1E-12, 'name' => 'pico'],
-        'f' => ['multiplier' => 1E-15, 'name' => 'femto'],
-        'a' => ['multiplier' => 1E-18, 'name' => 'atto'],
-        'z' => ['multiplier' => 1E-21, 'name' => 'zepto'],
-        'y' => ['multiplier' => 1E-24, 'name' => 'yocto'],
-    ];
-
-    /**
-     * Details of the Units of measure conversion factors, organised by group.
-     *
-     * @var mixed[]
-     */
-    private static $unitConversions = [
-        'Mass' => [
-            'g' => [
-                'g' => 1.0,
-                'sg' => 6.85220500053478E-05,
-                'lbm' => 2.20462291469134E-03,
-                'u' => 6.02217000000000E+23,
-                'ozm' => 3.52739718003627E-02,
-            ],
-            'sg' => [
-                'g' => 1.45938424189287E+04,
-                'sg' => 1.0,
-                'lbm' => 3.21739194101647E+01,
-                'u' => 8.78866000000000E+27,
-                'ozm' => 5.14782785944229E+02,
-            ],
-            'lbm' => [
-                'g' => 4.5359230974881148E+02,
-                'sg' => 3.10810749306493E-02,
-                'lbm' => 1.0,
-                'u' => 2.73161000000000E+26,
-                'ozm' => 1.60000023429410E+01,
-            ],
-            'u' => [
-                'g' => 1.66053100460465E-24,
-                'sg' => 1.13782988532950E-28,
-                'lbm' => 3.66084470330684E-27,
-                'u' => 1.0,
-                'ozm' => 5.85735238300524E-26,
-            ],
-            'ozm' => [
-                'g' => 2.83495152079732E+01,
-                'sg' => 1.94256689870811E-03,
-                'lbm' => 6.24999908478882E-02,
-                'u' => 1.70725600000000E+25,
-                'ozm' => 1.0,
-            ],
-        ],
-        'Distance' => [
-            'm' => [
-                'm' => 1.0,
-                'mi' => 6.21371192237334E-04,
-                'Nmi' => 5.39956803455724E-04,
-                'in' => 3.93700787401575E+01,
-                'ft' => 3.28083989501312E+00,
-                'yd' => 1.09361329797891E+00,
-                'ang' => 1.00000000000000E+10,
-                'Pica' => 2.83464566929116E+03,
-            ],
-            'mi' => [
-                'm' => 1.60934400000000E+03,
-                'mi' => 1.0,
-                'Nmi' => 8.68976241900648E-01,
-                'in' => 6.33600000000000E+04,
-                'ft' => 5.28000000000000E+03,
-                'yd' => 1.76000000000000E+03,
-                'ang' => 1.60934400000000E+13,
-                'Pica' => 4.56191999999971E+06,
-            ],
-            'Nmi' => [
-                'm' => 1.85200000000000E+03,
-                'mi' => 1.15077944802354E+00,
-                'Nmi' => 1.0,
-                'in' => 7.29133858267717E+04,
-                'ft' => 6.07611548556430E+03,
-                'yd' => 2.02537182785694E+03,
-                'ang' => 1.85200000000000E+13,
-                'Pica' => 5.24976377952723E+06,
-            ],
-            'in' => [
-                'm' => 2.54000000000000E-02,
-                'mi' => 1.57828282828283E-05,
-                'Nmi' => 1.37149028077754E-05,
-                'in' => 1.0,
-                'ft' => 8.33333333333333E-02,
-                'yd' => 2.77777777686643E-02,
-                'ang' => 2.54000000000000E+08,
-                'Pica' => 7.19999999999955E+01,
-            ],
-            'ft' => [
-                'm' => 3.04800000000000E-01,
-                'mi' => 1.89393939393939E-04,
-                'Nmi' => 1.64578833693305E-04,
-                'in' => 1.20000000000000E+01,
-                'ft' => 1.0,
-                'yd' => 3.33333333223972E-01,
-                'ang' => 3.04800000000000E+09,
-                'Pica' => 8.63999999999946E+02,
-            ],
-            'yd' => [
-                'm' => 9.14400000300000E-01,
-                'mi' => 5.68181818368230E-04,
-                'Nmi' => 4.93736501241901E-04,
-                'in' => 3.60000000118110E+01,
-                'ft' => 3.00000000000000E+00,
-                'yd' => 1.0,
-                'ang' => 9.14400000300000E+09,
-                'Pica' => 2.59200000085023E+03,
-            ],
-            'ang' => [
-                'm' => 1.00000000000000E-10,
-                'mi' => 6.21371192237334E-14,
-                'Nmi' => 5.39956803455724E-14,
-                'in' => 3.93700787401575E-09,
-                'ft' => 3.28083989501312E-10,
-                'yd' => 1.09361329797891E-10,
-                'ang' => 1.0,
-                'Pica' => 2.83464566929116E-07,
-            ],
-            'Pica' => [
-                'm' => 3.52777777777800E-04,
-                'mi' => 2.19205948372629E-07,
-                'Nmi' => 1.90484761219114E-07,
-                'in' => 1.38888888888898E-02,
-                'ft' => 1.15740740740748E-03,
-                'yd' => 3.85802469009251E-04,
-                'ang' => 3.52777777777800E+06,
-                'Pica' => 1.0,
-            ],
-        ],
-        'Time' => [
-            'yr' => [
-                'yr' => 1.0,
-                'day' => 365.25,
-                'hr' => 8766.0,
-                'mn' => 525960.0,
-                'sec' => 31557600.0,
-            ],
-            'day' => [
-                'yr' => 2.73785078713210E-03,
-                'day' => 1.0,
-                'hr' => 24.0,
-                'mn' => 1440.0,
-                'sec' => 86400.0,
-            ],
-            'hr' => [
-                'yr' => 1.14077116130504E-04,
-                'day' => 4.16666666666667E-02,
-                'hr' => 1.0,
-                'mn' => 60.0,
-                'sec' => 3600.0,
-            ],
-            'mn' => [
-                'yr' => 1.90128526884174E-06,
-                'day' => 6.94444444444444E-04,
-                'hr' => 1.66666666666667E-02,
-                'mn' => 1.0,
-                'sec' => 60.0,
-            ],
-            'sec' => [
-                'yr' => 3.16880878140289E-08,
-                'day' => 1.15740740740741E-05,
-                'hr' => 2.77777777777778E-04,
-                'mn' => 1.66666666666667E-02,
-                'sec' => 1.0,
-            ],
-        ],
-        'Pressure' => [
-            'Pa' => [
-                'Pa' => 1.0,
-                'p' => 1.0,
-                'atm' => 9.86923299998193E-06,
-                'at' => 9.86923299998193E-06,
-                'mmHg' => 7.50061707998627E-03,
-            ],
-            'p' => [
-                'Pa' => 1.0,
-                'p' => 1.0,
-                'atm' => 9.86923299998193E-06,
-                'at' => 9.86923299998193E-06,
-                'mmHg' => 7.50061707998627E-03,
-            ],
-            'atm' => [
-                'Pa' => 1.01324996583000E+05,
-                'p' => 1.01324996583000E+05,
-                'atm' => 1.0,
-                'at' => 1.0,
-                'mmHg' => 760.0,
-            ],
-            'at' => [
-                'Pa' => 1.01324996583000E+05,
-                'p' => 1.01324996583000E+05,
-                'atm' => 1.0,
-                'at' => 1.0,
-                'mmHg' => 760.0,
-            ],
-            'mmHg' => [
-                'Pa' => 1.33322363925000E+02,
-                'p' => 1.33322363925000E+02,
-                'atm' => 1.31578947368421E-03,
-                'at' => 1.31578947368421E-03,
-                'mmHg' => 1.0,
-            ],
-        ],
-        'Force' => [
-            'N' => [
-                'N' => 1.0,
-                'dyn' => 1.0E+5,
-                'dy' => 1.0E+5,
-                'lbf' => 2.24808923655339E-01,
-            ],
-            'dyn' => [
-                'N' => 1.0E-5,
-                'dyn' => 1.0,
-                'dy' => 1.0,
-                'lbf' => 2.24808923655339E-06,
-            ],
-            'dy' => [
-                'N' => 1.0E-5,
-                'dyn' => 1.0,
-                'dy' => 1.0,
-                'lbf' => 2.24808923655339E-06,
-            ],
-            'lbf' => [
-                'N' => 4.448222,
-                'dyn' => 4.448222E+5,
-                'dy' => 4.448222E+5,
-                'lbf' => 1.0,
-            ],
-        ],
-        'Energy' => [
-            'J' => [
-                'J' => 1.0,
-                'e' => 9.99999519343231E+06,
-                'c' => 2.39006249473467E-01,
-                'cal' => 2.38846190642017E-01,
-                'eV' => 6.24145700000000E+18,
-                'ev' => 6.24145700000000E+18,
-                'HPh' => 3.72506430801000E-07,
-                'hh' => 3.72506430801000E-07,
-                'Wh' => 2.77777916238711E-04,
-                'wh' => 2.77777916238711E-04,
-                'flb' => 2.37304222192651E+01,
-                'BTU' => 9.47815067349015E-04,
-                'btu' => 9.47815067349015E-04,
-            ],
-            'e' => [
-                'J' => 1.00000048065700E-07,
-                'e' => 1.0,
-                'c' => 2.39006364353494E-08,
-                'cal' => 2.38846305445111E-08,
-                'eV' => 6.24146000000000E+11,
-                'ev' => 6.24146000000000E+11,
-                'HPh' => 3.72506609848824E-14,
-                'hh' => 3.72506609848824E-14,
-                'Wh' => 2.77778049754611E-11,
-                'wh' => 2.77778049754611E-11,
-                'flb' => 2.37304336254586E-06,
-                'BTU' => 9.47815522922962E-11,
-                'btu' => 9.47815522922962E-11,
-            ],
-            'c' => [
-                'J' => 4.18399101363672E+00,
-                'e' => 4.18398900257312E+07,
-                'c' => 1.0,
-                'cal' => 9.99330315287563E-01,
-                'eV' => 2.61142000000000E+19,
-                'ev' => 2.61142000000000E+19,
-                'HPh' => 1.55856355899327E-06,
-                'hh' => 1.55856355899327E-06,
-                'Wh' => 1.16222030532950E-03,
-                'wh' => 1.16222030532950E-03,
-                'flb' => 9.92878733152102E+01,
-                'BTU' => 3.96564972437776E-03,
-                'btu' => 3.96564972437776E-03,
-            ],
-            'cal' => [
-                'J' => 4.18679484613929E+00,
-                'e' => 4.18679283372801E+07,
-                'c' => 1.00067013349059E+00,
-                'cal' => 1.0,
-                'eV' => 2.61317000000000E+19,
-                'ev' => 2.61317000000000E+19,
-                'HPh' => 1.55960800463137E-06,
-                'hh' => 1.55960800463137E-06,
-                'Wh' => 1.16299914807955E-03,
-                'wh' => 1.16299914807955E-03,
-                'flb' => 9.93544094443283E+01,
-                'BTU' => 3.96830723907002E-03,
-                'btu' => 3.96830723907002E-03,
-            ],
-            'eV' => [
-                'J' => 1.60219000146921E-19,
-                'e' => 1.60218923136574E-12,
-                'c' => 3.82933423195043E-20,
-                'cal' => 3.82676978535648E-20,
-                'eV' => 1.0,
-                'ev' => 1.0,
-                'HPh' => 5.96826078912344E-26,
-                'hh' => 5.96826078912344E-26,
-                'Wh' => 4.45053000026614E-23,
-                'wh' => 4.45053000026614E-23,
-                'flb' => 3.80206452103492E-18,
-                'BTU' => 1.51857982414846E-22,
-                'btu' => 1.51857982414846E-22,
-            ],
-            'ev' => [
-                'J' => 1.60219000146921E-19,
-                'e' => 1.60218923136574E-12,
-                'c' => 3.82933423195043E-20,
-                'cal' => 3.82676978535648E-20,
-                'eV' => 1.0,
-                'ev' => 1.0,
-                'HPh' => 5.96826078912344E-26,
-                'hh' => 5.96826078912344E-26,
-                'Wh' => 4.45053000026614E-23,
-                'wh' => 4.45053000026614E-23,
-                'flb' => 3.80206452103492E-18,
-                'BTU' => 1.51857982414846E-22,
-                'btu' => 1.51857982414846E-22,
-            ],
-            'HPh' => [
-                'J' => 2.68451741316170E+06,
-                'e' => 2.68451612283024E+13,
-                'c' => 6.41616438565991E+05,
-                'cal' => 6.41186757845835E+05,
-                'eV' => 1.67553000000000E+25,
-                'ev' => 1.67553000000000E+25,
-                'HPh' => 1.0,
-                'hh' => 1.0,
-                'Wh' => 7.45699653134593E+02,
-                'wh' => 7.45699653134593E+02,
-                'flb' => 6.37047316692964E+07,
-                'BTU' => 2.54442605275546E+03,
-                'btu' => 2.54442605275546E+03,
-            ],
-            'hh' => [
-                'J' => 2.68451741316170E+06,
-                'e' => 2.68451612283024E+13,
-                'c' => 6.41616438565991E+05,
-                'cal' => 6.41186757845835E+05,
-                'eV' => 1.67553000000000E+25,
-                'ev' => 1.67553000000000E+25,
-                'HPh' => 1.0,
-                'hh' => 1.0,
-                'Wh' => 7.45699653134593E+02,
-                'wh' => 7.45699653134593E+02,
-                'flb' => 6.37047316692964E+07,
-                'BTU' => 2.54442605275546E+03,
-                'btu' => 2.54442605275546E+03,
-            ],
-            'Wh' => [
-                'J' => 3.59999820554720E+03,
-                'e' => 3.59999647518369E+10,
-                'c' => 8.60422069219046E+02,
-                'cal' => 8.59845857713046E+02,
-                'eV' => 2.24692340000000E+22,
-                'ev' => 2.24692340000000E+22,
-                'HPh' => 1.34102248243839E-03,
-                'hh' => 1.34102248243839E-03,
-                'Wh' => 1.0,
-                'wh' => 1.0,
-                'flb' => 8.54294774062316E+04,
-                'BTU' => 3.41213254164705E+00,
-                'btu' => 3.41213254164705E+00,
-            ],
-            'wh' => [
-                'J' => 3.59999820554720E+03,
-                'e' => 3.59999647518369E+10,
-                'c' => 8.60422069219046E+02,
-                'cal' => 8.59845857713046E+02,
-                'eV' => 2.24692340000000E+22,
-                'ev' => 2.24692340000000E+22,
-                'HPh' => 1.34102248243839E-03,
-                'hh' => 1.34102248243839E-03,
-                'Wh' => 1.0,
-                'wh' => 1.0,
-                'flb' => 8.54294774062316E+04,
-                'BTU' => 3.41213254164705E+00,
-                'btu' => 3.41213254164705E+00,
-            ],
-            'flb' => [
-                'J' => 4.21400003236424E-02,
-                'e' => 4.21399800687660E+05,
-                'c' => 1.00717234301644E-02,
-                'cal' => 1.00649785509554E-02,
-                'eV' => 2.63015000000000E+17,
-                'ev' => 2.63015000000000E+17,
-                'HPh' => 1.56974211145130E-08,
-                'hh' => 1.56974211145130E-08,
-                'Wh' => 1.17055614802000E-05,
-                'wh' => 1.17055614802000E-05,
-                'flb' => 1.0,
-                'BTU' => 3.99409272448406E-05,
-                'btu' => 3.99409272448406E-05,
-            ],
-            'BTU' => [
-                'J' => 1.05505813786749E+03,
-                'e' => 1.05505763074665E+10,
-                'c' => 2.52165488508168E+02,
-                'cal' => 2.51996617135510E+02,
-                'eV' => 6.58510000000000E+21,
-                'ev' => 6.58510000000000E+21,
-                'HPh' => 3.93015941224568E-04,
-                'hh' => 3.93015941224568E-04,
-                'Wh' => 2.93071851047526E-01,
-                'wh' => 2.93071851047526E-01,
-                'flb' => 2.50369750774671E+04,
-                'BTU' => 1.0,
-                'btu' => 1.0,
-            ],
-            'btu' => [
-                'J' => 1.05505813786749E+03,
-                'e' => 1.05505763074665E+10,
-                'c' => 2.52165488508168E+02,
-                'cal' => 2.51996617135510E+02,
-                'eV' => 6.58510000000000E+21,
-                'ev' => 6.58510000000000E+21,
-                'HPh' => 3.93015941224568E-04,
-                'hh' => 3.93015941224568E-04,
-                'Wh' => 2.93071851047526E-01,
-                'wh' => 2.93071851047526E-01,
-                'flb' => 2.50369750774671E+04,
-                'BTU' => 1.0,
-                'btu' => 1.0,
-            ],
-        ],
-        'Power' => [
-            'HP' => [
-                'HP' => 1.0,
-                'h' => 1.0,
-                'W' => 7.45701000000000E+02,
-                'w' => 7.45701000000000E+02,
-            ],
-            'h' => [
-                'HP' => 1.0,
-                'h' => 1.0,
-                'W' => 7.45701000000000E+02,
-                'w' => 7.45701000000000E+02,
-            ],
-            'W' => [
-                'HP' => 1.34102006031908E-03,
-                'h' => 1.34102006031908E-03,
-                'W' => 1.0,
-                'w' => 1.0,
-            ],
-            'w' => [
-                'HP' => 1.34102006031908E-03,
-                'h' => 1.34102006031908E-03,
-                'W' => 1.0,
-                'w' => 1.0,
-            ],
-        ],
-        'Magnetism' => [
-            'T' => [
-                'T' => 1.0,
-                'ga' => 10000.0,
-            ],
-            'ga' => [
-                'T' => 0.0001,
-                'ga' => 1.0,
-            ],
-        ],
-        'Liquid' => [
-            'tsp' => [
-                'tsp' => 1.0,
-                'tbs' => 3.33333333333333E-01,
-                'oz' => 1.66666666666667E-01,
-                'cup' => 2.08333333333333E-02,
-                'pt' => 1.04166666666667E-02,
-                'us_pt' => 1.04166666666667E-02,
-                'uk_pt' => 8.67558516821960E-03,
-                'qt' => 5.20833333333333E-03,
-                'gal' => 1.30208333333333E-03,
-                'l' => 4.92999408400710E-03,
-                'lt' => 4.92999408400710E-03,
-            ],
-            'tbs' => [
-                'tsp' => 3.00000000000000E+00,
-                'tbs' => 1.0,
-                'oz' => 5.00000000000000E-01,
-                'cup' => 6.25000000000000E-02,
-                'pt' => 3.12500000000000E-02,
-                'us_pt' => 3.12500000000000E-02,
-                'uk_pt' => 2.60267555046588E-02,
-                'qt' => 1.56250000000000E-02,
-                'gal' => 3.90625000000000E-03,
-                'l' => 1.47899822520213E-02,
-                'lt' => 1.47899822520213E-02,
-            ],
-            'oz' => [
-                'tsp' => 6.00000000000000E+00,
-                'tbs' => 2.00000000000000E+00,
-                'oz' => 1.0,
-                'cup' => 1.25000000000000E-01,
-                'pt' => 6.25000000000000E-02,
-                'us_pt' => 6.25000000000000E-02,
-                'uk_pt' => 5.20535110093176E-02,
-                'qt' => 3.12500000000000E-02,
-                'gal' => 7.81250000000000E-03,
-                'l' => 2.95799645040426E-02,
-                'lt' => 2.95799645040426E-02,
-            ],
-            'cup' => [
-                'tsp' => 4.80000000000000E+01,
-                'tbs' => 1.60000000000000E+01,
-                'oz' => 8.00000000000000E+00,
-                'cup' => 1.0,
-                'pt' => 5.00000000000000E-01,
-                'us_pt' => 5.00000000000000E-01,
-                'uk_pt' => 4.16428088074541E-01,
-                'qt' => 2.50000000000000E-01,
-                'gal' => 6.25000000000000E-02,
-                'l' => 2.36639716032341E-01,
-                'lt' => 2.36639716032341E-01,
-            ],
-            'pt' => [
-                'tsp' => 9.60000000000000E+01,
-                'tbs' => 3.20000000000000E+01,
-                'oz' => 1.60000000000000E+01,
-                'cup' => 2.00000000000000E+00,
-                'pt' => 1.0,
-                'us_pt' => 1.0,
-                'uk_pt' => 8.32856176149081E-01,
-                'qt' => 5.00000000000000E-01,
-                'gal' => 1.25000000000000E-01,
-                'l' => 4.73279432064682E-01,
-                'lt' => 4.73279432064682E-01,
-            ],
-            'us_pt' => [
-                'tsp' => 9.60000000000000E+01,
-                'tbs' => 3.20000000000000E+01,
-                'oz' => 1.60000000000000E+01,
-                'cup' => 2.00000000000000E+00,
-                'pt' => 1.0,
-                'us_pt' => 1.0,
-                'uk_pt' => 8.32856176149081E-01,
-                'qt' => 5.00000000000000E-01,
-                'gal' => 1.25000000000000E-01,
-                'l' => 4.73279432064682E-01,
-                'lt' => 4.73279432064682E-01,
-            ],
-            'uk_pt' => [
-                'tsp' => 1.15266000000000E+02,
-                'tbs' => 3.84220000000000E+01,
-                'oz' => 1.92110000000000E+01,
-                'cup' => 2.40137500000000E+00,
-                'pt' => 1.20068750000000E+00,
-                'us_pt' => 1.20068750000000E+00,
-                'uk_pt' => 1.0,
-                'qt' => 6.00343750000000E-01,
-                'gal' => 1.50085937500000E-01,
-                'l' => 5.68260698087162E-01,
-                'lt' => 5.68260698087162E-01,
-            ],
-            'qt' => [
-                'tsp' => 1.92000000000000E+02,
-                'tbs' => 6.40000000000000E+01,
-                'oz' => 3.20000000000000E+01,
-                'cup' => 4.00000000000000E+00,
-                'pt' => 2.00000000000000E+00,
-                'us_pt' => 2.00000000000000E+00,
-                'uk_pt' => 1.66571235229816E+00,
-                'qt' => 1.0,
-                'gal' => 2.50000000000000E-01,
-                'l' => 9.46558864129363E-01,
-                'lt' => 9.46558864129363E-01,
-            ],
-            'gal' => [
-                'tsp' => 7.68000000000000E+02,
-                'tbs' => 2.56000000000000E+02,
-                'oz' => 1.28000000000000E+02,
-                'cup' => 1.60000000000000E+01,
-                'pt' => 8.00000000000000E+00,
-                'us_pt' => 8.00000000000000E+00,
-                'uk_pt' => 6.66284940919265E+00,
-                'qt' => 4.00000000000000E+00,
-                'gal' => 1.0,
-                'l' => 3.78623545651745E+00,
-                'lt' => 3.78623545651745E+00,
-            ],
-            'l' => [
-                'tsp' => 2.02840000000000E+02,
-                'tbs' => 6.76133333333333E+01,
-                'oz' => 3.38066666666667E+01,
-                'cup' => 4.22583333333333E+00,
-                'pt' => 2.11291666666667E+00,
-                'us_pt' => 2.11291666666667E+00,
-                'uk_pt' => 1.75975569552166E+00,
-                'qt' => 1.05645833333333E+00,
-                'gal' => 2.64114583333333E-01,
-                'l' => 1.0,
-                'lt' => 1.0,
-            ],
-            'lt' => [
-                'tsp' => 2.02840000000000E+02,
-                'tbs' => 6.76133333333333E+01,
-                'oz' => 3.38066666666667E+01,
-                'cup' => 4.22583333333333E+00,
-                'pt' => 2.11291666666667E+00,
-                'us_pt' => 2.11291666666667E+00,
-                'uk_pt' => 1.75975569552166E+00,
-                'qt' => 1.05645833333333E+00,
-                'gal' => 2.64114583333333E-01,
-                'l' => 1.0,
-                'lt' => 1.0,
-            ],
-        ],
-    ];
-
-    /**
-     * parseComplex.
-     *
-     * Parses a complex number into its real and imaginary parts, and an I or J suffix
-     *
-     * @deprecated 2.0.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(),
-        ];
-    }
-
-    /**
-     * Formats a number base string value with leading zeroes.
-     *
-     * @param string $xVal The "number" to pad
-     * @param int $places The length that we want to pad this value
-     *
-     * @return string The padded "number"
-     */
-    private static function nbrConversionFormat($xVal, $places)
-    {
-        if ($places !== null) {
-            if (is_numeric($places)) {
-                $places = (int) $places;
-            } else {
-                return Functions::VALUE();
-            }
-            if ($places < 0) {
-                return Functions::NAN();
-            }
-            if (strlen($xVal) <= $places) {
-                return substr(str_pad($xVal, $places, '0', STR_PAD_LEFT), -10);
-            }
-
-            return Functions::NAN();
-        }
-
-        return substr($xVal, -10);
-    }
+    public const EULER = 2.71828182845904523536;
 
     /**
      * BESSELI.
@@ -776,7 +29,9 @@ class Engineering
      *    Excel Function:
      *        BESSELI(x,ord)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BESSELI() method in the Engineering\BesselI class instead
+     * @see Engineering\BesselI::BESSELI()
      *
      * @param float $x The value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELI returns the #VALUE! error value.
@@ -785,42 +40,11 @@ class Engineering
      *                                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
+     * @return array|float|string Result, or a string containing an error
      */
     public static function BESSELI($x, $ord)
     {
-        $x = ($x === null) ? 0.0 : Functions::flattenSingleValue($x);
-        $ord = ($ord === null) ? 0.0 : Functions::flattenSingleValue($ord);
-
-        if ((is_numeric($x)) && (is_numeric($ord))) {
-            $ord = floor($ord);
-            if ($ord < 0) {
-                return Functions::NAN();
-            }
-
-            if (abs($x) <= 30) {
-                $fResult = $fTerm = pow($x / 2, $ord) / MathTrig::FACT($ord);
-                $ordK = 1;
-                $fSqrX = ($x * $x) / 4;
-                do {
-                    $fTerm *= $fSqrX;
-                    $fTerm /= ($ordK * ($ordK + $ord));
-                    $fResult += $fTerm;
-                } while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-            } else {
-                $f_2_PI = 2 * M_PI;
-
-                $fXAbs = abs($x);
-                $fResult = exp($fXAbs) / sqrt($f_2_PI * $fXAbs);
-                if (($ord & 1) && ($x < 0)) {
-                    $fResult = -$fResult;
-                }
-            }
-
-            return (is_nan($fResult)) ? Functions::NAN() : $fResult;
-        }
-
-        return Functions::VALUE();
+        return Engineering\BesselI::BESSELI($x, $ord);
     }
 
     /**
@@ -831,7 +55,9 @@ class Engineering
      *    Excel Function:
      *        BESSELJ(x,ord)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BESSELJ() method in the Engineering\BesselJ class instead
+     * @see Engineering\BesselJ::BESSELJ()
      *
      * @param float $x The value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELJ returns the #VALUE! error value.
@@ -839,80 +65,11 @@ class Engineering
      *                                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
+     * @return array|float|string Result, or a string containing an error
      */
     public static function BESSELJ($x, $ord)
     {
-        $x = ($x === null) ? 0.0 : Functions::flattenSingleValue($x);
-        $ord = ($ord === null) ? 0.0 : Functions::flattenSingleValue($ord);
-
-        if ((is_numeric($x)) && (is_numeric($ord))) {
-            $ord = floor($ord);
-            if ($ord < 0) {
-                return Functions::NAN();
-            }
-
-            $fResult = 0;
-            if (abs($x) <= 30) {
-                $fResult = $fTerm = pow($x / 2, $ord) / MathTrig::FACT($ord);
-                $ordK = 1;
-                $fSqrX = ($x * $x) / -4;
-                do {
-                    $fTerm *= $fSqrX;
-                    $fTerm /= ($ordK * ($ordK + $ord));
-                    $fResult += $fTerm;
-                } while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-            } else {
-                $f_PI_DIV_2 = M_PI / 2;
-                $f_PI_DIV_4 = M_PI / 4;
-
-                $fXAbs = abs($x);
-                $fResult = sqrt(Functions::M_2DIVPI / $fXAbs) * cos($fXAbs - $ord * $f_PI_DIV_2 - $f_PI_DIV_4);
-                if (($ord & 1) && ($x < 0)) {
-                    $fResult = -$fResult;
-                }
-            }
-
-            return (is_nan($fResult)) ? Functions::NAN() : $fResult;
-        }
-
-        return Functions::VALUE();
-    }
-
-    private static function besselK0($fNum)
-    {
-        if ($fNum <= 2) {
-            $fNum2 = $fNum * 0.5;
-            $y = ($fNum2 * $fNum2);
-            $fRet = -log($fNum2) * self::BESSELI($fNum, 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))))));
-        } else {
-            $y = 2 / $fNum;
-            $fRet = exp(-$fNum) / sqrt($fNum) *
-                (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 $fRet;
-    }
-
-    private static function besselK1($fNum)
-    {
-        if ($fNum <= 2) {
-            $fNum2 = $fNum * 0.5;
-            $y = ($fNum2 * $fNum2);
-            $fRet = log($fNum2) * self::BESSELI($fNum, 1) +
-                (1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y *
-                                    (-0.110404e-2 + $y * (-0.4686e-4))))))) / $fNum;
-        } else {
-            $y = 2 / $fNum;
-            $fRet = exp(-$fNum) / sqrt($fNum) *
-                (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 $fRet;
+        return Engineering\BesselJ::BESSELJ($x, $ord);
     }
 
     /**
@@ -924,7 +81,9 @@ class Engineering
      *    Excel Function:
      *        BESSELK(x,ord)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BESSELK() method in the Engineering\BesselK class instead
+     * @see Engineering\BesselK::BESSELK()
      *
      * @param float $x The value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
@@ -932,77 +91,11 @@ class Engineering
      *                                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
+     * @return array|float|string Result, or a string containing an error
      */
     public static function BESSELK($x, $ord)
     {
-        $x = ($x === null) ? 0.0 : Functions::flattenSingleValue($x);
-        $ord = ($ord === null) ? 0.0 : Functions::flattenSingleValue($ord);
-
-        if ((is_numeric($x)) && (is_numeric($ord))) {
-            if (($ord < 0) || ($x == 0.0)) {
-                return Functions::NAN();
-            }
-
-            switch (floor($ord)) {
-                case 0:
-                    $fBk = self::besselK0($x);
-
-                    break;
-                case 1:
-                    $fBk = self::besselK1($x);
-
-                    break;
-                default:
-                    $fTox = 2 / $x;
-                    $fBkm = self::besselK0($x);
-                    $fBk = self::besselK1($x);
-                    for ($n = 1; $n < $ord; ++$n) {
-                        $fBkp = $fBkm + $n * $fTox * $fBk;
-                        $fBkm = $fBk;
-                        $fBk = $fBkp;
-                    }
-            }
-
-            return (is_nan($fBk)) ? Functions::NAN() : $fBk;
-        }
-
-        return Functions::VALUE();
-    }
-
-    private static function besselY0($fNum)
-    {
-        if ($fNum < 8.0) {
-            $y = ($fNum * $fNum);
-            $f1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y * (-86327.92757 + $y * 228.4622733))));
-            $f2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y * (47447.26470 + $y * (226.1030244 + $y))));
-            $fRet = $f1 / $f2 + 0.636619772 * self::BESSELJ($fNum, 0) * log($fNum);
-        } else {
-            $z = 8.0 / $fNum;
-            $y = ($z * $z);
-            $xx = $fNum - 0.785398164;
-            $f1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
-            $f2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y * (-0.934945152e-7))));
-            $fRet = sqrt(0.636619772 / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
-        }
-
-        return $fRet;
-    }
-
-    private static function besselY1($fNum)
-    {
-        if ($fNum < 8.0) {
-            $y = ($fNum * $fNum);
-            $f1 = $fNum * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y * (0.7349264551e9 + $y *
-                                (-0.4237922726e7 + $y * 0.8511937935e4)))));
-            $f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
-                            (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
-            $fRet = $f1 / $f2 + 0.636619772 * (self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
-        } else {
-            $fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
-        }
-
-        return $fRet;
+        return Engineering\BesselK::BESSELK($x, $ord);
     }
 
     /**
@@ -1013,50 +106,21 @@ class Engineering
      *    Excel Function:
      *        BESSELY(x,ord)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BESSELY() method in the Engineering\BesselY class instead
+     * @see Engineering\BesselY::BESSELY()
      *
      * @param float $x The value at which to evaluate the function.
-     *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                                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, BESSELK returns the #VALUE! error value.
-     *                                If $ord < 0, BESSELK returns the #NUM! error value.
+     *                                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
+     * @return array|float|string Result, or a string containing an error
      */
     public static function BESSELY($x, $ord)
     {
-        $x = ($x === null) ? 0.0 : Functions::flattenSingleValue($x);
-        $ord = ($ord === null) ? 0.0 : Functions::flattenSingleValue($ord);
-
-        if ((is_numeric($x)) && (is_numeric($ord))) {
-            if (($ord < 0) || ($x == 0.0)) {
-                return Functions::NAN();
-            }
-
-            switch (floor($ord)) {
-                case 0:
-                    $fBy = self::besselY0($x);
-
-                    break;
-                case 1:
-                    $fBy = self::besselY1($x);
-
-                    break;
-                default:
-                    $fTox = 2 / $x;
-                    $fBym = self::besselY0($x);
-                    $fBy = self::besselY1($x);
-                    for ($n = 1; $n < $ord; ++$n) {
-                        $fByp = $n * $fTox * $fBy - $fBym;
-                        $fBym = $fBy;
-                        $fBy = $fByp;
-                    }
-            }
-
-            return (is_nan($fBy)) ? Functions::NAN() : $fBy;
-        }
-
-        return Functions::VALUE();
+        return Engineering\BesselY::BESSELY($x, $ord);
     }
 
     /**
@@ -1067,45 +131,22 @@ class Engineering
      * Excel Function:
      *        BIN2DEC(x)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toDecimal() method in the Engineering\ConvertBinary class instead
+     * @see Engineering\ConvertBinary::toDecimal()
      *
-     * @param string $x The binary number (as a string) that you want to convert. The number
+     * @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
+     * @return array|string
      */
     public static function BINTODEC($x)
     {
-        $x = Functions::flattenSingleValue($x);
-
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-            $x = floor($x);
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
-            return Functions::NAN();
-        }
-        if (strlen($x) > 10) {
-            return Functions::NAN();
-        } elseif (strlen($x) == 10) {
-            //    Two's Complement
-            $x = substr($x, -9);
-
-            return '-' . (512 - bindec($x));
-        }
-
-        return bindec($x);
+        return Engineering\ConvertBinary::toDecimal($x);
     }
 
     /**
@@ -1116,52 +157,28 @@ class Engineering
      * Excel Function:
      *        BIN2HEX(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toHex() method in the Engineering\ConvertBinary class instead
+     * @see Engineering\ConvertBinary::toHex()
      *
-     * @param string $x The binary number (as a string) that you want to convert. The number
+     * @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 int $places The number of characters to use. If places is omitted, BIN2HEX uses the
+     * @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
+     * @return array|string
      */
     public static function BINTOHEX($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        // Argument X
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-            $x = floor($x);
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
-            return Functions::NAN();
-        }
-        if (strlen($x) > 10) {
-            return Functions::NAN();
-        } elseif (strlen($x) == 10) {
-            //    Two's Complement
-            return str_repeat('F', 8) . substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
-        }
-        $hexVal = (string) strtoupper(dechex(bindec($x)));
-
-        return self::nbrConversionFormat($hexVal, $places);
+        return Engineering\ConvertBinary::toHex($x, $places);
     }
 
     /**
@@ -1172,51 +189,28 @@ class Engineering
      * Excel Function:
      *        BIN2OCT(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toOctal() method in the Engineering\ConvertBinary class instead
+     * @see Engineering\ConvertBinary::toOctal()
      *
-     * @param string $x The binary number (as a string) that you want to convert. The number
+     * @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 int $places The number of characters to use. If places is omitted, BIN2OCT uses the
+     * @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
+     * @return array|string
      */
     public static function BINTOOCT($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-            $x = floor($x);
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
-            return Functions::NAN();
-        }
-        if (strlen($x) > 10) {
-            return Functions::NAN();
-        } elseif (strlen($x) == 10) {
-            //    Two's Complement
-            return str_repeat('7', 7) . substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
-        }
-        $octVal = (string) decoct(bindec($x));
-
-        return self::nbrConversionFormat($octVal, $places);
+        return Engineering\ConvertBinary::toOctal($x, $places);
     }
 
     /**
@@ -1227,9 +221,11 @@ class Engineering
      * Excel Function:
      *        DEC2BIN(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toBinary() method in the Engineering\ConvertDecimal class instead
+     * @see Engineering\ConvertDecimal::toBinary()
      *
-     * @param string $x The decimal integer you want to convert. If number is negative,
+     * @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
@@ -1239,45 +235,18 @@ class Engineering
      *                                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
+     * @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
+     * @return array|string
      */
     public static function DECTOBIN($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
-            return Functions::VALUE();
-        }
-
-        $x = (string) floor($x);
-        if ($x < -512 || $x > 511) {
-            return Functions::NAN();
-        }
-
-        $r = decbin($x);
-        // Two's Complement
-        $r = substr($r, -10);
-        if (strlen($r) >= 11) {
-            return Functions::NAN();
-        }
-
-        return self::nbrConversionFormat($r, $places);
+        return Engineering\ConvertDecimal::toBinary($x, $places);
     }
 
     /**
@@ -1288,9 +257,11 @@ class Engineering
      * Excel Function:
      *        DEC2HEX(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toHex() method in the Engineering\ConvertDecimal class instead
+     * @see Engineering\ConvertDecimal::toHex()
      *
-     * @param string $x The decimal integer you want to convert. If number is negative,
+     * @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
@@ -1300,39 +271,18 @@ class Engineering
      *                                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
+     * @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
+     * @return array|string
      */
     public static function DECTOHEX($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
-            return Functions::VALUE();
-        }
-        $x = (string) floor($x);
-        $r = strtoupper(dechex($x));
-        if (strlen($r) == 8) {
-            //    Two's Complement
-            $r = 'FF' . $r;
-        }
-
-        return self::nbrConversionFormat($r, $places);
+        return Engineering\ConvertDecimal::toHex($x, $places);
     }
 
     /**
@@ -1343,9 +293,11 @@ class Engineering
      * Excel Function:
      *        DEC2OCT(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toOctal() method in the Engineering\ConvertDecimal class instead
+     * @see Engineering\ConvertDecimal::toOctal()
      *
-     * @param string $x The decimal integer you want to convert. If number is negative,
+     * @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
@@ -1355,40 +307,18 @@ class Engineering
      *                                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
+     * @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
+     * @return array|string
      */
     public static function DECTOOCT($x, $places = null)
     {
-        $xorig = $x;
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int) $x;
-            } else {
-                return Functions::VALUE();
-            }
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
-            return Functions::VALUE();
-        }
-        $x = (string) floor($x);
-        $r = decoct($x);
-        if (strlen($r) == 11) {
-            //    Two's Complement
-            $r = substr($r, -10);
-        }
-
-        return self::nbrConversionFormat($r, $places);
+        return Engineering\ConvertDecimal::toOctal($x, $places);
     }
 
     /**
@@ -1399,9 +329,11 @@ class Engineering
      * Excel Function:
      *        HEX2BIN(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toBinary() method in the Engineering\ConvertHex class instead
+     * @see Engineering\ConvertHex::toBinary()
      *
-     * @param string $x the hexadecimal number you want to convert.
+     * @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.
@@ -1411,29 +343,18 @@ class Engineering
      *                      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,
+     * @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
+     * @return array|string
      */
     public static function HEXTOBIN($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
-            return Functions::NAN();
-        }
-
-        return self::DECTOBIN(self::HEXTODEC($x), $places);
+        return Engineering\ConvertHex::toBinary($x, $places);
     }
 
     /**
@@ -1444,9 +365,11 @@ class Engineering
      * Excel Function:
      *        HEX2DEC(x)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toDecimal() method in the Engineering\ConvertHex class instead
+     * @see Engineering\ConvertHex::toDecimal()
      *
-     * @param string $x The hexadecimal number you want to convert. This number cannot
+     * @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
@@ -1454,37 +377,11 @@ class Engineering
      *                                If number is not a valid hexadecimal number, HEX2DEC returns the
      *                                #NUM! error value.
      *
-     * @return string
+     * @return array|string
      */
     public static function HEXTODEC($x)
     {
-        $x = Functions::flattenSingleValue($x);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
-            return Functions::NAN();
-        }
-
-        if (strlen($x) > 10) {
-            return Functions::NAN();
-        }
-
-        $binX = '';
-        foreach (str_split($x) as $char) {
-            $binX .= str_pad(base_convert($char, 16, 2), 4, '0', STR_PAD_LEFT);
-        }
-        if (strlen($binX) == 40 && $binX[0] == '1') {
-            for ($i = 0; $i < 40; ++$i) {
-                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
-            }
-
-            return (bindec($binX) + 1) * -1;
-        }
-
-        return bindec($binX);
+        return Engineering\ConvertHex::toDecimal($x);
     }
 
     /**
@@ -1495,9 +392,11 @@ class Engineering
      * Excel Function:
      *        HEX2OCT(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toOctal() method in the Engineering\ConvertHex class instead
+     * @see Engineering\ConvertHex::toOctal()
      *
-     * @param string $x The hexadecimal number you want to convert. Number cannot
+     * @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
@@ -1510,7 +409,7 @@ class Engineering
      *                                    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
+     * @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.
@@ -1518,27 +417,11 @@ class Engineering
      *                                    value.
      *                                    If places is negative, HEX2OCT returns the #NUM! error value.
      *
-     * @return string
+     * @return array|string
      */
     public static function HEXTOOCT($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
-            return Functions::NAN();
-        }
-
-        $decimal = self::HEXTODEC($x);
-        if ($decimal < -536870912 || $decimal > 536870911) {
-            return Functions::NAN();
-        }
-
-        return self::DECTOOCT($decimal, $places);
+        return Engineering\ConvertHex::toOctal($x, $places);
     }
 
     /**
@@ -1549,9 +432,11 @@ class Engineering
      * Excel Function:
      *        OCT2BIN(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toBinary() method in the Engineering\ConvertOctal class instead
+     * @see Engineering\ConvertOctal::toBinary()
      *
-     * @param string $x The octal number you want to convert. Number may not
+     * @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
@@ -1564,7 +449,7 @@ class Engineering
      *                                    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,
+     * @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).
@@ -1574,22 +459,11 @@ class Engineering
      *                                    If places is negative, OCT2BIN returns the #NUM! error
      *                                    value.
      *
-     * @return string
+     * @return array|string
      */
     public static function OCTTOBIN($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
-            return Functions::NAN();
-        }
-
-        return self::DECTOBIN(self::OCTTODEC($x), $places);
+        return Engineering\ConvertOctal::toBinary($x, $places);
     }
 
     /**
@@ -1600,9 +474,11 @@ class Engineering
      * Excel Function:
      *        OCT2DEC(x)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toDecimal() method in the Engineering\ConvertOctal class instead
+     * @see Engineering\ConvertOctal::toDecimal()
      *
-     * @param string $x The octal number you want to convert. Number may not contain
+     * @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
@@ -1610,32 +486,11 @@ class Engineering
      *                                If number is not a valid octal number, OCT2DEC returns the
      *                                #NUM! error value.
      *
-     * @return string
+     * @return array|string
      */
     public static function OCTTODEC($x)
     {
-        $x = Functions::flattenSingleValue($x);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
-            return Functions::NAN();
-        }
-        $binX = '';
-        foreach (str_split($x) as $char) {
-            $binX .= str_pad(decbin((int) $char), 3, '0', STR_PAD_LEFT);
-        }
-        if (strlen($binX) == 30 && $binX[0] == '1') {
-            for ($i = 0; $i < 30; ++$i) {
-                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
-            }
-
-            return (bindec($binX) + 1) * -1;
-        }
-
-        return bindec($binX);
+        return Engineering\ConvertOctal::toDecimal($x);
     }
 
     /**
@@ -1646,9 +501,11 @@ class Engineering
      * Excel Function:
      *        OCT2HEX(x[,places])
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the toHex() method in the Engineering\ConvertOctal class instead
+     * @see Engineering\ConvertOctal::toHex()
      *
-     * @param string $x The octal number you want to convert. Number may not contain
+     * @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
@@ -1659,30 +516,18 @@ class Engineering
      *                                    #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
+     * @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
+     * @return array|string
      */
     public static function OCTTOHEX($x, $places = null)
     {
-        $x = Functions::flattenSingleValue($x);
-        $places = Functions::flattenSingleValue($places);
-
-        if (is_bool($x)) {
-            return Functions::VALUE();
-        }
-        $x = (string) $x;
-        if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
-            return Functions::NAN();
-        }
-        $hexVal = strtoupper(dechex(self::OCTTODEC($x)));
-
-        return self::nbrConversionFormat($hexVal, $places);
+        return Engineering\ConvertOctal::toHex($x, $places);
     }
 
     /**
@@ -1693,30 +538,20 @@ class Engineering
      * Excel Function:
      *        COMPLEX(realNumber,imaginary[,suffix])
      *
-     * @category Engineering Functions
+     * @deprecated 1.18.0
+     *      Use the COMPLEX() method in the Engineering\Complex class instead
+     * @see Engineering\Complex::COMPLEX()
      *
-     * @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.
+     * @param array|float $realNumber the real coefficient of the complex number
+     * @param array|float $imaginary the imaginary coefficient of the complex number
+     * @param array|string $suffix The suffix for the imaginary component of the complex number.
      *                                        If omitted, the suffix is assumed to be "i".
      *
-     * @return string
+     * @return array|string
      */
     public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i')
     {
-        $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_numeric($realNumber)) && (is_numeric($imaginary))) &&
-            (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))
-        ) {
-            $complex = new Complex($realNumber, $imaginary, $suffix);
-
-            return (string) $complex;
-        }
-
-        return Functions::VALUE();
+        return Engineering\Complex::COMPLEX($realNumber, $imaginary, $suffix);
     }
 
     /**
@@ -1727,18 +562,18 @@ class Engineering
      * Excel Function:
      *        IMAGINARY(complexNumber)
      *
-     * @category Engineering Functions
+     * @deprecated 1.18.0
+     *      Use the IMAGINARY() method in the Engineering\Complex class instead
+     * @see Engineering\Complex::IMAGINARY()
      *
      * @param string $complexNumber the complex number for which you want the imaginary
      *                                         coefficient
      *
-     * @return float
+     * @return array|float|string
      */
     public static function IMAGINARY($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (new Complex($complexNumber))->getImaginary();
+        return Engineering\Complex::IMAGINARY($complexNumber);
     }
 
     /**
@@ -1749,17 +584,17 @@ class Engineering
      * Excel Function:
      *        IMREAL(complexNumber)
      *
-     * @category Engineering Functions
+     * @deprecated 1.18.0
+     *      Use the IMREAL() method in the Engineering\Complex class instead
+     * @see Engineering\Complex::IMREAL()
      *
      * @param string $complexNumber the complex number for which you want the real coefficient
      *
-     * @return float
+     * @return array|float|string
      */
     public static function IMREAL($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (new Complex($complexNumber))->getReal();
+        return Engineering\Complex::IMREAL($complexNumber);
     }
 
     /**
@@ -1770,15 +605,17 @@ class Engineering
      * Excel Function:
      *        IMABS(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMABS() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMABS()
+     *
      * @param string $complexNumber the complex number for which you want the absolute value
      *
-     * @return float
+     * @return array|float|string
      */
     public static function IMABS($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (new Complex($complexNumber))->abs();
+        return ComplexFunctions::IMABS($complexNumber);
     }
 
     /**
@@ -1790,20 +627,17 @@ class Engineering
      * Excel Function:
      *        IMARGUMENT(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the argument theta
+     * @deprecated 1.18.0
+     *      Use the IMARGUMENT() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMARGUMENT()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the argument theta
+     *
+     * @return array|float|string
      */
     public static function IMARGUMENT($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        $complex = new Complex($complexNumber);
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::DIV0();
-        }
-
-        return $complex->argument();
+        return ComplexFunctions::IMARGUMENT($complexNumber);
     }
 
     /**
@@ -1814,15 +648,17 @@ class Engineering
      * Excel Function:
      *        IMCONJUGATE(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the conjugate
+     * @deprecated 1.18.0
+     *      Use the IMCONJUGATE() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCONJUGATE()
      *
-     * @return string
+     * @param array|string $complexNumber the complex number for which you want the conjugate
+     *
+     * @return array|string
      */
     public static function IMCONJUGATE($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->conjugate();
+        return ComplexFunctions::IMCONJUGATE($complexNumber);
     }
 
     /**
@@ -1833,15 +669,17 @@ class Engineering
      * Excel Function:
      *        IMCOS(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cosine
+     * @deprecated 1.18.0
+     *      Use the IMCOS() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCOS()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the cosine
+     *
+     * @return array|float|string
      */
     public static function IMCOS($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->cos();
+        return ComplexFunctions::IMCOS($complexNumber);
     }
 
     /**
@@ -1852,15 +690,17 @@ class Engineering
      * Excel Function:
      *        IMCOSH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosine
+     * @deprecated 1.18.0
+     *      Use the IMCOSH() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCOSH()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosine
+     *
+     * @return array|float|string
      */
     public static function IMCOSH($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->cosh();
+        return ComplexFunctions::IMCOSH($complexNumber);
     }
 
     /**
@@ -1871,15 +711,17 @@ class Engineering
      * Excel Function:
      *        IMCOT(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cotangent
+     * @deprecated 1.18.0
+     *      Use the IMCOT() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCOT()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the cotangent
+     *
+     * @return array|float|string
      */
     public static function IMCOT($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->cot();
+        return ComplexFunctions::IMCOT($complexNumber);
     }
 
     /**
@@ -1890,15 +732,17 @@ class Engineering
      * Excel Function:
      *        IMCSC(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cosecant
+     * @deprecated 1.18.0
+     *      Use the IMCSC() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCSC()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the cosecant
+     *
+     * @return array|float|string
      */
     public static function IMCSC($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->csc();
+        return ComplexFunctions::IMCSC($complexNumber);
     }
 
     /**
@@ -1909,15 +753,17 @@ class Engineering
      * Excel Function:
      *        IMCSCH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosecant
+     * @deprecated 1.18.0
+     *      Use the IMCSCH() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMCSCH()
      *
-     * @return float|string
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosecant
+     *
+     * @return array|float|string
      */
     public static function IMCSCH($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->csch();
+        return ComplexFunctions::IMCSCH($complexNumber);
     }
 
     /**
@@ -1928,15 +774,17 @@ class Engineering
      * Excel Function:
      *        IMSIN(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSIN() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMSIN()
+     *
      * @param string $complexNumber the complex number for which you want the sine
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function IMSIN($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->sin();
+        return ComplexFunctions::IMSIN($complexNumber);
     }
 
     /**
@@ -1947,15 +795,17 @@ class Engineering
      * Excel Function:
      *        IMSINH(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSINH() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMSINH()
+     *
      * @param string $complexNumber the complex number for which you want the hyperbolic sine
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function IMSINH($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->sinh();
+        return ComplexFunctions::IMSINH($complexNumber);
     }
 
     /**
@@ -1966,15 +816,17 @@ class Engineering
      * Excel Function:
      *        IMSEC(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSEC() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMSEC()
+     *
      * @param string $complexNumber the complex number for which you want the secant
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function IMSEC($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->sec();
+        return ComplexFunctions::IMSEC($complexNumber);
     }
 
     /**
@@ -1985,15 +837,17 @@ class Engineering
      * Excel Function:
      *        IMSECH(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSECH() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMSECH()
+     *
      * @param string $complexNumber the complex number for which you want the hyperbolic secant
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function IMSECH($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->sech();
+        return ComplexFunctions::IMSECH($complexNumber);
     }
 
     /**
@@ -2004,15 +858,17 @@ class Engineering
      * Excel Function:
      *        IMTAN(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMTAN() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMTAN()
+     *
      * @param string $complexNumber the complex number for which you want the tangent
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function IMTAN($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->tan();
+        return ComplexFunctions::IMTAN($complexNumber);
     }
 
     /**
@@ -2023,20 +879,17 @@ class Engineering
      * Excel Function:
      *        IMSQRT(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSQRT() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMSQRT()
+     *
      * @param string $complexNumber the complex number for which you want the square root
      *
-     * @return string
+     * @return array|string
      */
     public static function IMSQRT($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        $theta = self::IMARGUMENT($complexNumber);
-        if ($theta === Functions::DIV0()) {
-            return '0';
-        }
-
-        return (string) (new Complex($complexNumber))->sqrt();
+        return ComplexFunctions::IMSQRT($complexNumber);
     }
 
     /**
@@ -2047,20 +900,17 @@ class Engineering
      * Excel Function:
      *        IMLN(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMLN() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMLN()
+     *
      * @param string $complexNumber the complex number for which you want the natural logarithm
      *
-     * @return string
+     * @return array|string
      */
     public static function IMLN($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        $complex = new Complex($complexNumber);
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
-        }
-
-        return (string) (new Complex($complexNumber))->ln();
+        return ComplexFunctions::IMLN($complexNumber);
     }
 
     /**
@@ -2071,20 +921,17 @@ class Engineering
      * Excel Function:
      *        IMLOG10(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMLOG10() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMLOG10()
+     *
      * @param string $complexNumber the complex number for which you want the common logarithm
      *
-     * @return string
+     * @return array|string
      */
     public static function IMLOG10($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        $complex = new Complex($complexNumber);
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
-        }
-
-        return (string) (new Complex($complexNumber))->log10();
+        return ComplexFunctions::IMLOG10($complexNumber);
     }
 
     /**
@@ -2095,20 +942,17 @@ class Engineering
      * Excel Function:
      *        IMLOG2(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMLOG2() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMLOG2()
+     *
      * @param string $complexNumber the complex number for which you want the base-2 logarithm
      *
-     * @return string
+     * @return array|string
      */
     public static function IMLOG2($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        $complex = new Complex($complexNumber);
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
-        }
-
-        return (string) (new Complex($complexNumber))->log2();
+        return ComplexFunctions::IMLOG2($complexNumber);
     }
 
     /**
@@ -2119,15 +963,17 @@ class Engineering
      * Excel Function:
      *        IMEXP(complexNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMEXP() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMEXP()
+     *
      * @param string $complexNumber the complex number for which you want the exponential
      *
-     * @return string
+     * @return array|string
      */
     public static function IMEXP($complexNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-
-        return (string) (new Complex($complexNumber))->exp();
+        return ComplexFunctions::IMEXP($complexNumber);
     }
 
     /**
@@ -2138,21 +984,18 @@ class Engineering
      * Excel Function:
      *        IMPOWER(complexNumber,realNumber)
      *
+     * @deprecated 1.18.0
+     *      Use the IMPOWER() method in the Engineering\ComplexFunctions class instead
+     * @see ComplexFunctions::IMPOWER()
+     *
      * @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
+     * @return array|string
      */
     public static function IMPOWER($complexNumber, $realNumber)
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-        $realNumber = Functions::flattenSingleValue($realNumber);
-
-        if (!is_numeric($realNumber)) {
-            return Functions::VALUE();
-        }
-
-        return (string) (new Complex($complexNumber))->pow($realNumber);
+        return ComplexFunctions::IMPOWER($complexNumber, $realNumber);
     }
 
     /**
@@ -2163,21 +1006,18 @@ class Engineering
      * Excel Function:
      *        IMDIV(complexDividend,complexDivisor)
      *
+     * @deprecated 1.18.0
+     *      Use the IMDIV() method in the Engineering\ComplexOperations class instead
+     * @see ComplexOperations::IMDIV()
+     *
      * @param string $complexDividend the complex numerator or dividend
      * @param string $complexDivisor the complex denominator or divisor
      *
-     * @return string
+     * @return array|string
      */
     public static function IMDIV($complexDividend, $complexDivisor)
     {
-        $complexDividend = Functions::flattenSingleValue($complexDividend);
-        $complexDivisor = Functions::flattenSingleValue($complexDivisor);
-
-        try {
-            return (string) (new Complex($complexDividend))->divideby(new Complex($complexDivisor));
-        } catch (ComplexException $e) {
-            return Functions::NAN();
-        }
+        return ComplexOperations::IMDIV($complexDividend, $complexDivisor);
     }
 
     /**
@@ -2188,21 +1028,18 @@ class Engineering
      * Excel Function:
      *        IMSUB(complexNumber1,complexNumber2)
      *
+     * @deprecated 1.18.0
+     *      Use the IMSUB() method in the Engineering\ComplexOperations class instead
+     * @see ComplexOperations::IMSUB()
+     *
      * @param string $complexNumber1 the complex number from which to subtract complexNumber2
      * @param string $complexNumber2 the complex number to subtract from complexNumber1
      *
-     * @return string
+     * @return array|string
      */
     public static function IMSUB($complexNumber1, $complexNumber2)
     {
-        $complexNumber1 = Functions::flattenSingleValue($complexNumber1);
-        $complexNumber2 = Functions::flattenSingleValue($complexNumber2);
-
-        try {
-            return (string) (new Complex($complexNumber1))->subtract(new Complex($complexNumber2));
-        } catch (ComplexException $e) {
-            return Functions::NAN();
-        }
+        return ComplexOperations::IMSUB($complexNumber1, $complexNumber2);
     }
 
     /**
@@ -2213,26 +1050,17 @@ class Engineering
      * Excel Function:
      *        IMSUM(complexNumber[,complexNumber[,...]])
      *
+     * @deprecated 1.18.0
+     *      Use the IMSUM() method in the Engineering\ComplexOperations class instead
+     * @see ComplexOperations::IMSUM()
+     *
      * @param string ...$complexNumbers Series of complex numbers to add
      *
      * @return string
      */
     public static function IMSUM(...$complexNumbers)
     {
-        // Return value
-        $returnValue = new Complex(0.0);
-        $aArgs = Functions::flattenArray($complexNumbers);
-
-        try {
-            // Loop through the arguments
-            foreach ($aArgs as $complex) {
-                $returnValue = $returnValue->add(new Complex($complex));
-            }
-        } catch (ComplexException $e) {
-            return Functions::NAN();
-        }
-
-        return (string) $returnValue;
+        return ComplexOperations::IMSUM(...$complexNumbers);
     }
 
     /**
@@ -2243,50 +1071,42 @@ class Engineering
      * Excel Function:
      *        IMPRODUCT(complexNumber[,complexNumber[,...]])
      *
+     * @deprecated 1.18.0
+     *      Use the IMPRODUCT() method in the Engineering\ComplexOperations class instead
+     * @see ComplexOperations::IMPRODUCT()
+     *
      * @param string ...$complexNumbers Series of complex numbers to multiply
      *
      * @return string
      */
     public static function IMPRODUCT(...$complexNumbers)
     {
-        // Return value
-        $returnValue = new Complex(1.0);
-        $aArgs = Functions::flattenArray($complexNumbers);
-
-        try {
-            // Loop through the arguments
-            foreach ($aArgs as $complex) {
-                $returnValue = $returnValue->multiply(new Complex($complex));
-            }
-        } catch (ComplexException $e) {
-            return Functions::NAN();
-        }
-
-        return (string) $returnValue;
+        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.
+     * 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
+     *      Use the DELTA() method in the Engineering\Compare class instead
+     * @see Engineering\Compare::DELTA()
+     *
      * @param float $a the first number
      * @param float $b The second number. If omitted, b is assumed to be zero.
      *
-     * @return int
+     * @return array|int|string (string in the event of an error)
      */
     public static function DELTA($a, $b = 0)
     {
-        $a = Functions::flattenSingleValue($a);
-        $b = Functions::flattenSingleValue($b);
-
-        return (int) ($a == $b);
+        return Engineering\Compare::DELTA($a, $b);
     }
 
     /**
@@ -2297,79 +1117,20 @@ class Engineering
      *
      *    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.
+     *        functions you calculate the count of values that exceed a threshold.
+     *
+     * @deprecated 1.17.0
+     *      Use the GESTEP() method in the Engineering\Compare class instead
+     * @see Engineering\Compare::GESTEP()
      *
      * @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 float $step The threshold value. If you omit a value for step, GESTEP uses zero.
      *
-     * @return int
+     * @return array|int|string (string in the event of an error)
      */
     public static function GESTEP($number, $step = 0)
     {
-        $number = Functions::flattenSingleValue($number);
-        $step = Functions::flattenSingleValue($step);
-
-        return (int) ($number >= $step);
-    }
-
-    //
-    //    Private method to calculate the erf value
-    //
-    private static $twoSqrtPi = 1.128379167095512574;
-
-    public static function erfVal($x)
-    {
-        if (abs($x) > 2.2) {
-            return 1 - self::erfcVal($x);
-        }
-        $sum = $term = $x;
-        $xsqr = ($x * $x);
-        $j = 1;
-        do {
-            $term *= $xsqr / $j;
-            $sum -= $term / (2 * $j + 1);
-            ++$j;
-            $term *= $xsqr / $j;
-            $sum += $term / (2 * $j + 1);
-            ++$j;
-            if ($sum == 0.0) {
-                break;
-            }
-        } while (abs($term / $sum) > Functions::PRECISION);
-
-        return self::$twoSqrtPi * $sum;
-    }
-
-    /**
-     * Validate arguments passed to the bitwise functions.
-     *
-     * @param mixed $value
-     *
-     * @throws Exception
-     *
-     * @return int
-     */
-    private static function validateBitwiseArgument($value)
-    {
-        $value = Functions::flattenSingleValue($value);
-
-        if (is_int($value)) {
-            return $value;
-        } elseif (is_numeric($value)) {
-            if ($value == (int) ($value)) {
-                $value = (int) ($value);
-                if (($value > pow(2, 48) - 1) || ($value < 0)) {
-                    throw new Exception(Functions::NAN());
-                }
-
-                return $value;
-            }
-
-            throw new Exception(Functions::NAN());
-        }
-
-        throw new Exception(Functions::VALUE());
+        return Engineering\Compare::GESTEP($number, $step);
     }
 
     /**
@@ -2380,23 +1141,18 @@ class Engineering
      * Excel Function:
      *        BITAND(number1, number2)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BITAND() method in the Engineering\BitWise class instead
+     * @see Engineering\BitWise::BITAND()
      *
      * @param int $number1
      * @param int $number2
      *
-     * @return int|string
+     * @return array|int|string
      */
     public static function BITAND($number1, $number2)
     {
-        try {
-            $number1 = self::validateBitwiseArgument($number1);
-            $number2 = self::validateBitwiseArgument($number2);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-        return $number1 & $number2;
+        return Engineering\BitWise::BITAND($number1, $number2);
     }
 
     /**
@@ -2407,23 +1163,18 @@ class Engineering
      * Excel Function:
      *        BITOR(number1, number2)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BITOR() method in the Engineering\BitWise class instead
+     * @see Engineering\BitWise::BITOR()
      *
      * @param int $number1
      * @param int $number2
      *
-     * @return int|string
+     * @return array|int|string
      */
     public static function BITOR($number1, $number2)
     {
-        try {
-            $number1 = self::validateBitwiseArgument($number1);
-            $number2 = self::validateBitwiseArgument($number2);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-        return $number1 | $number2;
+        return Engineering\BitWise::BITOR($number1, $number2);
     }
 
     /**
@@ -2434,23 +1185,18 @@ class Engineering
      * Excel Function:
      *        BITXOR(number1, number2)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BITXOR() method in the Engineering\BitWise class instead
+     * @see Engineering\BitWise::BITXOR()
      *
      * @param int $number1
      * @param int $number2
      *
-     * @return int|string
+     * @return array|int|string
      */
     public static function BITXOR($number1, $number2)
     {
-        try {
-            $number1 = self::validateBitwiseArgument($number1);
-            $number2 = self::validateBitwiseArgument($number2);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-        return $number1 ^ $number2;
+        return Engineering\BitWise::BITXOR($number1, $number2);
     }
 
     /**
@@ -2461,29 +1207,18 @@ class Engineering
      * Excel Function:
      *        BITLSHIFT(number, shift_amount)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BITLSHIFT() method in the Engineering\BitWise class instead
+     * @see Engineering\BitWise::BITLSHIFT()
      *
      * @param int $number
      * @param int $shiftAmount
      *
-     * @return int|string
+     * @return array|float|int|string
      */
     public static function BITLSHIFT($number, $shiftAmount)
     {
-        try {
-            $number = self::validateBitwiseArgument($number);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-        $shiftAmount = Functions::flattenSingleValue($shiftAmount);
-
-        $result = $number << $shiftAmount;
-        if ($result > pow(2, 48) - 1) {
-            return Functions::NAN();
-        }
-
-        return $result;
+        return Engineering\BitWise::BITLSHIFT($number, $shiftAmount);
     }
 
     /**
@@ -2494,24 +1229,18 @@ class Engineering
      * Excel Function:
      *        BITRSHIFT(number, shift_amount)
      *
-     * @category Engineering Functions
+     * @deprecated 1.17.0
+     *      Use the BITRSHIFT() method in the Engineering\BitWise class instead
+     * @see Engineering\BitWise::BITRSHIFT()
      *
      * @param int $number
      * @param int $shiftAmount
      *
-     * @return int|string
+     * @return array|float|int|string
      */
     public static function BITRSHIFT($number, $shiftAmount)
     {
-        try {
-            $number = self::validateBitwiseArgument($number);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-        $shiftAmount = Functions::flattenSingleValue($shiftAmount);
-
-        return $number >> $shiftAmount;
+        return Engineering\BitWise::BITRSHIFT($number, $shiftAmount);
     }
 
     /**
@@ -2527,27 +1256,19 @@ class Engineering
      *    Excel Function:
      *        ERF(lower[,upper])
      *
+     * @deprecated 1.17.0
+     *      Use the ERF() method in the Engineering\Erf class instead
+     * @see Engineering\Erf::ERF()
+     *
      * @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
+     * @return array|float|string
      */
     public static function ERF($lower, $upper = null)
     {
-        $lower = Functions::flattenSingleValue($lower);
-        $upper = Functions::flattenSingleValue($upper);
-
-        if (is_numeric($lower)) {
-            if ($upper === null) {
-                return self::erfVal($lower);
-            }
-            if (is_numeric($upper)) {
-                return self::erfVal($upper) - self::erfVal($lower);
-            }
-        }
-
-        return Functions::VALUE();
+        return Engineering\Erf::ERF($lower, $upper);
     }
 
     /**
@@ -2558,48 +1279,17 @@ class Engineering
      *    Excel Function:
      *        ERF.PRECISE(limit)
      *
+     * @deprecated 1.17.0
+     *      Use the ERFPRECISE() method in the Engineering\Erf class instead
+     * @see Engineering\Erf::ERFPRECISE()
+     *
      * @param float $limit bound for integrating ERF
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function ERFPRECISE($limit)
     {
-        $limit = Functions::flattenSingleValue($limit);
-
-        return self::ERF($limit);
-    }
-
-    //
-    //    Private method to calculate the erfc value
-    //
-    private static $oneSqrtPi = 0.564189583547756287;
-
-    private static function erfcVal($x)
-    {
-        if (abs($x) < 2.2) {
-            return 1 - self::erfVal($x);
-        }
-        if ($x < 0) {
-            return 2 - self::ERFC(-$x);
-        }
-        $a = $n = 1;
-        $b = $c = $x;
-        $d = ($x * $x) + 0.5;
-        $q1 = $q2 = $b / $d;
-        $t = 0;
-        do {
-            $t = $a * $n + $b * $x;
-            $a = $b;
-            $b = $t;
-            $t = $c * $n + $d * $x;
-            $c = $d;
-            $d = $t;
-            $n += 0.5;
-            $q1 = $q2;
-            $q2 = $b / $d;
-        } while ((abs($q1 - $q2) / $q2) > Functions::PRECISION);
-
-        return self::$oneSqrtPi * exp(-$x * $x) * $q2;
+        return Engineering\Erf::ERFPRECISE($limit);
     }
 
     /**
@@ -2615,88 +1305,97 @@ class Engineering
      *    Excel Function:
      *        ERFC(x)
      *
+     * @deprecated 1.17.0
+     *      Use the ERFC() method in the Engineering\ErfC class instead
+     * @see Engineering\ErfC::ERFC()
+     *
      * @param float $x The lower bound for integrating ERFC
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function ERFC($x)
     {
-        $x = Functions::flattenSingleValue($x);
-
-        if (is_numeric($x)) {
-            return self::erfcVal($x);
-        }
-
-        return Functions::VALUE();
+        return Engineering\ErfC::ERFC($x);
     }
 
     /**
      *    getConversionGroups
      * Returns a list of the different conversion groups for UOM conversions.
      *
+     * @deprecated 1.16.0
+     *      Use the getConversionCategories() method in the Engineering\ConvertUOM class instead
+     * @see Engineering\ConvertUOM::getConversionCategories()
+     *
      * @return array
      */
     public static function getConversionGroups()
     {
-        $conversionGroups = [];
-        foreach (self::$conversionUnits as $conversionUnit) {
-            $conversionGroups[] = $conversionUnit['Group'];
-        }
-
-        return array_merge(array_unique($conversionGroups));
+        return Engineering\ConvertUOM::getConversionCategories();
     }
 
     /**
      *    getConversionGroupUnits
      * Returns an array of units of measure, for a specified conversion group, or for all groups.
      *
-     * @param string $group The group whose units of measure you want to retrieve
+     * @deprecated 1.16.0
+     *      Use the getConversionCategoryUnits() method in the ConvertUOM class instead
+     * @see Engineering\ConvertUOM::getConversionCategoryUnits()
+     *
+     * @param null|mixed $category
      *
      * @return array
      */
-    public static function getConversionGroupUnits($group = null)
+    public static function getConversionGroupUnits($category = null)
     {
-        $conversionGroups = [];
-        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
-            if (($group === null) || ($conversionGroup['Group'] == $group)) {
-                $conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
-            }
-        }
-
-        return $conversionGroups;
+        return Engineering\ConvertUOM::getConversionCategoryUnits($category);
     }
 
     /**
      * getConversionGroupUnitDetails.
      *
-     * @param string $group The group whose units of measure you want to retrieve
+     * @deprecated 1.16.0
+     *      Use the getConversionCategoryUnitDetails() method in the ConvertUOM class instead
+     * @see Engineering\ConvertUOM::getConversionCategoryUnitDetails()
+     *
+     * @param null|mixed $category
      *
      * @return array
      */
-    public static function getConversionGroupUnitDetails($group = null)
+    public static function getConversionGroupUnitDetails($category = null)
     {
-        $conversionGroups = [];
-        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
-            if (($group === null) || ($conversionGroup['Group'] == $group)) {
-                $conversionGroups[$conversionGroup['Group']][] = [
-                    'unit' => $conversionUnit,
-                    'description' => $conversionGroup['Unit Name'],
-                ];
-            }
-        }
-
-        return $conversionGroups;
+        return Engineering\ConvertUOM::getConversionCategoryUnitDetails($category);
     }
 
     /**
      *    getConversionMultipliers
      * Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
      *
-     * @return array of mixed
+     * @deprecated 1.16.0
+     *      Use the getConversionMultipliers() method in the ConvertUOM class instead
+     * @see Engineering\ConvertUOM::getConversionMultipliers()
+     *
+     * @return mixed[]
      */
     public static function getConversionMultipliers()
     {
-        return self::$conversionMultipliers;
+        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
+     *      Use the getBinaryConversionMultipliers() method in the ConvertUOM class instead
+     * @see Engineering\ConvertUOM::getBinaryConversionMultipliers()
+     *
+     * @return mixed[]
+     */
+    public static function getBinaryConversionMultipliers()
+    {
+        return Engineering\ConvertUOM::getBinaryConversionMultipliers();
     }
 
     /**
@@ -2709,99 +1408,18 @@ class Engineering
      *    Excel Function:
      *        CONVERT(value,fromUOM,toUOM)
      *
-     * @param float $value the value in fromUOM to convert
+     * @deprecated 1.16.0
+     *      Use the CONVERT() method in the ConvertUOM class instead
+     * @see Engineering\ConvertUOM::CONVERT()
+     *
+     * @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
+     * @return array|float|string
      */
     public static function CONVERTUOM($value, $fromUOM, $toUOM)
     {
-        $value = Functions::flattenSingleValue($value);
-        $fromUOM = Functions::flattenSingleValue($fromUOM);
-        $toUOM = Functions::flattenSingleValue($toUOM);
-
-        if (!is_numeric($value)) {
-            return Functions::VALUE();
-        }
-        $fromMultiplier = 1.0;
-        if (isset(self::$conversionUnits[$fromUOM])) {
-            $unitGroup1 = self::$conversionUnits[$fromUOM]['Group'];
-        } else {
-            $fromMultiplier = substr($fromUOM, 0, 1);
-            $fromUOM = substr($fromUOM, 1);
-            if (isset(self::$conversionMultipliers[$fromMultiplier])) {
-                $fromMultiplier = self::$conversionMultipliers[$fromMultiplier]['multiplier'];
-            } else {
-                return Functions::NA();
-            }
-            if ((isset(self::$conversionUnits[$fromUOM])) && (self::$conversionUnits[$fromUOM]['AllowPrefix'])) {
-                $unitGroup1 = self::$conversionUnits[$fromUOM]['Group'];
-            } else {
-                return Functions::NA();
-            }
-        }
-        $value *= $fromMultiplier;
-
-        $toMultiplier = 1.0;
-        if (isset(self::$conversionUnits[$toUOM])) {
-            $unitGroup2 = self::$conversionUnits[$toUOM]['Group'];
-        } else {
-            $toMultiplier = substr($toUOM, 0, 1);
-            $toUOM = substr($toUOM, 1);
-            if (isset(self::$conversionMultipliers[$toMultiplier])) {
-                $toMultiplier = self::$conversionMultipliers[$toMultiplier]['multiplier'];
-            } else {
-                return Functions::NA();
-            }
-            if ((isset(self::$conversionUnits[$toUOM])) && (self::$conversionUnits[$toUOM]['AllowPrefix'])) {
-                $unitGroup2 = self::$conversionUnits[$toUOM]['Group'];
-            } else {
-                return Functions::NA();
-            }
-        }
-        if ($unitGroup1 != $unitGroup2) {
-            return Functions::NA();
-        }
-
-        if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
-            //    We've already factored $fromMultiplier into the value, so we need
-            //        to reverse it again
-            return $value / $fromMultiplier;
-        } elseif ($unitGroup1 == 'Temperature') {
-            if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
-                if (($toUOM == 'F') || ($toUOM == 'fah')) {
-                    return $value;
-                }
-                $value = (($value - 32) / 1.8);
-                if (($toUOM == 'K') || ($toUOM == 'kel')) {
-                    $value += 273.15;
-                }
-
-                return $value;
-            } elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
-                (($toUOM == 'K') || ($toUOM == 'kel'))
-            ) {
-                return $value;
-            } elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
-                (($toUOM == 'C') || ($toUOM == 'cel'))
-            ) {
-                return $value;
-            }
-            if (($toUOM == 'F') || ($toUOM == 'fah')) {
-                if (($fromUOM == 'K') || ($fromUOM == 'kel')) {
-                    $value -= 273.15;
-                }
-
-                return ($value * 1.8) + 32;
-            }
-            if (($toUOM == 'C') || ($toUOM == 'cel')) {
-                return $value - 273.15;
-            }
-
-            return $value + 273.15;
-        }
-
-        return ($value * self::$unitConversions[$unitGroup1][$fromUOM][$toUOM]) / $toMultiplier;
+        return Engineering\ConvertUOM::CONVERT($value, $fromUOM, $toUOM);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
new file mode 100644
index 000000000..1134574e4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselI
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * NOTE: The MS Excel implementation of the BESSELI function is still not accurate.
+     *       This code provides a more accurate calculation
+     *
+     * @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 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)
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($ord < 0) {
+            return ExcelError::NAN();
+        }
+
+        $fResult = self::calculate($x, $ord);
+
+        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);
+    }
+
+    private static function besselI0(float $x): float
+    {
+        $ax = abs($x);
+
+        if ($ax < 3.75) {
+            $y = $x / 3.75;
+            $y = $y * $y;
+
+            return 1.0 + $y * (3.5156229 + $y * (3.0899424 + $y * (1.2067492
+                                + $y * (0.2659732 + $y * (0.360768e-1 + $y * 0.45813e-2)))));
+        }
+
+        $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))))))));
+    }
+
+    private static function besselI1(float $x): float
+    {
+        $ax = abs($x);
+
+        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))))));
+
+            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 *= exp($ax) / sqrt($ax);
+
+        return ($x < 0.0) ? -$ans : $ans;
+    }
+
+    /**
+     * Sop to Scrutinizer.
+     *
+     * @var float
+     */
+    private static $zeroPointZero = 0.0;
+
+    private static function besselI2(float $x, int $ord): float
+    {
+        if ($x === self::$zeroPointZero) {
+            return 0.0;
+        }
+
+        $tox = 2.0 / abs($x);
+        $bip = 0;
+        $ans = 0.0;
+        $bi = 1.0;
+
+        for ($j = 2 * ($ord + (int) sqrt(40.0 * $ord)); $j > 0; --$j) {
+            $bim = $bip + $j * $tox * $bi;
+            $bip = $bi;
+            $bi = $bim;
+
+            if (abs($bi) > 1.0e+12) {
+                $ans *= 1.0e-12;
+                $bi *= 1.0e-12;
+                $bip *= 1.0e-12;
+            }
+
+            if ($j === $ord) {
+                $ans = $bip;
+            }
+        }
+
+        $ans *= self::besselI0($x) / $bi;
+
+        return ($x < 0.0 && (($ord % 2) === 1)) ? -$ans : $ans;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
new file mode 100644
index 000000000..457c74d6a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselJ
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELJ.
+     *
+     *    Returns the Bessel function
+     *
+     *    Excel Function:
+     *        BESSELJ(x,ord)
+     *
+     * NOTE: The MS Excel implementation of the BESSELJ function is still not accurate, particularly for higher order
+     *       values with x < -8 and x > 8. This code provides a more accurate calculation
+     *
+     * @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 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)
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($ord < 0) {
+            return ExcelError::NAN();
+        }
+
+        $fResult = self::calculate($x, $ord);
+
+        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);
+    }
+
+    private static function besselJ0(float $x): float
+    {
+        $ax = abs($x);
+
+        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))));
+
+            return $ans1 / $ans2;
+        }
+
+        $z = 8.0 / $ax;
+        $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)));
+
+        return sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
+    }
+
+    private static function besselJ1(float $x): float
+    {
+        $ax = abs($x);
+
+        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))));
+
+            return $ans1 / $ans2;
+        }
+
+        $z = 8.0 / $ax;
+        $y = $z * $z;
+        $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)));
+        $ans = sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
+
+        return ($x < 0.0) ? -$ans : $ans;
+    }
+
+    private static function besselJ2(float $x, int $ord): float
+    {
+        $ax = abs($x);
+        if ($ax === 0.0) {
+            return 0.0;
+        }
+
+        if ($ax > $ord) {
+            return self::besselj2a($ax, $ord, $x);
+        }
+
+        return self::besselj2b($ax, $ord, $x);
+    }
+
+    private static function besselj2a(float $ax, int $ord, float $x): float
+    {
+        $tox = 2.0 / $ax;
+        $bjm = self::besselJ0($ax);
+        $bj = self::besselJ1($ax);
+        for ($j = 1; $j < $ord; ++$j) {
+            $bjp = $j * $tox * $bj - $bjm;
+            $bjm = $bj;
+            $bj = $bjp;
+        }
+        $ans = $bj;
+
+        return ($x < 0.0 && ($ord % 2) == 1) ? -$ans : $ans;
+    }
+
+    private static function besselj2b(float $ax, int $ord, float $x): float
+    {
+        $tox = 2.0 / $ax;
+        $jsum = false;
+        $bjp = $ans = $sum = 0.0;
+        $bj = 1.0;
+        for ($j = 2 * ($ord + (int) sqrt(40.0 * $ord)); $j > 0; --$j) {
+            $bjm = $j * $tox * $bj - $bjp;
+            $bjp = $bj;
+            $bj = $bjm;
+            if (abs($bj) > 1.0e+10) {
+                $bj *= 1.0e-10;
+                $bjp *= 1.0e-10;
+                $ans *= 1.0e-10;
+                $sum *= 1.0e-10;
+            }
+            if ($jsum === true) {
+                $sum += $bj;
+            }
+            $jsum = $jsum === false;
+            if ($j === $ord) {
+                $ans = $bjp;
+            }
+        }
+        $sum = 2.0 * $sum - $bj;
+        $ans /= $sum;
+
+        return ($x < 0.0 && ($ord % 2) === 1) ? -$ans : $ans;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
new file mode 100644
index 000000000..2d21e7529
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
@@ -0,0 +1,135 @@
+<?php
+
+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.
+     *
+     *    Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
+     *        for purely imaginary arguments.
+     *
+     *    Excel Function:
+     *        BESSELK(x,ord)
+     *
+     * @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 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)
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($ord < 0) || ($x <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        $fBk = self::calculate($x, $ord);
+
+        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 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 $rslt;
+    }
+
+    private static function besselK0(float $x): float
+    {
+        if ($x <= 2) {
+            $fNum2 = $x * 0.5;
+            $y = ($fNum2 * $fNum2);
+
+            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))))));
+    }
+
+    private static function besselK1(float $x): float
+    {
+        if ($x <= 2) {
+            $fNum2 = $x * 0.5;
+            $y = ($fNum2 * $fNum2);
+
+            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)))))));
+    }
+
+    private static function besselK2(float $x, int $ord): float
+    {
+        $fTox = 2 / $x;
+        $fBkm = self::besselK0($x);
+        $fBk = self::besselK1($x);
+        for ($n = 1; $n < $ord; ++$n) {
+            $fBkp = $fBkm + $n * $fTox * $fBk;
+            $fBkm = $fBk;
+            $fBk = $fBkp;
+        }
+
+        return $fBk;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
new file mode 100644
index 000000000..31d9694a7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselY
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELY.
+     *
+     * Returns the Bessel function, which is also called the Weber function or the Neumann function.
+     *
+     *    Excel Function:
+     *        BESSELY(x,ord)
+     *
+     * @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 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)
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($ord < 0) || ($x <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        $fBy = self::calculate($x, $ord);
+
+        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 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 $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))));
+
+            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))));
+
+        return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
+    }
+
+    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)))));
+
+            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)));
+
+        return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
+    }
+
+    private static function besselY2(float $x, int $ord): float
+    {
+        $fTox = 2.0 / $x;
+        $fBym = self::besselY0($x);
+        $fBy = self::besselY1($x);
+        for ($n = 1; $n < $ord; ++$n) {
+            $fByp = $n * $fTox * $fBy - $fBym;
+            $fBym = $fBy;
+            $fBy = $fByp;
+        }
+
+        return $fBy;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
new file mode 100644
index 000000000..0362649a1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
@@ -0,0 +1,277 @@
+<?php
+
+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
+    {
+        return [(int) floor($number / self::SPLIT_DIVISOR), (int) fmod($number, self::SPLIT_DIVISOR)];
+    }
+
+    /**
+     * BITAND.
+     *
+     * Returns the bitwise AND of two integer values.
+     *
+     * Excel Function:
+     *        BITAND(number1, number2)
+     *
+     * @param array|int $number1
+     *                      Or can be an array of values
+     * @param array|int $number2
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return  self::SPLIT_DIVISOR * ($split1[0] & $split2[0]) + ($split1[1] & $split2[1]);
+    }
+
+    /**
+     * BITOR.
+     *
+     * Returns the bitwise OR of two integer values.
+     *
+     * Excel Function:
+     *        BITOR(number1, number2)
+     *
+     * @param array|int $number1
+     *                      Or can be an array of values
+     * @param array|int $number2
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return  self::SPLIT_DIVISOR * ($split1[0] | $split2[0]) + ($split1[1] | $split2[1]);
+    }
+
+    /**
+     * BITXOR.
+     *
+     * Returns the bitwise XOR of two integer values.
+     *
+     * Excel Function:
+     *        BITXOR(number1, number2)
+     *
+     * @param array|int $number1
+     *                      Or can be an array of values
+     * @param array|int $number2
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return  self::SPLIT_DIVISOR * ($split1[0] ^ $split2[0]) + ($split1[1] ^ $split2[1]);
+    }
+
+    /**
+     * BITLSHIFT.
+     *
+     * Returns the number value shifted left by shift_amount bits.
+     *
+     * Excel Function:
+     *        BITLSHIFT(number, shift_amount)
+     *
+     * @param array|int $number
+     *                      Or can be an array of values
+     * @param array|int $shiftAmount
+     *                      Or can be an array of values
+     *
+     * @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 BITLSHIFT($number, $shiftAmount)
+    {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
+        try {
+            $number = self::validateBitwiseArgument($number);
+            $shiftAmount = self::validateShiftAmount($shiftAmount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $result = floor($number * (2 ** $shiftAmount));
+        if ($result > 2 ** 48 - 1) {
+            return ExcelError::NAN();
+        }
+
+        return $result;
+    }
+
+    /**
+     * BITRSHIFT.
+     *
+     * Returns the number value shifted right by shift_amount bits.
+     *
+     * Excel Function:
+     *        BITRSHIFT(number, shift_amount)
+     *
+     * @param array|int $number
+     *                      Or can be an array of values
+     * @param array|int $shiftAmount
+     *                      Or can be an array of values
+     *
+     * @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 BITRSHIFT($number, $shiftAmount)
+    {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
+        try {
+            $number = self::validateBitwiseArgument($number);
+            $shiftAmount = self::validateShiftAmount($shiftAmount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $result = floor($number / (2 ** $shiftAmount));
+        if ($result > 2 ** 48 - 1) { // possible because shiftAmount can be negative
+            return ExcelError::NAN();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate arguments passed to the bitwise functions.
+     *
+     * @param mixed $value
+     *
+     * @return float
+     */
+    private static function validateBitwiseArgument($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(ExcelError::NAN());
+                }
+
+                return floor($value);
+            }
+
+            throw new Exception(ExcelError::NAN());
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Validate arguments passed to the bitwise functions.
+     *
+     * @param mixed $value
+     *
+     * @return int
+     */
+    private static function validateShiftAmount($value)
+    {
+        $value = self::nullFalseTrueToNumber($value);
+
+        if (is_numeric($value)) {
+            if (abs($value) > 53) {
+                throw new Exception(ExcelError::NAN());
+            }
+
+            return (int) $value;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @param mixed $number
+     *
+     * @return mixed
+     */
+    private static function nullFalseTrueToNumber(&$number)
+    {
+        if ($number === null) {
+            $number = 0;
+        } elseif (is_bool($number)) {
+            $number = (int) $number;
+        }
+
+        return $number;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
new file mode 100644
index 000000000..6aaf1faa5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Compare
+{
+    use ArrayEnabled;
+
+    /**
+     * DELTA.
+     *
+     *    Excel Function:
+     *        DELTA(a[,b])
+     *
+     *    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.
+     *
+     * @param array|float $a the first number
+     *                      Or can be an array of values
+     * @param array|float $b The second number. If omitted, b is assumed to be zero.
+     *                      Or can be an array of values
+     *
+     * @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.0)
+    {
+        if (is_array($a) || is_array($b)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $a, $b);
+        }
+
+        try {
+            $a = EngineeringValidations::validateFloat($a);
+            $b = EngineeringValidations::validateFloat($b);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) (abs($a - $b) < 1.0e-15);
+    }
+
+    /**
+     * 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.
+     *
+     * @param array|float $number the value to test against step
+     *                      Or can be an array of values
+     * @param null|array|float $step The threshold value. If you omit a value for step, GESTEP uses zero.
+     *                      Or can be an array of values
+     *
+     * @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.0)
+    {
+        if (is_array($number) || is_array($step)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $step);
+        }
+
+        try {
+            $number = EngineeringValidations::validateFloat($number);
+            $step = EngineeringValidations::validateFloat($step ?? 0.0);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) ($number >= $step);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
new file mode 100644
index 000000000..f7ec02d43
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use Complex\Complex as ComplexObject;
+use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Complex
+{
+    use ArrayEnabled;
+
+    /**
+     * COMPLEX.
+     *
+     * Converts real and imaginary coefficients into a complex number of the form x +/- yi or x +/- yj.
+     *
+     * Excel Function:
+     *        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 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')
+    {
+        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);
+            $imaginary = EngineeringValidations::validateFloat($imaginary);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($suffix === 'i') || ($suffix === 'j') || ($suffix === '')) {
+            $complex = new ComplexObject($realNumber, $imaginary, $suffix);
+
+            return (string) $complex;
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * IMAGINARY.
+     *
+     * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMAGINARY(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the imaginary
+     *                                         coefficient
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->getImaginary();
+    }
+
+    /**
+     * IMREAL.
+     *
+     * Returns the real coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMREAL(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the real coefficient
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->getReal();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
new file mode 100644
index 000000000..28a27a031
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
@@ -0,0 +1,611 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use Complex\Complex as ComplexObject;
+use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ComplexFunctions
+{
+    use ArrayEnabled;
+
+    /**
+     * IMABS.
+     *
+     * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMABS(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the absolute value
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->abs();
+    }
+
+    /**
+     * 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)
+     *
+     * @param array|string $complexNumber the complex number for which you want the argument theta
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::DIV0();
+        }
+
+        return $complex->argument();
+    }
+
+    /**
+     * IMCONJUGATE.
+     *
+     * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCONJUGATE(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the conjugate
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->conjugate();
+    }
+
+    /**
+     * IMCOS.
+     *
+     * Returns the cosine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOS(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cosine
+     *                      Or can be an array of values
+     *
+     * @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 IMCOS($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cos();
+    }
+
+    /**
+     * IMCOSH.
+     *
+     * Returns the hyperbolic cosine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOSH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosine
+     *                      Or can be an array of values
+     *
+     * @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 IMCOSH($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cosh();
+    }
+
+    /**
+     * IMCOT.
+     *
+     * Returns the cotangent of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOT(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cotangent
+     *                      Or can be an array of values
+     *
+     * @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 IMCOT($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cot();
+    }
+
+    /**
+     * IMCSC.
+     *
+     * Returns the cosecant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCSC(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cosecant
+     *                      Or can be an array of values
+     *
+     * @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 IMCSC($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->csc();
+    }
+
+    /**
+     * IMCSCH.
+     *
+     * Returns the hyperbolic cosecant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCSCH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosecant
+     *                      Or can be an array of values
+     *
+     * @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 IMCSCH($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->csch();
+    }
+
+    /**
+     * IMSIN.
+     *
+     * Returns the sine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSIN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the sine
+     *                      Or can be an array of values
+     *
+     * @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 IMSIN($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sin();
+    }
+
+    /**
+     * IMSINH.
+     *
+     * Returns the hyperbolic sine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSINH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic sine
+     *                      Or can be an array of values
+     *
+     * @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 IMSINH($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sinh();
+    }
+
+    /**
+     * IMSEC.
+     *
+     * Returns the secant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSEC(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the secant
+     *                      Or can be an array of values
+     *
+     * @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 IMSEC($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sec();
+    }
+
+    /**
+     * IMSECH.
+     *
+     * Returns the hyperbolic secant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSECH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic secant
+     *                      Or can be an array of values
+     *
+     * @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 IMSECH($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sech();
+    }
+
+    /**
+     * IMTAN.
+     *
+     * Returns the tangent of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMTAN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the tangent
+     *                      Or can be an array of values
+     *
+     * @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 IMTAN($complexNumber)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->tan();
+    }
+
+    /**
+     * IMSQRT.
+     *
+     * Returns the square root of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSQRT(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the square root
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        $theta = self::IMARGUMENT($complexNumber);
+        if ($theta === ExcelError::DIV0()) {
+            return '0';
+        }
+
+        return (string) $complex->sqrt();
+    }
+
+    /**
+     * IMLN.
+     *
+     * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the natural logarithm
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->ln();
+    }
+
+    /**
+     * IMLOG10.
+     *
+     * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG10(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the common logarithm
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->log10();
+    }
+
+    /**
+     * IMLOG2.
+     *
+     * Returns the base-2 logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG2(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the base-2 logarithm
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->log2();
+    }
+
+    /**
+     * IMEXP.
+     *
+     * Returns the exponential of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMEXP(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the exponential
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->exp();
+    }
+
+    /**
+     * IMPOWER.
+     *
+     * Returns a complex number in x + yi or x + yj text format raised to a power.
+     *
+     * Excel Function:
+     *        IMPOWER(complexNumber,realNumber)
+     *
+     * @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 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)
+    {
+        if (is_array($complexNumber) || is_array($realNumber)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexNumber, $realNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        if (!is_numeric($realNumber)) {
+            return ExcelError::VALUE();
+        }
+
+        return (string) $complex->pow((float) $realNumber);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
new file mode 100644
index 000000000..e525b4b9a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+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.
+     *
+     * Returns the quotient of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMDIV(complexDividend,complexDivisor)
+     *
+     * @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 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)
+    {
+        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 ExcelError::NAN();
+        }
+    }
+
+    /**
+     * IMSUB.
+     *
+     * Returns the difference of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUB(complexNumber1,complexNumber2)
+     *
+     * @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 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)
+    {
+        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 ExcelError::NAN();
+        }
+    }
+
+    /**
+     * IMSUM.
+     *
+     * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUM(complexNumber[,complexNumber[,...]])
+     *
+     * @param string ...$complexNumbers Series of complex numbers to add
+     *
+     * @return string
+     */
+    public static function IMSUM(...$complexNumbers)
+    {
+        // Return value
+        $returnValue = new ComplexObject(0.0);
+        $aArgs = Functions::flattenArray($complexNumbers);
+
+        try {
+            // Loop through the arguments
+            foreach ($aArgs as $complex) {
+                $returnValue = $returnValue->add(new ComplexObject($complex));
+            }
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $returnValue;
+    }
+
+    /**
+     * IMPRODUCT.
+     *
+     * Returns the product of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMPRODUCT(complexNumber[,complexNumber[,...]])
+     *
+     * @param string ...$complexNumbers Series of complex numbers to multiply
+     *
+     * @return string
+     */
+    public static function IMPRODUCT(...$complexNumbers)
+    {
+        // Return value
+        $returnValue = new ComplexObject(1.0);
+        $aArgs = Functions::flattenArray($complexNumbers);
+
+        try {
+            // Loop through the arguments
+            foreach ($aArgs as $complex) {
+                $returnValue = $returnValue->multiply(new ComplexObject($complex));
+            }
+        } catch (ComplexException $e) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php
new file mode 100644
index 000000000..a926db6e1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+class Constants
+{
+    /**
+     * EULER.
+     */
+    public const EULER = 2.71828182845904523536;
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
new file mode 100644
index 000000000..414e0b4c8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
@@ -0,0 +1,71 @@
+<?php
+
+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;
+
+abstract class ConvertBase
+{
+    use ArrayEnabled;
+
+    /** @param mixed $value */
+    protected static function validateValue($value): string
+    {
+        if (is_bool($value)) {
+            if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+                throw new Exception(ExcelError::VALUE());
+            }
+            $value = (int) $value;
+        }
+
+        if (is_numeric($value)) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                $value = floor((float) $value);
+            }
+        }
+
+        return strtoupper((string) $value);
+    }
+
+    /** @param mixed $places */
+    protected static function validatePlaces($places = null): ?int
+    {
+        if ($places === null) {
+            return $places;
+        }
+
+        if (is_numeric($places)) {
+            if ($places < 0 || $places > 10) {
+                throw new Exception(ExcelError::NAN());
+            }
+
+            return (int) $places;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Formats a number base string value with leading zeroes.
+     *
+     * @param string $value The "number" to pad
+     * @param ?int $places The length that we want to pad this value
+     *
+     * @return string The padded "number"
+     */
+    protected static function nbrConversionFormat(string $value, ?int $places): string
+    {
+        if ($places !== null) {
+            if (strlen($value) <= $places) {
+                return substr(str_pad($value, $places, '0', STR_PAD_LEFT), -10);
+            }
+
+            return ExcelError::NAN();
+        }
+
+        return substr($value, -10);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
new file mode 100644
index 000000000..04bf3e506
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertBinary extends ConvertBase
+{
+    /**
+     * toDecimal.
+     *
+     * Return a binary value as decimal.
+     *
+     * Excel Function:
+     *        BIN2DEC(x)
+     *
+     * @param array|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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) == 10 && $value[0] === '1') {
+            //    Two's Complement
+            $value = substr($value, -9);
+
+            return '-' . (512 - bindec($value));
+        }
+
+        return (string) bindec($value);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return a binary value as hex.
+     *
+     * Excel Function:
+     *        BIN2HEX(x[,places])
+     *
+     * @param array|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.
+     *                      Or can be an array of values
+     * @param array|int $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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        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'];
+
+            return $xarr[$high2] . strtoupper(substr('0' . dechex((int) bindec($low8)), -2));
+        }
+        $hexVal = (string) strtoupper(dechex((int) bindec($value)));
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return a binary value as octal.
+     *
+     * Excel Function:
+     *        BIN2OCT(x[,places])
+     *
+     * @param array|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.
+     *                      Or can be an array of values
+     * @param array|int $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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        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));
+
+        return self::nbrConversionFormat($octVal, $places);
+    }
+
+    protected static function validateBinary(string $value): string
+    {
+        if ((strlen($value) > preg_match_all('/[01]/', $value)) || (strlen($value) > 10)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
new file mode 100644
index 000000000..9b59d3995
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertDecimal extends ConvertBase
+{
+    const LARGEST_OCTAL_IN_DECIMAL = 536870911;
+    const SMALLEST_OCTAL_IN_DECIMAL = -536870912;
+    const LARGEST_BINARY_IN_DECIMAL = 511;
+    const SMALLEST_BINARY_IN_DECIMAL = -512;
+    const LARGEST_HEX_IN_DECIMAL = 549755813887;
+    const SMALLEST_HEX_IN_DECIMAL = -549755813888;
+
+    /**
+     * toBinary.
+     *
+     * Return a decimal value as binary.
+     *
+     * Excel Function:
+     *        DEC2BIN(x[,places])
+     *
+     * @param array|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
+     *                          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.
+     *                      Or can be an array of values
+     * @param array|int $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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $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 ExcelError::NAN();
+        }
+
+        $r = decbin($value);
+        // Two's Complement
+        $r = substr($r, -10);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return a decimal value as hex.
+     *
+     * Excel Function:
+     *        DEC2HEX(x[,places])
+     *
+     * @param array|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
+     *                          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.
+     *                      Or can be an array of values
+     * @param array|int $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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $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 ExcelError::NAN();
+        }
+        $r = strtoupper(dechex((int) $value));
+        $r = self::hex32bit($value, $r);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    public static function hex32bit(float $value, string $hexstr, bool $force = false): string
+    {
+        if (PHP_INT_SIZE === 4 || $force) {
+            if ($value >= 2 ** 32) {
+                $quotient = (int) ($value / (2 ** 32));
+
+                return strtoupper(substr('0' . dechex($quotient), -2) . $hexstr);
+            }
+            if ($value < -(2 ** 32)) {
+                $quotient = 256 - (int) ceil((-$value) / (2 ** 32));
+
+                return strtoupper(substr('0' . dechex($quotient), -2) . substr("00000000$hexstr", -8));
+            }
+            if ($value < 0) {
+                return "FF$hexstr";
+            }
+        }
+
+        return $hexstr;
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return an decimal value as octal.
+     *
+     * Excel Function:
+     *        DEC2OCT(x[,places])
+     *
+     * @param array|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
+     *                          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.
+     *                      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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $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 ExcelError::NAN();
+        }
+        $r = decoct($value);
+        $r = substr($r, -10);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    protected static function validateDecimal(string $value): string
+    {
+        if (strlen($value) > preg_match_all('/[-0123456789.]/', $value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
new file mode 100644
index 000000000..55ce209ec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertHex extends ConvertBase
+{
+    /**
+     * toBinary.
+     *
+     * Return a hex value as binary.
+     *
+     * Excel Function:
+     *        HEX2BIN(x[,places])
+     *
+     * @param array|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.
+     *                      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.
+     *                      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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $dec = self::toDecimal($value);
+
+        return ConvertDecimal::toBinary($dec, $places);
+    }
+
+    /**
+     * toDecimal.
+     *
+     * Return a hex value as decimal.
+     *
+     * Excel Function:
+     *        HEX2DEC(x)
+     *
+     * @param array|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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) > 10) {
+            return ExcelError::NAN();
+        }
+
+        $binX = '';
+        foreach (str_split($value) as $char) {
+            $binX .= str_pad(base_convert($char, 16, 2), 4, '0', STR_PAD_LEFT);
+        }
+        if (strlen($binX) == 40 && $binX[0] == '1') {
+            for ($i = 0; $i < 40; ++$i) {
+                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
+            }
+
+            return (string) ((bindec($binX) + 1) * -1);
+        }
+
+        return (string) bindec($binX);
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return a hex value as octal.
+     *
+     * Excel Function:
+     *        HEX2OCT(x[,places])
+     *
+     * @param array|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
+     *                                    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.
+     *                      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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $decimal = self::toDecimal($value);
+
+        return ConvertDecimal::toOctal($decimal, $places);
+    }
+
+    protected static function validateHex(string $value): string
+    {
+        if (strlen($value) > preg_match_all('/[0123456789ABCDEF]/', $value)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
new file mode 100644
index 000000000..add7aba01
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertOctal extends ConvertBase
+{
+    /**
+     * toBinary.
+     *
+     * Return an octal value as binary.
+     *
+     * Excel Function:
+     *        OCT2BIN(x[,places])
+     *
+     * @param array|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
+     *                          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.
+     *                      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).
+     *                      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.
+     *                      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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return ConvertDecimal::toBinary(self::toDecimal($value), $places);
+    }
+
+    /**
+     * toDecimal.
+     *
+     * Return an octal value as decimal.
+     *
+     * Excel Function:
+     *        OCT2DEC(x)
+     *
+     * @param array|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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $binX = '';
+        foreach (str_split($value) as $char) {
+            $binX .= str_pad(decbin((int) $char), 3, '0', STR_PAD_LEFT);
+        }
+        if (strlen($binX) == 30 && $binX[0] == '1') {
+            for ($i = 0; $i < 30; ++$i) {
+                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
+            }
+
+            return (string) ((bindec($binX) + 1) * -1);
+        }
+
+        return (string) bindec($binX);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return an octal value as hex.
+     *
+     * Excel Function:
+     *        OCT2HEX(x[,places])
+     *
+     * @param array|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 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.
+     *                      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)
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+            $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;
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+    protected static function validateOctal(string $value): string
+    {
+        $numDigits = (int) preg_match_all('/[01234567]/', $value);
+        if (strlen($value) > $numDigits || $numDigits > 10) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
new file mode 100644
index 000000000..32ef9d3c7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
@@ -0,0 +1,694 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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';
+    public const CATEGORY_PRESSURE = 'Pressure';
+    public const CATEGORY_FORCE = 'Force';
+    public const CATEGORY_ENERGY = 'Energy';
+    public const CATEGORY_POWER = 'Power';
+    public const CATEGORY_MAGNETISM = 'Magnetism';
+    public const CATEGORY_TEMPERATURE = 'Temperature';
+    public const CATEGORY_VOLUME = 'Volume and Liquid Measure';
+    public const CATEGORY_AREA = 'Area';
+    public const CATEGORY_INFORMATION = 'Information';
+    public const CATEGORY_SPEED = 'Speed';
+
+    /**
+     * Details of the Units of measure that can be used in CONVERTUOM().
+     *
+     * @var mixed[]
+     */
+    private static $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],
+        // 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],
+        // 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],
+        // 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],
+        // 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],
+        // 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],
+        // 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],
+        // Magnetism
+        'T' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => 'Tesla', 'AllowPrefix' => true],
+        'ga' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => '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],
+        // 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],
+        // 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],
+        // Information
+        'byte' => ['Group' => self::CATEGORY_INFORMATION, 'Unit Name' => 'Byte', 'AllowPrefix' => true],
+        'bit' => ['Group' => self::CATEGORY_INFORMATION, 'Unit Name' => '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],
+    ];
+
+    /**
+     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     * @var mixed[]
+     */
+    private static $conversionMultipliers = [
+        'Y' => ['multiplier' => 1E24, 'name' => 'yotta'],
+        'Z' => ['multiplier' => 1E21, 'name' => 'zetta'],
+        'E' => ['multiplier' => 1E18, 'name' => 'exa'],
+        'P' => ['multiplier' => 1E15, 'name' => 'peta'],
+        'T' => ['multiplier' => 1E12, 'name' => 'tera'],
+        'G' => ['multiplier' => 1E9, 'name' => 'giga'],
+        'M' => ['multiplier' => 1E6, 'name' => 'mega'],
+        'k' => ['multiplier' => 1E3, 'name' => 'kilo'],
+        'h' => ['multiplier' => 1E2, 'name' => 'hecto'],
+        'e' => ['multiplier' => 1E1, 'name' => 'dekao'],
+        'da' => ['multiplier' => 1E1, 'name' => 'dekao'],
+        'd' => ['multiplier' => 1E-1, 'name' => 'deci'],
+        'c' => ['multiplier' => 1E-2, 'name' => 'centi'],
+        'm' => ['multiplier' => 1E-3, 'name' => 'milli'],
+        'u' => ['multiplier' => 1E-6, 'name' => 'micro'],
+        'n' => ['multiplier' => 1E-9, 'name' => 'nano'],
+        'p' => ['multiplier' => 1E-12, 'name' => 'pico'],
+        'f' => ['multiplier' => 1E-15, 'name' => 'femto'],
+        'a' => ['multiplier' => 1E-18, 'name' => 'atto'],
+        'z' => ['multiplier' => 1E-21, 'name' => 'zepto'],
+        'y' => ['multiplier' => 1E-24, 'name' => 'yocto'],
+    ];
+
+    /**
+     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     * @var mixed[]
+     */
+    private static $binaryConversionMultipliers = [
+        'Yi' => ['multiplier' => 2 ** 80, 'name' => 'yobi'],
+        'Zi' => ['multiplier' => 2 ** 70, 'name' => 'zebi'],
+        'Ei' => ['multiplier' => 2 ** 60, 'name' => 'exbi'],
+        'Pi' => ['multiplier' => 2 ** 50, 'name' => 'pebi'],
+        'Ti' => ['multiplier' => 2 ** 40, 'name' => 'tebi'],
+        'Gi' => ['multiplier' => 2 ** 30, 'name' => 'gibi'],
+        'Mi' => ['multiplier' => 2 ** 20, 'name' => 'mebi'],
+        'ki' => ['multiplier' => 2 ** 10, 'name' => 'kibi'],
+    ];
+
+    /**
+     * Details of the Units of measure conversion factors, organised by group.
+     *
+     * @var mixed[]
+     */
+    private static $unitConversions = [
+        // Conversion uses gram (g) as an intermediate unit
+        self::CATEGORY_WEIGHT_AND_MASS => [
+            'g' => 1.0,
+            'sg' => 6.85217658567918E-05,
+            'lbm' => 2.20462262184878E-03,
+            'u' => 6.02214179421676E+23,
+            'ozm' => 3.52739619495804E-02,
+            'grain' => 1.54323583529414E+01,
+            'cwt' => 2.20462262184878E-05,
+            'shweight' => 2.20462262184878E-05,
+            'uk_cwt' => 1.96841305522212E-05,
+            'lcwt' => 1.96841305522212E-05,
+            'hweight' => 1.96841305522212E-05,
+            'stone' => 1.57473044417770E-04,
+            'ton' => 1.10231131092439E-06,
+            'uk_ton' => 9.84206527611061E-07,
+            'LTON' => 9.84206527611061E-07,
+            'brton' => 9.84206527611061E-07,
+        ],
+        // Conversion uses meter (m) as an intermediate unit
+        self::CATEGORY_DISTANCE => [
+            'm' => 1.0,
+            'mi' => 6.21371192237334E-04,
+            'Nmi' => 5.39956803455724E-04,
+            'in' => 3.93700787401575E+01,
+            'ft' => 3.28083989501312E+00,
+            'yd' => 1.09361329833771E+00,
+            'ang' => 1.0E+10,
+            'ell' => 8.74890638670166E-01,
+            'ly' => 1.05700083402462E-16,
+            'parsec' => 3.24077928966473E-17,
+            'pc' => 3.24077928966473E-17,
+            'Pica' => 2.83464566929134E+03,
+            'Picapt' => 2.83464566929134E+03,
+            'pica' => 2.36220472440945E+02,
+            'survey_mi' => 6.21369949494950E-04,
+        ],
+        // Conversion uses second (s) as an intermediate unit
+        self::CATEGORY_TIME => [
+            'yr' => 3.16880878140289E-08,
+            'day' => 1.15740740740741E-05,
+            'd' => 1.15740740740741E-05,
+            'hr' => 2.77777777777778E-04,
+            'mn' => 1.66666666666667E-02,
+            'min' => 1.66666666666667E-02,
+            'sec' => 1.0,
+            's' => 1.0,
+        ],
+        // Conversion uses Pascal (Pa) as an intermediate unit
+        self::CATEGORY_PRESSURE => [
+            'Pa' => 1.0,
+            'p' => 1.0,
+            'atm' => 9.86923266716013E-06,
+            'at' => 9.86923266716013E-06,
+            'mmHg' => 7.50063755419211E-03,
+            'psi' => 1.45037737730209E-04,
+            'Torr' => 7.50061682704170E-03,
+        ],
+        // Conversion uses Newton (N) as an intermediate unit
+        self::CATEGORY_FORCE => [
+            'N' => 1.0,
+            'dyn' => 1.0E+5,
+            'dy' => 1.0E+5,
+            'lbf' => 2.24808923655339E-01,
+            'pond' => 1.01971621297793E+02,
+        ],
+        // Conversion uses Joule (J) as an intermediate unit
+        self::CATEGORY_ENERGY => [
+            'J' => 1.0,
+            'e' => 9.99999519343231E+06,
+            'c' => 2.39006249473467E-01,
+            'cal' => 2.38846190642017E-01,
+            'eV' => 6.24145700000000E+18,
+            'ev' => 6.24145700000000E+18,
+            'HPh' => 3.72506430801000E-07,
+            'hh' => 3.72506430801000E-07,
+            'Wh' => 2.77777916238711E-04,
+            'wh' => 2.77777916238711E-04,
+            'flb' => 2.37304222192651E+01,
+            'BTU' => 9.47815067349015E-04,
+            'btu' => 9.47815067349015E-04,
+        ],
+        // Conversion uses Horsepower (HP) as an intermediate unit
+        self::CATEGORY_POWER => [
+            'HP' => 1.0,
+            'h' => 1.0,
+            'W' => 7.45699871582270E+02,
+            'w' => 7.45699871582270E+02,
+            'PS' => 1.01386966542400E+00,
+        ],
+        // Conversion uses Tesla (T) as an intermediate unit
+        self::CATEGORY_MAGNETISM => [
+            'T' => 1.0,
+            'ga' => 10000.0,
+        ],
+        // Conversion uses litre (l) as an intermediate unit
+        self::CATEGORY_VOLUME => [
+            'l' => 1.0,
+            'L' => 1.0,
+            'lt' => 1.0,
+            'tsp' => 2.02884136211058E+02,
+            'tspm' => 2.0E+02,
+            'tbs' => 6.76280454036860E+01,
+            'oz' => 3.38140227018430E+01,
+            'cup' => 4.22675283773038E+00,
+            'pt' => 2.11337641886519E+00,
+            'us_pt' => 2.11337641886519E+00,
+            'uk_pt' => 1.75975398639270E+00,
+            'qt' => 1.05668820943259E+00,
+            'uk_qt' => 8.79876993196351E-01,
+            'gal' => 2.64172052358148E-01,
+            'uk_gal' => 2.19969248299088E-01,
+            'ang3' => 1.0E+27,
+            'ang^3' => 1.0E+27,
+            'barrel' => 6.28981077043211E-03,
+            'bushel' => 2.83775932584017E-02,
+            'in3' => 6.10237440947323E+01,
+            'in^3' => 6.10237440947323E+01,
+            'ft3' => 3.53146667214886E-02,
+            'ft^3' => 3.53146667214886E-02,
+            'ly3' => 1.18093498844171E-51,
+            'ly^3' => 1.18093498844171E-51,
+            'm3' => 1.0E-03,
+            'm^3' => 1.0E-03,
+            'mi3' => 2.39912758578928E-13,
+            'mi^3' => 2.39912758578928E-13,
+            'yd3' => 1.30795061931439E-03,
+            'yd^3' => 1.30795061931439E-03,
+            'Nmi3' => 1.57426214685811E-13,
+            'Nmi^3' => 1.57426214685811E-13,
+            'Pica3' => 2.27769904358706E+07,
+            'Pica^3' => 2.27769904358706E+07,
+            'Picapt3' => 2.27769904358706E+07,
+            'Picapt^3' => 2.27769904358706E+07,
+            'GRT' => 3.53146667214886E-04,
+            'regton' => 3.53146667214886E-04,
+            'MTON' => 8.82866668037215E-04,
+        ],
+        // Conversion uses hectare (ha) as an intermediate unit
+        self::CATEGORY_AREA => [
+            'ha' => 1.0,
+            'uk_acre' => 2.47105381467165E+00,
+            'us_acre' => 2.47104393046628E+00,
+            'ang2' => 1.0E+24,
+            'ang^2' => 1.0E+24,
+            'ar' => 1.0E+02,
+            'ft2' => 1.07639104167097E+05,
+            'ft^2' => 1.07639104167097E+05,
+            'in2' => 1.55000310000620E+07,
+            'in^2' => 1.55000310000620E+07,
+            'ly2' => 1.11725076312873E-28,
+            'ly^2' => 1.11725076312873E-28,
+            'm2' => 1.0E+04,
+            'm^2' => 1.0E+04,
+            'Morgen' => 4.0E+00,
+            'mi2' => 3.86102158542446E-03,
+            'mi^2' => 3.86102158542446E-03,
+            'Nmi2' => 2.91553349598123E-03,
+            'Nmi^2' => 2.91553349598123E-03,
+            'Pica2' => 8.03521607043214E+10,
+            'Pica^2' => 8.03521607043214E+10,
+            'Picapt2' => 8.03521607043214E+10,
+            'Picapt^2' => 8.03521607043214E+10,
+            'yd2' => 1.19599004630108E+04,
+            'yd^2' => 1.19599004630108E+04,
+        ],
+        // Conversion uses bit (bit) as an intermediate unit
+        self::CATEGORY_INFORMATION => [
+            'bit' => 1.0,
+            'byte' => 0.125,
+        ],
+        // Conversion uses Meters per Second (m/s) as an intermediate unit
+        self::CATEGORY_SPEED => [
+            'm/s' => 1.0,
+            'm/sec' => 1.0,
+            'm/h' => 3.60E+03,
+            'm/hr' => 3.60E+03,
+            'mph' => 2.23693629205440E+00,
+            'admkn' => 1.94260256941567E+00,
+            'kn' => 1.94384449244060E+00,
+        ],
+    ];
+
+    /**
+     *    getConversionGroups
+     * Returns a list of the different conversion groups for UOM conversions.
+     *
+     * @return array
+     */
+    public static function getConversionCategories()
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit) {
+            $conversionGroups[] = $conversionUnit['Group'];
+        }
+
+        return array_merge(array_unique($conversionGroups));
+    }
+
+    /**
+     *    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
+     */
+    public static function getConversionCategoryUnits($category = null)
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if (($category === null) || ($conversionGroup['Group'] == $category)) {
+                $conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
+            }
+        }
+
+        return $conversionGroups;
+    }
+
+    /**
+     * getConversionGroupUnitDetails.
+     *
+     * @param string $category The group whose units of measure you want to retrieve
+     *
+     * @return array
+     */
+    public static function getConversionCategoryUnitDetails($category = null)
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if (($category === null) || ($conversionGroup['Group'] == $category)) {
+                $conversionGroups[$conversionGroup['Group']][] = [
+                    'unit' => $conversionUnit,
+                    'description' => $conversionGroup['Unit Name'],
+                ];
+            }
+        }
+
+        return $conversionGroups;
+    }
+
+    /**
+     *    getConversionMultipliers
+     * Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     * @return mixed[]
+     */
+    public static function getConversionMultipliers()
+    {
+        return self::$conversionMultipliers;
+    }
+
+    /**
+     *    getBinaryConversionMultipliers
+     * Returns an array of the additional Multiplier prefixes that can be used with Information Units of Measure in CONVERTUOM().
+     *
+     * @return mixed[]
+     */
+    public static function getBinaryConversionMultipliers()
+    {
+        return self::$binaryConversionMultipliers;
+    }
+
+    /**
+     * CONVERT.
+     *
+     * 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)
+     *
+     * @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 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)
+    {
+        if (is_array($value) || is_array($fromUOM) || is_array($toUOM)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $fromUOM, $toUOM);
+        }
+
+        if (!is_numeric($value)) {
+            return ExcelError::VALUE();
+        }
+
+        try {
+            [$fromUOM, $fromCategory, $fromMultiplier] = self::getUOMDetails($fromUOM);
+            [$toUOM, $toCategory, $toMultiplier] = self::getUOMDetails($toUOM);
+        } catch (Exception $e) {
+            return ExcelError::NA();
+        }
+
+        if ($fromCategory !== $toCategory) {
+            return ExcelError::NA();
+        }
+
+        // @var float $value
+        $value *= $fromMultiplier;
+
+        if (($fromUOM === $toUOM) && ($fromMultiplier === $toMultiplier)) {
+            //    We've already factored $fromMultiplier into the value, so we need
+            //        to reverse it again
+            return $value / $fromMultiplier;
+        } elseif ($fromUOM === $toUOM) {
+            return $value / $toMultiplier;
+        } elseif ($fromCategory === self::CATEGORY_TEMPERATURE) {
+            return self::convertTemperature($fromUOM, $toUOM, /** @scrutinizer ignore-type */ $value);
+        }
+
+        $baseValue = $value * (1.0 / self::$unitConversions[$fromCategory][$fromUOM]);
+
+        return ($baseValue * self::$unitConversions[$fromCategory][$toUOM]) / $toMultiplier;
+    }
+
+    private static function getUOMDetails(string $uom): array
+    {
+        if (isset(self::$conversionUnits[$uom])) {
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, 1.0];
+        }
+
+        // Check 1-character standard metric multiplier prefixes
+        $multiplierType = substr($uom, 0, 1);
+        $uom = substr($uom, 1);
+        if (isset(self::$conversionUnits[$uom], self::$conversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, self::$conversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        $multiplierType .= substr($uom, 0, 1);
+        $uom = substr($uom, 1);
+
+        // Check 2-character standard metric multiplier prefixes
+        if (isset(self::$conversionUnits[$uom], self::$conversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, self::$conversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        // Check 2-character binary multiplier prefixes
+        if (isset(self::$conversionUnits[$uom], self::$binaryConversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+            if ($unitCategory !== 'Information') {
+                throw new Exception('Binary Prefix is only allowed for Information UoM');
+            }
+
+            return [$uom, $unitCategory, self::$binaryConversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        throw new Exception('UoM Not Found');
+    }
+
+    /**
+     * @param float|int $value
+     *
+     * @return float|int
+     */
+    protected static function convertTemperature(string $fromUOM, string $toUOM, $value)
+    {
+        $fromUOM = self::resolveTemperatureSynonyms($fromUOM);
+        $toUOM = self::resolveTemperatureSynonyms($toUOM);
+
+        if ($fromUOM === $toUOM) {
+            return $value;
+        }
+
+        // Convert to Kelvin
+        switch ($fromUOM) {
+            case 'F':
+                $value = ($value - 32) / 1.8 + 273.15;
+
+                break;
+            case 'C':
+                $value += 273.15;
+
+                break;
+            case 'Rank':
+                $value /= 1.8;
+
+                break;
+            case 'Reau':
+                $value = $value * 1.25 + 273.15;
+
+                break;
+        }
+
+        // Convert from Kelvin
+        switch ($toUOM) {
+            case 'F':
+                $value = ($value - 273.15) * 1.8 + 32.00;
+
+                break;
+            case 'C':
+                $value -= 273.15;
+
+                break;
+            case 'Rank':
+                $value *= 1.8;
+
+                break;
+            case 'Reau':
+                $value = ($value - 273.15) * 0.80000;
+
+                break;
+        }
+
+        return $value;
+    }
+
+    private static function resolveTemperatureSynonyms(string $uom): string
+    {
+        switch ($uom) {
+            case 'fah':
+                return 'F';
+            case 'cel':
+                return 'C';
+            case 'kel':
+                return 'K';
+        }
+
+        return $uom;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
new file mode 100644
index 000000000..c0202ea20
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class EngineeringValidations
+{
+    /**
+     * @param mixed $value
+     */
+    public static function validateFloat($value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateInt($value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
new file mode 100644
index 000000000..133722dfa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Erf
+{
+    use ArrayEnabled;
+
+    private const TWO_SQRT_PI = 1.128379167095512574;
+
+    /**
+     * 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])
+     *
+     * @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 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)
+    {
+        if (is_array($lower) || is_array($upper)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $lower, $upper);
+        }
+
+        if (is_numeric($lower)) {
+            if ($upper === null) {
+                return self::erfValue($lower);
+            }
+            if (is_numeric($upper)) {
+                return self::erfValue($upper) - self::erfValue($lower);
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * ERFPRECISE.
+     *
+     * Returns the error function integrated between the lower and upper bound arguments.
+     *
+     *    Excel Function:
+     *        ERF.PRECISE(limit)
+     *
+     * @param mixed $limit Float bound for integrating ERF, other bound is zero
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($limit)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $limit);
+        }
+
+        return self::ERF($limit);
+    }
+
+    /**
+     * Method to calculate the erf value.
+     *
+     * @param float|int|string $value
+     *
+     * @return float
+     */
+    public static function erfValue($value)
+    {
+        $value = (float) $value;
+        if (abs($value) > 2.2) {
+            return 1 - ErfC::ERFC($value);
+        }
+        $sum = $term = $value;
+        $xsqr = ($value * $value);
+        $j = 1;
+        do {
+            $term *= $xsqr / $j;
+            $sum -= $term / (2 * $j + 1);
+            ++$j;
+            $term *= $xsqr / $j;
+            $sum += $term / (2 * $j + 1);
+            ++$j;
+            if ($sum == 0.0) {
+                break;
+            }
+        } while (abs($term / $sum) > Functions::PRECISION);
+
+        return self::TWO_SQRT_PI * $sum;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
new file mode 100644
index 000000000..0350c9c64
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
@@ -0,0 +1,82 @@
+<?php
+
+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.
+     *
+     *    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)
+     *
+     * @param mixed $value The float lower bound for integrating ERFC
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (is_numeric($value)) {
+            return self::erfcValue($value);
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    private const ONE_SQRT_PI = 0.564189583547756287;
+
+    /**
+     * Method to calculate the erfc value.
+     *
+     * @param float|int|string $value
+     *
+     * @return float
+     */
+    private static function erfcValue($value)
+    {
+        $value = (float) $value;
+        if (abs($value) < 2.2) {
+            return 1 - Erf::erfValue($value);
+        }
+        if ($value < 0) {
+            return 2 - self::erfcValue(-$value);
+        }
+        $a = $n = 1;
+        $b = $c = $value;
+        $d = ($value * $value) + 0.5;
+        $q2 = $b / $d;
+        do {
+            $t = $a * $n + $b * $value;
+            $a = $b;
+            $b = $t;
+            $t = $c * $n + $d * $value;
+            $c = $d;
+            $d = $t;
+            $n += 0.5;
+            $q1 = $q2;
+            $q2 = $b / $d;
+        } while ((abs($q1 - $q2) / $q2) > Functions::PRECISION);
+
+        return self::ONE_SQRT_PI * exp(-$value * $value) * $q2;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
index fccf0af70..a95a452d0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
 class Exception extends PhpSpreadsheetException
 {
+    public const CALCULATION_ENGINE_PUSH_TO_STACK = 1;
+
     /**
      * Error handler callback.
      *
@@ -15,7 +17,7 @@ class Exception extends PhpSpreadsheetException
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    public static function errorHandlerCallback($code, $string, $file, $line, /** @scrutinizer ignore-unused */ $context): void
     {
         $e = new self($string, $code);
         $e->line = $line;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
index 41e51d4ae..6461961a0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
+++ b/libraries/phpspreadsheet/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 = [Exception::class, 'errorHandlerCallback'];
+        set_error_handler($callable, E_ALL);
     }
 
     /**
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php
index 412b7a620..dcca5f880 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php
@@ -2,177 +2,80 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use PhpOffice\PhpSpreadsheet\Shared\Date;
+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 = 32;
+    const FINANCIAL_MAX_ITERATIONS = 128;
 
     const FINANCIAL_PRECISION = 1.0e-08;
 
-    /**
-     * isLastDayOfMonth.
-     *
-     * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
-     *
-     * @param \DateTime $testDate The date for testing
-     *
-     * @return bool
-     */
-    private static function isLastDayOfMonth(\DateTime $testDate)
-    {
-        return $testDate->format('d') == $testDate->format('t');
-    }
-
-    private static function couponFirstPeriodDate($settlement, $maturity, $frequency, $next)
-    {
-        $months = 12 / $frequency;
-
-        $result = Date::excelToDateTimeObject($maturity);
-        $eom = self::isLastDayOfMonth($result);
-
-        while ($settlement < Date::PHPToExcel($result)) {
-            $result->modify('-' . $months . ' months');
-        }
-        if ($next) {
-            $result->modify('+' . $months . ' months');
-        }
-
-        if ($eom) {
-            $result->modify('-1 day');
-        }
-
-        return Date::PHPToExcel($result);
-    }
-
-    private static function isValidFrequency($frequency)
-    {
-        if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
-            return true;
-        }
-        if ((Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) &&
-            (($frequency == 6) || ($frequency == 12))) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * daysPerYear.
-     *
-     * Returns the number of days in a specified year, as defined by the "basis" value
-     *
-     * @param int|string $year The year against which we're testing
-     * @param int|string $basis The type of day count:
-     *                                    0 or omitted US (NASD)    360
-     *                                    1                        Actual (365 or 366 in a leap year)
-     *                                    2                        360
-     *                                    3                        365
-     *                                    4                        European 360
-     *
-     * @return int|string Result, or a string containing an error
-     */
-    private static function daysPerYear($year, $basis = 0)
-    {
-        switch ($basis) {
-            case 0:
-            case 2:
-            case 4:
-                $daysPerYear = 360;
-
-                break;
-            case 3:
-                $daysPerYear = 365;
-
-                break;
-            case 1:
-                $daysPerYear = (DateTime::isLeapYear($year)) ? 366 : 365;
-
-                break;
-            default:
-                return Functions::NAN();
-        }
-
-        return $daysPerYear;
-    }
-
-    private static function interestAndPrincipal($rate = 0, $per = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0)
-    {
-        $pmt = self::PMT($rate, $nper, $pv, $fv, $type);
-        $capital = $pv;
-        for ($i = 1; $i <= $per; ++$i) {
-            $interest = ($type && $i == 1) ? 0 : -$capital * $rate;
-            $principal = $pmt - $interest;
-            $capital += $principal;
-        }
-
-        return [$interest, $principal];
-    }
-
     /**
      * ACCRINT.
      *
      * Returns the accrued interest for a security that pays periodic interest.
      *
      * Excel Function:
-     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
+     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis][,calc_method])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the periodic() method in the Financial\Securities\AccruedInterest class instead
+     * @see Securities\AccruedInterest::periodic()
      *
      * @param mixed $issue the security's issue date
-     * @param mixed $firstinterest the security's first interest 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 float $rate the security's annual coupon rate
-     * @param float $par The security's par value.
-     *                                    If you omit par, ACCRINT uses $1,000.
-     * @param int $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
-     * @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
+     *                              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, $par = 1000, $frequency = 1, $basis = 0)
-    {
-        $issue = Functions::flattenSingleValue($issue);
-        $firstinterest = Functions::flattenSingleValue($firstinterest);
-        $settlement = Functions::flattenSingleValue($settlement);
-        $rate = Functions::flattenSingleValue($rate);
-        $par = ($par === null) ? 1000 : Functions::flattenSingleValue($par);
-        $frequency = ($frequency === null) ? 1 : Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate = (float) $rate;
-            $par = (float) $par;
-            if (($rate <= 0) || ($par <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenIssueAndSettlement = DateTime::YEARFRAC($issue, $settlement, $basis);
-            if (!is_numeric($daysBetweenIssueAndSettlement)) {
-                //    return date error
-                return $daysBetweenIssueAndSettlement;
-            }
-
-            return $par * $rate * $daysBetweenIssueAndSettlement;
-        }
-
-        return Functions::VALUE();
+    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
+        );
     }
 
     /**
@@ -183,47 +86,27 @@ class Financial
      * Excel Function:
      *        ACCRINTM(issue,settlement,rate[,par[,basis]])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the atMaturity() method in the Financial\Securities\AccruedInterest class instead
+     * @see Financial\Securities\AccruedInterest::atMaturity()
      *
      * @param mixed $issue The security's issue date
      * @param mixed $settlement The security's settlement (or maturity) date
-     * @param float $rate The security's annual coupon rate
-     * @param float $par The security's par value.
-     *                                    If you omit par, ACCRINT uses $1,000.
-     * @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
+     * @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, $par = 1000, $basis = 0)
+    public static function ACCRINTM($issue, $settlement, $rate, $parValue = 1000, $basis = 0)
     {
-        $issue = Functions::flattenSingleValue($issue);
-        $settlement = Functions::flattenSingleValue($settlement);
-        $rate = Functions::flattenSingleValue($rate);
-        $par = ($par === null) ? 1000 : Functions::flattenSingleValue($par);
-        $basis = ($basis === null) ? 0 : Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate = (float) $rate;
-            $par = (float) $par;
-            if (($rate <= 0) || ($par <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenIssueAndSettlement = DateTime::YEARFRAC($issue, $settlement, $basis);
-            if (!is_numeric($daysBetweenIssueAndSettlement)) {
-                //    return date error
-                return $daysBetweenIssueAndSettlement;
-            }
-
-            return $par * $rate * $daysBetweenIssueAndSettlement;
-        }
-
-        return Functions::VALUE();
+        return Securities\AccruedInterest::atMaturity($issue, $settlement, $rate, $parValue, $basis);
     }
 
     /**
@@ -241,7 +124,9 @@ class Financial
      * Excel Function:
      *        AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the AMORDEGRC() method in the Financial\Amortization class instead
+     * @see Financial\Amortization::AMORDEGRC()
      *
      * @param float $cost The cost of the asset
      * @param mixed $purchased Date of the purchase of the asset
@@ -250,63 +135,17 @@ class Financial
      * @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
+     *                       0 or omitted    US (NASD) 30/360
+     *                       1                Actual/actual
+     *                       2                Actual/360
+     *                       3                Actual/365
+     *                       4                European 30/360
      *
-     * @return float
+     * @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)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $purchased = Functions::flattenSingleValue($purchased);
-        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $period = floor(Functions::flattenSingleValue($period));
-        $rate = Functions::flattenSingleValue($rate);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        //    The depreciation coefficients are:
-        //    Life of assets (1/rate)        Depreciation coefficient
-        //    Less than 3 years            1
-        //    Between 3 and 4 years        1.5
-        //    Between 5 and 6 years        2
-        //    More than 6 years            2.5
-        $fUsePer = 1.0 / $rate;
-        if ($fUsePer < 3.0) {
-            $amortiseCoeff = 1.0;
-        } elseif ($fUsePer < 5.0) {
-            $amortiseCoeff = 1.5;
-        } elseif ($fUsePer <= 6.0) {
-            $amortiseCoeff = 2.0;
-        } else {
-            $amortiseCoeff = 2.5;
-        }
-
-        $rate *= $amortiseCoeff;
-        $fNRate = round(DateTime::YEARFRAC($purchased, $firstPeriod, $basis) * $rate * $cost, 0);
-        $cost -= $fNRate;
-        $fRest = $cost - $salvage;
-
-        for ($n = 0; $n < $period; ++$n) {
-            $fNRate = round($rate * $cost, 0);
-            $fRest -= $fNRate;
-
-            if ($fRest < 0.0) {
-                switch ($period - $n) {
-                    case 0:
-                    case 1:
-                        return round($cost * 0.5, 0);
-                    default:
-                        return 0.0;
-                }
-            }
-            $cost -= $fNRate;
-        }
-
-        return $fNRate;
+        return Amortization::AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis);
     }
 
     /**
@@ -319,7 +158,9 @@ class Financial
      * Excel Function:
      *        AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the AMORLINC() method in the Financial\Amortization class instead
+     * @see Financial\Amortization::AMORLINC()
      *
      * @param float $cost The cost of the asset
      * @param mixed $purchased Date of the purchase of the asset
@@ -328,46 +169,17 @@ class Financial
      * @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
+     *                       0 or omitted    US (NASD) 30/360
+     *                       1               Actual/actual
+     *                       2               Actual/360
+     *                       3               Actual/365
+     *                       4               European 30/360
      *
-     * @return float
+     * @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)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $purchased = Functions::flattenSingleValue($purchased);
-        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $period = Functions::flattenSingleValue($period);
-        $rate = Functions::flattenSingleValue($rate);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        $fOneRate = $cost * $rate;
-        $fCostDelta = $cost - $salvage;
-        //    Note, quirky variation for leap years on the YEARFRAC for this function
-        $purchasedYear = DateTime::YEAR($purchased);
-        $yearFrac = DateTime::YEARFRAC($purchased, $firstPeriod, $basis);
-
-        if (($basis == 1) && ($yearFrac < 1) && (DateTime::isLeapYear($purchasedYear))) {
-            $yearFrac *= 365 / 366;
-        }
-
-        $f0Rate = $yearFrac * $rate * $cost;
-        $nNumOfFullPeriods = (int) (($cost - $salvage - $f0Rate) / $fOneRate);
-
-        if ($period == 0) {
-            return $f0Rate;
-        } elseif ($period <= $nNumOfFullPeriods) {
-            return $fOneRate;
-        } elseif ($period == ($nNumOfFullPeriods + 1)) {
-            return $fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate;
-        }
-
-        return 0.0;
+        return Amortization::AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis);
     }
 
     /**
@@ -378,7 +190,9 @@ class Financial
      * Excel Function:
      *        COUPDAYBS(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPDAYBS() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPDAYBS()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -390,10 +204,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -405,28 +215,7 @@ class Financial
      */
     public static function COUPDAYBS($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-        $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
-
-        return DateTime::YEARFRAC($prev, $settlement, $basis) * $daysPerYear;
+        return Coupons::COUPDAYBS($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -437,7 +226,9 @@ class Financial
      * Excel Function:
      *        COUPDAYS(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPDAYS() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPDAYS()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -449,10 +240,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -464,43 +251,7 @@ class Financial
      */
     public static function COUPDAYS($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        switch ($basis) {
-            case 3:
-                // Actual/365
-                return 365 / $frequency;
-            case 1:
-                // Actual/actual
-                if ($frequency == 1) {
-                    $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-
-                    return $daysPerYear / $frequency;
-                }
-                $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
-                $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
-
-                return $next - $prev;
-            default:
-                // US (NASD) 30/360, Actual/360 or European 30/360
-                return 360 / $frequency;
-        }
+        return Coupons::COUPDAYS($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -511,7 +262,9 @@ class Financial
      * Excel Function:
      *        COUPDAYSNC(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPDAYSNC() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPDAYSNC()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -523,10 +276,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -538,28 +287,7 @@ class Financial
      */
     public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-        $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
-
-        return DateTime::YEARFRAC($settlement, $next, $basis) * $daysPerYear;
+        return Coupons::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -570,7 +298,9 @@ class Financial
      * Excel Function:
      *        COUPNCD(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPNCD() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPNCD()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -582,10 +312,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -598,25 +324,7 @@ class Financial
      */
     public static function COUPNCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, true);
+        return Coupons::COUPNCD($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -628,7 +336,9 @@ class Financial
      * Excel Function:
      *        COUPNUM(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPNUM() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPNUM()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -640,10 +350,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -655,37 +361,7 @@ class Financial
      */
     public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-        $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis) * $daysPerYear;
-
-        switch ($frequency) {
-            case 1: // annual payments
-            case 2: // half-yearly
-            case 4: // quarterly
-            case 6: // bimonthly
-            case 12: // monthly
-                return ceil($daysBetweenSettlementAndMaturity / $daysPerYear * $frequency);
-        }
-
-        return Functions::VALUE();
+        return Coupons::COUPNUM($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -696,7 +372,9 @@ class Financial
      * Excel Function:
      *        COUPPCD(settlement,maturity,frequency[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the COUPPCD() method in the Financial\Coupons class instead
+     * @see Financial\Coupons::COUPPCD()
      *
      * @param mixed $settlement The security's settlement date.
      *                                The security settlement date is the date after the issue
@@ -708,10 +386,6 @@ class Financial
      *                                        1    Annual
      *                                        2    Semi-Annual
      *                                        4    Quarterly
-     *                                    If working in Gnumeric Mode, the following frequency options are
-     *                                    also available
-     *                                        6    Bimonthly
-     *                                        12    Monthly
      * @param int $basis The type of day count to use.
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
@@ -724,25 +398,7 @@ class Financial
      */
     public static function COUPPCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement >= $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, false);
+        return Coupons::COUPPCD($settlement, $maturity, $frequency, $basis);
     }
 
     /**
@@ -753,44 +409,25 @@ class Financial
      * Excel Function:
      *        CUMIPMT(rate,nper,pv,start,end[,type])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the interest() method in the Financial\CashFlow\Constant\Periodic\Cumulative class instead
+     * @see Financial\CashFlow\Constant\Periodic\Cumulative::interest()
      *
      * @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.
+     *                       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.
+     *                    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)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $nper = (int) Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $start = (int) Functions::flattenSingleValue($start);
-        $end = (int) Functions::flattenSingleValue($end);
-        $type = (int) Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-        if ($start < 1 || $start > $end) {
-            return Functions::VALUE();
-        }
-
-        // Calculate
-        $interest = 0;
-        for ($per = $start; $per <= $end; ++$per) {
-            $interest += self::IPMT($rate, $per, $nper, $pv, 0, $type);
-        }
-
-        return $interest;
+        return Financial\CashFlow\Constant\Periodic\Cumulative::interest($rate, $nper, $pv, $start, $end, $type);
     }
 
     /**
@@ -801,44 +438,25 @@ class Financial
      * Excel Function:
      *        CUMPRINC(rate,nper,pv,start,end[,type])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the principal() method in the Financial\CashFlow\Constant\Periodic\Cumulative class instead
+     * @see Financial\CashFlow\Constant\Periodic\Cumulative::principal()
      *
      * @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.
+     *                       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.
+     *                    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)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $nper = (int) Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $start = (int) Functions::flattenSingleValue($start);
-        $end = (int) Functions::flattenSingleValue($end);
-        $type = (int) Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-        if ($start < 1 || $start > $end) {
-            return Functions::VALUE();
-        }
-
-        // Calculate
-        $principal = 0;
-        for ($per = $start; $per <= $end; ++$per) {
-            $principal += self::PPMT($rate, $per, $nper, $pv, 0, $type);
-        }
-
-        return $principal;
+        return Financial\CashFlow\Constant\Periodic\Cumulative::principal($rate, $nper, $pv, $start, $end, $type);
     }
 
     /**
@@ -854,7 +472,9 @@ class Financial
      * Excel Function:
      *        DB(cost,salvage,life,period[,month])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the DB() method in the Financial\Depreciation class instead
+     * @see Financial\Depreciation::DB()
      *
      * @param float $cost Initial cost of the asset
      * @param float $salvage Value at the end of the depreciation.
@@ -870,48 +490,7 @@ class Financial
      */
     public static function DB($cost, $salvage, $life, $period, $month = 12)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $life = Functions::flattenSingleValue($life);
-        $period = Functions::flattenSingleValue($period);
-        $month = Functions::flattenSingleValue($month);
-
-        //    Validate
-        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
-            $cost = (float) $cost;
-            $salvage = (float) $salvage;
-            $life = (int) $life;
-            $period = (int) $period;
-            $month = (int) $month;
-            if ($cost == 0) {
-                return 0.0;
-            } elseif (($cost < 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($month < 1)) {
-                return Functions::NAN();
-            }
-            //    Set Fixed Depreciation Rate
-            $fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-            $fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-            //    Loop through each period calculating the depreciation
-            $previousDepreciation = 0;
-            for ($per = 1; $per <= $period; ++$per) {
-                if ($per == 1) {
-                    $depreciation = $cost * $fixedDepreciationRate * $month / 12;
-                } elseif ($per == ($life + 1)) {
-                    $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
-                } else {
-                    $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
-                }
-                $previousDepreciation += $depreciation;
-            }
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                $depreciation = round($depreciation, 2);
-            }
-
-            return $depreciation;
-        }
-
-        return Functions::VALUE();
+        return Depreciation::DB($cost, $salvage, $life, $period, $month);
     }
 
     /**
@@ -923,7 +502,9 @@ class Financial
      * Excel Function:
      *        DDB(cost,salvage,life,period[,factor])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the DDB() method in the Financial\Depreciation class instead
+     * @see Financial\Depreciation::DDB()
      *
      * @param float $cost Initial cost of the asset
      * @param float $salvage Value at the end of the depreciation.
@@ -940,40 +521,7 @@ class Financial
      */
     public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $life = Functions::flattenSingleValue($life);
-        $period = Functions::flattenSingleValue($period);
-        $factor = Functions::flattenSingleValue($factor);
-
-        //    Validate
-        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($factor))) {
-            $cost = (float) $cost;
-            $salvage = (float) $salvage;
-            $life = (int) $life;
-            $period = (int) $period;
-            $factor = (float) $factor;
-            if (($cost <= 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($factor <= 0.0) || ($period > $life)) {
-                return Functions::NAN();
-            }
-            //    Set Fixed Depreciation Rate
-            $fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-            $fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-            //    Loop through each period calculating the depreciation
-            $previousDepreciation = 0;
-            for ($per = 1; $per <= $period; ++$per) {
-                $depreciation = min(($cost - $previousDepreciation) * ($factor / $life), ($cost - $salvage - $previousDepreciation));
-                $previousDepreciation += $depreciation;
-            }
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                $depreciation = round($depreciation, 2);
-            }
-
-            return $depreciation;
-        }
-
-        return Functions::VALUE();
+        return Depreciation::DDB($cost, $salvage, $life, $period, $factor);
     }
 
     /**
@@ -984,14 +532,16 @@ class Financial
      * Excel Function:
      *        DISC(settlement,maturity,price,redemption[,basis])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the discount() method in the Financial\Securities\Rates class instead
+     * @see Financial\Securities\Rates::discount()
      *
      * @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 mixed $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
@@ -1004,30 +554,7 @@ class Financial
      */
     public static function DISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $price = Functions::flattenSingleValue($price);
-        $redemption = Functions::flattenSingleValue($redemption);
-        $basis = Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-            $price = (float) $price;
-            $redemption = (float) $redemption;
-            $basis = (int) $basis;
-            if (($price <= 0) || ($redemption <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis);
-            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                //    return date error
-                return $daysBetweenSettlementAndMaturity;
-            }
-
-            return (1 - $price / $redemption) / $daysBetweenSettlementAndMaturity;
-        }
-
-        return Functions::VALUE();
+        return Financial\Securities\Rates::discount($settlement, $maturity, $price, $redemption, $basis);
     }
 
     /**
@@ -1040,32 +567,18 @@ class Financial
      * Excel Function:
      *        DOLLARDE(fractional_dollar,fraction)
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the decimal() method in the Financial\Dollar class instead
+     * @see Financial\Dollar::decimal()
      *
-     * @param float $fractional_dollar Fractional Dollar
-     * @param int $fraction Fraction
+     * @param array|float $fractional_dollar Fractional Dollar
+     * @param array|int $fraction Fraction
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function DOLLARDE($fractional_dollar = null, $fraction = 0)
     {
-        $fractional_dollar = Functions::flattenSingleValue($fractional_dollar);
-        $fraction = (int) Functions::flattenSingleValue($fraction);
-
-        // Validate parameters
-        if ($fractional_dollar === null || $fraction < 0) {
-            return Functions::NAN();
-        }
-        if ($fraction == 0) {
-            return Functions::DIV0();
-        }
-
-        $dollars = floor($fractional_dollar);
-        $cents = fmod($fractional_dollar, 1);
-        $cents /= $fraction;
-        $cents *= pow(10, ceil(log10($fraction)));
-
-        return $dollars + $cents;
+        return Dollar::decimal($fractional_dollar, $fraction);
     }
 
     /**
@@ -1078,32 +591,18 @@ class Financial
      * Excel Function:
      *        DOLLARFR(decimal_dollar,fraction)
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the fractional() method in the Financial\Dollar class instead
+     * @see Financial\Dollar::fractional()
      *
-     * @param float $decimal_dollar Decimal Dollar
-     * @param int $fraction Fraction
+     * @param array|float $decimal_dollar Decimal Dollar
+     * @param array|int $fraction Fraction
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function DOLLARFR($decimal_dollar = null, $fraction = 0)
     {
-        $decimal_dollar = Functions::flattenSingleValue($decimal_dollar);
-        $fraction = (int) Functions::flattenSingleValue($fraction);
-
-        // Validate parameters
-        if ($decimal_dollar === null || $fraction < 0) {
-            return Functions::NAN();
-        }
-        if ($fraction == 0) {
-            return Functions::DIV0();
-        }
-
-        $dollars = floor($decimal_dollar);
-        $cents = fmod($decimal_dollar, 1);
-        $cents *= $fraction;
-        $cents *= pow(10, -ceil(log10($fraction)));
-
-        return $dollars + $cents;
+        return Dollar::fractional($decimal_dollar, $fraction);
     }
 
     /**
@@ -1115,24 +614,18 @@ class Financial
      * Excel Function:
      *        EFFECT(nominal_rate,npery)
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the effective() method in the Financial\InterestRate class instead
+     * @see Financial\InterestRate::effective()
      *
-     * @param float $nominal_rate Nominal interest rate
-     * @param int $npery Number of compounding payments per year
+     * @param float $nominalRate Nominal interest rate
+     * @param int $periodsPerYear Number of compounding payments per year
      *
      * @return float|string
      */
-    public static function EFFECT($nominal_rate = 0, $npery = 0)
+    public static function EFFECT($nominalRate = 0, $periodsPerYear = 0)
     {
-        $nominal_rate = Functions::flattenSingleValue($nominal_rate);
-        $npery = (int) Functions::flattenSingleValue($npery);
-
-        // Validate parameters
-        if ($nominal_rate <= 0 || $npery < 1) {
-            return Functions::NAN();
-        }
-
-        return pow((1 + $nominal_rate / $npery), $npery) - 1;
+        return Financial\InterestRate::effective($nominalRate, $periodsPerYear);
     }
 
     /**
@@ -1143,7 +636,9 @@ class Financial
      * Excel Function:
      *        FV(rate,nper,pmt[,pv[,type]])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the futureValue() method in the Financial\CashFlow\Constant\Periodic class instead
+     * @see Financial\CashFlow\Constant\Periodic::futureValue()
      *
      * @param float $rate The interest rate per period
      * @param int $nper Total number of payment periods in an annuity
@@ -1160,23 +655,7 @@ class Financial
      */
     public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $nper = Functions::flattenSingleValue($nper);
-        $pmt = Functions::flattenSingleValue($pmt);
-        $pv = Functions::flattenSingleValue($pv);
-        $type = Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-
-        // Calculate
-        if ($rate !== null && $rate != 0) {
-            return -$pv * pow(1 + $rate, $nper) - $pmt * (1 + $rate * $type) * (pow(1 + $rate, $nper) - 1) / $rate;
-        }
-
-        return -$pv - $pmt * $nper;
+        return Financial\CashFlow\Constant\Periodic::futureValue($rate, $nper, $pmt, $pv, $type);
     }
 
     /**
@@ -1188,21 +667,18 @@ class Financial
      * Excel Function:
      *        FVSCHEDULE(principal,schedule)
      *
+     * @deprecated 1.18.0
+     *      Use the futureValue() method in the Financial\CashFlow\Single class instead
+     * @see Financial\CashFlow\Single::futureValue()
+     *
      * @param float $principal the present value
      * @param float[] $schedule an array of interest rates to apply
      *
-     * @return float
+     * @return float|string
      */
     public static function FVSCHEDULE($principal, $schedule)
     {
-        $principal = Functions::flattenSingleValue($principal);
-        $schedule = Functions::flattenArray($schedule);
-
-        foreach ($schedule as $rate) {
-            $principal *= 1 + $rate;
-        }
-
-        return $principal;
+        return Financial\CashFlow\Single::futureValue($principal, $schedule);
     }
 
     /**
@@ -1213,57 +689,44 @@ class Financial
      * Excel Function:
      *        INTRATE(settlement,maturity,investment,redemption[,basis])
      *
+     * @deprecated 1.18.0
+     *      Use the interest() method in the Financial\Securities\Rates class instead
+     * @see Financial\Securities\Rates::interest()
+     *
      * @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.
+     *                              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.
+     *                            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
+     *                       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)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $investment = Functions::flattenSingleValue($investment);
-        $redemption = Functions::flattenSingleValue($redemption);
-        $basis = Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-            $investment = (float) $investment;
-            $redemption = (float) $redemption;
-            $basis = (int) $basis;
-            if (($investment <= 0) || ($redemption <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis);
-            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                //    return date error
-                return $daysBetweenSettlementAndMaturity;
-            }
-
-            return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
-        }
-
-        return Functions::VALUE();
+        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.
+     * 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
+     *      Use the payment() method in the Financial\CashFlow\Constant\Periodic\Interest class instead
+     * @see Financial\CashFlow\Constant\Periodic\Interest::payment()
+     *
      * @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
@@ -1275,25 +738,7 @@ class Financial
      */
     public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $per = (int) Functions::flattenSingleValue($per);
-        $nper = (int) Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-        $type = (int) Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-        if ($per <= 0 || $per > $nper) {
-            return Functions::VALUE();
-        }
-
-        // Calculate
-        $interestAndPrincipal = self::interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-
-        return $interestAndPrincipal[0];
+        return Financial\CashFlow\Constant\Periodic\Interest::payment($rate, $per, $nper, $pv, $fv, $type);
     }
 
     /**
@@ -1308,63 +753,21 @@ class Financial
      * Excel Function:
      *        IRR(values[,guess])
      *
-     * @param float[] $values An array or a reference to cells that contain numbers for which you want
+     * @deprecated 1.18.0
+     *      Use the rate() method in the Financial\CashFlow\Variable\Periodic class instead
+     * @see Financial\CashFlow\Variable\Periodic::rate()
+     *
+     * @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 float $guess A number that you guess is close to the result of IRR
+     * @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)
     {
-        if (!is_array($values)) {
-            return Functions::VALUE();
-        }
-        $values = Functions::flattenArray($values);
-        $guess = Functions::flattenSingleValue($guess);
-
-        // create an initial range, with a root somewhere between 0 and guess
-        $x1 = 0.0;
-        $x2 = $guess;
-        $f1 = self::NPV($x1, $values);
-        $f2 = self::NPV($x2, $values);
-        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
-            if (($f1 * $f2) < 0.0) {
-                break;
-            }
-            if (abs($f1) < abs($f2)) {
-                $f1 = self::NPV($x1 += 1.6 * ($x1 - $x2), $values);
-            } else {
-                $f2 = self::NPV($x2 += 1.6 * ($x2 - $x1), $values);
-            }
-        }
-        if (($f1 * $f2) > 0.0) {
-            return Functions::VALUE();
-        }
-
-        $f = self::NPV($x1, $values);
-        if ($f < 0.0) {
-            $rtb = $x1;
-            $dx = $x2 - $x1;
-        } else {
-            $rtb = $x2;
-            $dx = $x1 - $x2;
-        }
-
-        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
-            $dx *= 0.5;
-            $x_mid = $rtb + $dx;
-            $f_mid = self::NPV($x_mid, $values);
-            if ($f_mid <= 0.0) {
-                $rtb = $x_mid;
-            }
-            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
-                return $x_mid;
-            }
-        }
-
-        return Functions::VALUE();
+        return Financial\CashFlow\Variable\Periodic::rate($values, $guess);
     }
 
     /**
@@ -1373,7 +776,11 @@ class Financial
      * 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)
+     *     =ISPMT(interest_rate, period, number_payments, pv)
+     *
+     * @deprecated 1.18.0
+     *      Use the schedulePayment() method in the Financial\CashFlow\Constant\Periodic\Interest class instead
+     * @see Financial\CashFlow\Constant\Periodic\Interest::schedulePayment()
      *
      * interest_rate is the interest rate for the investment
      *
@@ -1381,32 +788,15 @@ class Financial
      *
      * number_payments is the number of payments for the annuity
      *
-     * PV is the loan amount or present value of the payments
+     * pv is the loan amount or present value of the payments
+     *
+     * @param array $args
+     *
+     * @return float|string
      */
     public static function ISPMT(...$args)
     {
-        // Return value
-        $returnValue = 0;
-
-        // Get the parameters
-        $aArgs = Functions::flattenArray($args);
-        $interestRate = array_shift($aArgs);
-        $period = array_shift($aArgs);
-        $numberPeriods = array_shift($aArgs);
-        $principleRemaining = array_shift($aArgs);
-
-        // Calculate
-        $principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
-        for ($i = 0; $i <= $period; ++$i) {
-            $returnValue = $interestRate * $principleRemaining * -1;
-            $principleRemaining -= $principlePayment;
-            // principle needs to be 0 after the last payment, don't let floating point screw it up
-            if ($i == $numberPeriods) {
-                $returnValue = 0;
-            }
-        }
-
-        return $returnValue;
+        return Financial\CashFlow\Constant\Periodic\Interest::schedulePayment(...$args);
     }
 
     /**
@@ -1418,44 +808,21 @@ class Financial
      * Excel Function:
      *        MIRR(values,finance_rate, reinvestment_rate)
      *
-     * @param float[] $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 float $finance_rate The interest rate you pay on the money used in the cash flows
-     * @param float $reinvestment_rate The interest rate you receive on the cash flows as you reinvest them
+     * @deprecated 1.18.0
+     *      Use the modifiedRate() method in the Financial\CashFlow\Variable\Periodic class instead
+     * @see Financial\CashFlow\Variable\Periodic::modifiedRate()
+     *
+     * @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)
     {
-        if (!is_array($values)) {
-            return Functions::VALUE();
-        }
-        $values = Functions::flattenArray($values);
-        $finance_rate = Functions::flattenSingleValue($finance_rate);
-        $reinvestment_rate = Functions::flattenSingleValue($reinvestment_rate);
-        $n = count($values);
-
-        $rr = 1.0 + $reinvestment_rate;
-        $fr = 1.0 + $finance_rate;
-
-        $npv_pos = $npv_neg = 0.0;
-        foreach ($values as $i => $v) {
-            if ($v >= 0) {
-                $npv_pos += $v / pow($rr, $i);
-            } else {
-                $npv_neg += $v / pow($fr, $i);
-            }
-        }
-
-        if (($npv_neg == 0) || ($npv_pos == 0) || ($reinvestment_rate <= -1)) {
-            return Functions::VALUE();
-        }
-
-        $mirr = pow((-$npv_pos * pow($rr, $n))
-                / ($npv_neg * ($rr)), (1.0 / ($n - 1))) - 1.0;
-
-        return is_finite($mirr) ? $mirr : Functions::VALUE();
+        return Financial\CashFlow\Variable\Periodic::modifiedRate($values, $finance_rate, $reinvestment_rate);
     }
 
     /**
@@ -1463,23 +830,21 @@ class Financial
      *
      * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
      *
-     * @param float $effect_rate Effective interest rate
-     * @param int $npery Number of compounding payments per year
+     * Excel Function:
+     *        NOMINAL(effect_rate, npery)
+     *
+     * @deprecated 1.18.0
+     *      Use the nominal() method in the Financial\InterestRate class instead
+     * @see Financial\InterestRate::nominal()
+     *
+     * @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($effect_rate = 0, $npery = 0)
+    public static function NOMINAL($effectiveRate = 0, $periodsPerYear = 0)
     {
-        $effect_rate = Functions::flattenSingleValue($effect_rate);
-        $npery = (int) Functions::flattenSingleValue($npery);
-
-        // Validate parameters
-        if ($effect_rate <= 0 || $npery < 1) {
-            return Functions::NAN();
-        }
-
-        // Calculate
-        return $npery * (pow($effect_rate + 1, 1 / $npery) - 1);
+        return InterestRate::nominal($effectiveRate, $periodsPerYear);
     }
 
     /**
@@ -1487,6 +852,10 @@ class Financial
      *
      * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
      *
+     * @deprecated 1.18.0
+     *      Use the periods() method in the Financial\CashFlow\Constant\Periodic class instead
+     * @see Financial\CashFlow\Constant\Periodic::periods()
+     *
      * @param float $rate Interest rate per period
      * @param int $pmt Periodic payment (annuity)
      * @param float $pv Present Value
@@ -1497,30 +866,7 @@ class Financial
      */
     public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $pmt = Functions::flattenSingleValue($pmt);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-        $type = Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-
-        // Calculate
-        if ($rate !== null && $rate != 0) {
-            if ($pmt == 0 && $pv == 0) {
-                return Functions::NAN();
-            }
-
-            return log(($pmt * (1 + $rate * $type) / $rate - $fv) / ($pv + $pmt * (1 + $rate * $type) / $rate)) / log(1 + $rate);
-        }
-        if ($pmt == 0) {
-            return Functions::NAN();
-        }
-
-        return (-$pv - $fv) / $pmt;
+        return Financial\CashFlow\Constant\Periodic::periods($rate, $pmt, $pv, $fv, $type);
     }
 
     /**
@@ -1528,28 +874,17 @@ class Financial
      *
      * Returns the Net Present Value of a cash flow series given a discount rate.
      *
+     * @deprecated 1.18.0
+     *      Use the presentValue() method in the Financial\CashFlow\Variable\Periodic class instead
+     * @see Financial\CashFlow\Variable\Periodic::presentValue()
+     *
+     * @param array $args
+     *
      * @return float
      */
     public static function NPV(...$args)
     {
-        // Return value
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $rate = array_shift($aArgs);
-        $countArgs = count($aArgs);
-        for ($i = 1; $i <= $countArgs; ++$i) {
-            // Is it a numeric value?
-            if (is_numeric($aArgs[$i - 1])) {
-                $returnValue += $aArgs[$i - 1] / pow(1 + $rate, $i);
-            }
-        }
-
-        // Return
-        return $returnValue;
+        return Financial\CashFlow\Variable\Periodic::presentValue(...$args);
     }
 
     /**
@@ -1557,6 +892,10 @@ class Financial
      *
      * Calculates the number of periods required for an investment to reach a specified value.
      *
+     * @deprecated 1.18.0
+     *      Use the periods() method in the Financial\CashFlow\Single class instead
+     * @see Financial\CashFlow\Single::periods()
+     *
      * @param float $rate Interest rate per period
      * @param float $pv Present Value
      * @param float $fv Future Value
@@ -1565,18 +904,7 @@ class Financial
      */
     public static function PDURATION($rate = 0, $pv = 0, $fv = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-
-        // Validate parameters
-        if (!is_numeric($rate) || !is_numeric($pv) || !is_numeric($fv)) {
-            return Functions::VALUE();
-        } elseif ($rate <= 0.0 || $pv <= 0.0 || $fv <= 0.0) {
-            return Functions::NAN();
-        }
-
-        return (log($fv) - log($pv)) / log(1 + $rate);
+        return Financial\CashFlow\Single::periods($rate, $pv, $fv);
     }
 
     /**
@@ -1584,6 +912,10 @@ class Financial
      *
      * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
      *
+     * @deprecated 1.18.0
+     *      Use the annuity() method in the Financial\CashFlow\Constant\Periodic\Payments class instead
+     * @see Financial\CashFlow\Constant\Periodic\Payments::annuity()
+     *
      * @param float $rate Interest rate per period
      * @param int $nper Number of periods
      * @param float $pv Present Value
@@ -1594,29 +926,18 @@ class Financial
      */
     public static function PMT($rate = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $nper = Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-        $type = Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-
-        // Calculate
-        if ($rate !== null && $rate != 0) {
-            return (-$fv - $pv * pow(1 + $rate, $nper)) / (1 + $rate * $type) / ((pow(1 + $rate, $nper) - 1) / $rate);
-        }
-
-        return (-$pv - $fv) / $nper;
+        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.
+     * 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
+     *      Use the interestPayment() method in the Financial\CashFlow\Constant\Periodic\Payments class instead
+     * @see Financial\CashFlow\Constant\Periodic\Payments::interestPayment()
      *
      * @param float $rate Interest rate per period
      * @param int $per Period for which we want to find the interest
@@ -1629,66 +950,42 @@ class Financial
      */
     public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $per = (int) Functions::flattenSingleValue($per);
-        $nper = (int) Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-        $type = (int) Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-        if ($per <= 0 || $per > $nper) {
-            return Functions::VALUE();
-        }
-
-        // Calculate
-        $interestAndPrincipal = self::interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-
-        return $interestAndPrincipal[1];
+        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
+     *      Use the price() method in the Financial\Securities\Price class instead
+     * @see Financial\Securities\Price::price()
+     *
+     * @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)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $rate = (float) Functions::flattenSingleValue($rate);
-        $yield = (float) Functions::flattenSingleValue($yield);
-        $redemption = (float) Functions::flattenSingleValue($redemption);
-        $frequency = (int) Functions::flattenSingleValue($frequency);
-        $basis = ($basis === null) ? 0 : (int) Functions::flattenSingleValue($basis);
-
-        if (is_string($settlement = DateTime::getDateValue($settlement))) {
-            return Functions::VALUE();
-        }
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (($settlement > $maturity) ||
-            (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
-            return Functions::NAN();
-        }
-
-        $dsc = self::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
-        $e = self::COUPDAYS($settlement, $maturity, $frequency, $basis);
-        $n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
-        $a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
-
-        $baseYF = 1.0 + ($yield / $frequency);
-        $rfp = 100 * ($rate / $frequency);
-        $de = $dsc / $e;
-
-        $result = $redemption / pow($baseYF, (--$n + $de));
-        for ($k = 0; $k <= $n; ++$k) {
-            $result += $rfp / (pow($baseYF, ($k + $de)));
-        }
-        $result -= $rfp * ($a / $e);
-
-        return $result;
+        return Securities\Price::price($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis);
     }
 
     /**
@@ -1696,11 +993,16 @@ class Financial
      *
      * Returns the price per $100 face value of a discounted security.
      *
+     * @deprecated 1.18.0
+     *      Use the priceDiscounted() method in the Financial\Securities\Price class instead
+     * @see Financial\Securities\Price::priceDiscounted()
+     *
      * @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.
+     *                              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
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $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
@@ -1713,27 +1015,7 @@ class Financial
      */
     public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $discount = (float) Functions::flattenSingleValue($discount);
-        $redemption = (float) Functions::flattenSingleValue($redemption);
-        $basis = (int) Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-            if (($discount <= 0) || ($redemption <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis);
-            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                //    return date error
-                return $daysBetweenSettlementAndMaturity;
-            }
-
-            return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
-        }
-
-        return Functions::VALUE();
+        return Securities\Price::priceDiscounted($settlement, $maturity, $discount, $redemption, $basis);
     }
 
     /**
@@ -1741,13 +1023,18 @@ class Financial
      *
      * Returns the price per $100 face value of a security that pays interest at maturity.
      *
+     * @deprecated 1.18.0
+     *      Use the priceAtMaturity() method in the Financial\Securities\Price class instead
+     * @see Financial\Securities\Price::priceAtMaturity()
+     *
      * @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.
+     *                              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.
+     *                            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 mixed $rate The security's interest rate at date of issue
+     * @param mixed $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
@@ -1759,47 +1046,7 @@ class Financial
      */
     public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $issue = Functions::flattenSingleValue($issue);
-        $rate = Functions::flattenSingleValue($rate);
-        $yield = Functions::flattenSingleValue($yield);
-        $basis = (int) Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if (is_numeric($rate) && is_numeric($yield)) {
-            if (($rate <= 0) || ($yield <= 0)) {
-                return Functions::NAN();
-            }
-            $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-            if (!is_numeric($daysPerYear)) {
-                return $daysPerYear;
-            }
-            $daysBetweenIssueAndSettlement = DateTime::YEARFRAC($issue, $settlement, $basis);
-            if (!is_numeric($daysBetweenIssueAndSettlement)) {
-                //    return date error
-                return $daysBetweenIssueAndSettlement;
-            }
-            $daysBetweenIssueAndSettlement *= $daysPerYear;
-            $daysBetweenIssueAndMaturity = DateTime::YEARFRAC($issue, $maturity, $basis);
-            if (!is_numeric($daysBetweenIssueAndMaturity)) {
-                //    return date error
-                return $daysBetweenIssueAndMaturity;
-            }
-            $daysBetweenIssueAndMaturity *= $daysPerYear;
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($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 Functions::VALUE();
+        return Securities\Price::priceAtMaturity($settlement, $maturity, $issue, $rate, $yield, $basis);
     }
 
     /**
@@ -1807,6 +1054,10 @@ class Financial
      *
      * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
      *
+     * @deprecated 1.18.0
+     *      Use the presentValue() method in the Financial\CashFlow\Constant\Periodic class instead
+     * @see Financial\CashFlow\Constant\Periodic::presentValue()
+     *
      * @param float $rate Interest rate per period
      * @param int $nper Number of periods
      * @param float $pmt Periodic payment (annuity)
@@ -1817,23 +1068,7 @@ class Financial
      */
     public static function PV($rate = 0, $nper = 0, $pmt = 0, $fv = 0, $type = 0)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        $nper = Functions::flattenSingleValue($nper);
-        $pmt = Functions::flattenSingleValue($pmt);
-        $fv = Functions::flattenSingleValue($fv);
-        $type = Functions::flattenSingleValue($type);
-
-        // Validate parameters
-        if ($type != 0 && $type != 1) {
-            return Functions::NAN();
-        }
-
-        // Calculate
-        if ($rate !== null && $rate != 0) {
-            return (-$pmt * (1 + $rate * $type) * ((pow(1 + $rate, $nper) - 1) / $rate) - $fv) / pow(1 + $rate, $nper);
-        }
-
-        return -$fv - $pmt * $nper;
+        return Financial\CashFlow\Constant\Periodic::presentValue($rate, $nper, $pmt, $fv, $type);
     }
 
     /**
@@ -1847,113 +1082,61 @@ class Financial
      * Excel Function:
      *        RATE(nper,pmt,pv[,fv[,type[,guess]]])
      *
-     * @category Financial Functions
+     * @deprecated 1.18.0
+     *      Use the rate() method in the Financial\CashFlow\Constant\Periodic\Interest class instead
+     * @see Financial\CashFlow\Constant\Periodic\Interest::rate()
      *
-     * @param float $nper The total number of payment periods in an annuity
-     * @param float $pmt The payment made each period and cannot change over the life
+     * @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 float $pv The present value - the total amount that a series of future
+     * @param mixed $pv The present value - the total amount that a series of future
      *                                    payments is worth now
-     * @param float $fv The future value, or a cash balance you want to attain after
+     * @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 int $type A number 0 or 1 and indicates when payments are due:
+     * @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 float $guess Your guess for what the rate will be.
+     * @param mixed $guess Your guess for what the rate will be.
      *                                    If you omit guess, it is assumed to be 10 percent.
      *
-     * @return float
+     * @return float|string
      */
     public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1)
     {
-        $nper = (int) Functions::flattenSingleValue($nper);
-        $pmt = Functions::flattenSingleValue($pmt);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = ($fv === null) ? 0.0 : Functions::flattenSingleValue($fv);
-        $type = ($type === null) ? 0 : (int) Functions::flattenSingleValue($type);
-        $guess = ($guess === null) ? 0.1 : Functions::flattenSingleValue($guess);
-
-        $rate = $guess;
-        if (abs($rate) < self::FINANCIAL_PRECISION) {
-            $y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-        } else {
-            $f = exp($nper * log(1 + $rate));
-            $y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-        }
-        $y0 = $pv + $pmt * $nper + $fv;
-        $y1 = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-
-        // find root by secant method
-        $i = $x0 = 0.0;
-        $x1 = $rate;
-        while ((abs($y0 - $y1) > self::FINANCIAL_PRECISION) && ($i < self::FINANCIAL_MAX_ITERATIONS)) {
-            $rate = ($y1 * $x0 - $y0 * $x1) / ($y1 - $y0);
-            $x0 = $x1;
-            $x1 = $rate;
-            if (($nper * abs($pmt)) > ($pv - $fv)) {
-                $x1 = abs($x1);
-            }
-            if (abs($rate) < self::FINANCIAL_PRECISION) {
-                $y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-            } else {
-                $f = exp($nper * log(1 + $rate));
-                $y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-            }
-
-            $y0 = $y1;
-            $y1 = $y;
-            ++$i;
-        }
-
-        return $rate;
+        return Financial\CashFlow\Constant\Periodic\Interest::rate($nper, $pmt, $pv, $fv, $type, $guess);
     }
 
     /**
      * RECEIVED.
      *
-     * Returns the price per $100 face value of a discounted security.
+     * Returns the amount received at maturity for a fully invested Security.
+     *
+     * @deprecated 1.18.0
+     *      Use the received() method in the Financial\Securities\Price class instead
+     * @see Financial\Securities\Price::received()
      *
      * @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.
+     *                              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 $discount The security's discount rate
-     * @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
+     *                            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)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $investment = (float) Functions::flattenSingleValue($investment);
-        $discount = (float) Functions::flattenSingleValue($discount);
-        $basis = (int) Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
-            if (($investment <= 0) || ($discount <= 0)) {
-                return Functions::NAN();
-            }
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis);
-            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                //    return date error
-                return $daysBetweenSettlementAndMaturity;
-            }
-
-            return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
-        }
-
-        return Functions::VALUE();
+        return Financial\Securities\Price::received($settlement, $maturity, $investment, $discount, $basis);
     }
 
     /**
@@ -1961,6 +1144,10 @@ class Financial
      *
      * Calculates the interest rate required for an investment to grow to a specified future value .
      *
+     * @deprecated 1.18.0
+     *      Use the interestRate() method in the Financial\CashFlow\Single class instead
+     * @see Financial\CashFlow\Single::interestRate()
+     *
      * @param float $nper The number of periods over which the investment is made
      * @param float $pv Present Value
      * @param float $fv Future Value
@@ -1969,18 +1156,7 @@ class Financial
      */
     public static function RRI($nper = 0, $pv = 0, $fv = 0)
     {
-        $nper = Functions::flattenSingleValue($nper);
-        $pv = Functions::flattenSingleValue($pv);
-        $fv = Functions::flattenSingleValue($fv);
-
-        // Validate parameters
-        if (!is_numeric($nper) || !is_numeric($pv) || !is_numeric($fv)) {
-            return Functions::VALUE();
-        } elseif ($nper <= 0.0 || $pv <= 0.0 || $fv < 0.0) {
-            return Functions::NAN();
-        }
-
-        return pow($fv / $pv, 1 / $nper) - 1;
+        return Financial\CashFlow\Single::interestRate($nper, $pv, $fv);
     }
 
     /**
@@ -1988,6 +1164,10 @@ class Financial
      *
      * Returns the straight-line depreciation of an asset for one period
      *
+     * @deprecated 1.18.0
+     *      Use the SLN() method in the Financial\Depreciation class instead
+     * @see Financial\Depreciation::SLN()
+     *
      * @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
@@ -1996,20 +1176,7 @@ class Financial
      */
     public static function SLN($cost, $salvage, $life)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $life = Functions::flattenSingleValue($life);
-
-        // Calculate
-        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life))) {
-            if ($life < 0) {
-                return Functions::NAN();
-            }
-
-            return ($cost - $salvage) / $life;
-        }
-
-        return Functions::VALUE();
+        return Depreciation::SLN($cost, $salvage, $life);
     }
 
     /**
@@ -2017,6 +1184,10 @@ class Financial
      *
      * Returns the sum-of-years' digits depreciation of an asset for a specified period.
      *
+     * @deprecated 1.18.0
+     *      Use the SYD() method in the Financial\Depreciation class instead
+     * @see Financial\Depreciation::SYD()
+     *
      * @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
@@ -2026,21 +1197,7 @@ class Financial
      */
     public static function SYD($cost, $salvage, $life, $period)
     {
-        $cost = Functions::flattenSingleValue($cost);
-        $salvage = Functions::flattenSingleValue($salvage);
-        $life = Functions::flattenSingleValue($life);
-        $period = Functions::flattenSingleValue($period);
-
-        // Calculate
-        if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
-            if (($life < 1) || ($period > $life)) {
-                return Functions::NAN();
-            }
-
-            return (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
-        }
-
-        return Functions::VALUE();
+        return Depreciation::SYD($cost, $salvage, $life, $period);
     }
 
     /**
@@ -2048,93 +1205,45 @@ class Financial
      *
      * Returns the bond-equivalent yield for a Treasury bill.
      *
+     * @deprecated 1.18.0
+     *      Use the bondEquivalentYield() method in the Financial\TreasuryBill class instead
+     * @see Financial\TreasuryBill::bondEquivalentYield()
+     *
      * @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.
+     *                          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
+     * @param mixed $discount The Treasury bill's discount rate
      *
      * @return float|string Result, or a string containing an error
      */
     public static function TBILLEQ($settlement, $maturity, $discount)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $discount = Functions::flattenSingleValue($discount);
-
-        //    Use TBILLPRICE for validation
-        $testValue = self::TBILLPRICE($settlement, $maturity, $discount);
-        if (is_string($testValue)) {
-            return $testValue;
-        }
-
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-            ++$maturity;
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity) * 360;
-        } else {
-            $daysBetweenSettlementAndMaturity = (DateTime::getDateValue($maturity) - DateTime::getDateValue($settlement));
-        }
-
-        return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
+        return TreasuryBill::bondEquivalentYield($settlement, $maturity, $discount);
     }
 
     /**
      * TBILLPRICE.
      *
-     * Returns the yield for a Treasury bill.
+     * Returns the price per $100 face value for a Treasury bill.
+     *
+     * @deprecated 1.18.0
+     *      Use the price() method in the Financial\TreasuryBill class instead
+     * @see Financial\TreasuryBill::price()
      *
      * @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.
+     *                                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
+     * @param mixed $discount The Treasury bill's discount rate
      *
      * @return float|string Result, or a string containing an error
      */
     public static function TBILLPRICE($settlement, $maturity, $discount)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $discount = Functions::flattenSingleValue($discount);
-
-        if (is_string($maturity = DateTime::getDateValue($maturity))) {
-            return Functions::VALUE();
-        }
-
-        //    Validate
-        if (is_numeric($discount)) {
-            if ($discount <= 0) {
-                return Functions::NAN();
-            }
-
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                ++$maturity;
-                $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity) * 360;
-                if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                    //    return date error
-                    return $daysBetweenSettlementAndMaturity;
-                }
-            } else {
-                $daysBetweenSettlementAndMaturity = (DateTime::getDateValue($maturity) - DateTime::getDateValue($settlement));
-            }
-
-            if ($daysBetweenSettlementAndMaturity > 360) {
-                return Functions::NAN();
-            }
-
-            $price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
-            if ($price <= 0) {
-                return Functions::NAN();
-            }
-
-            return $price;
-        }
-
-        return Functions::VALUE();
+        return TreasuryBill::price($settlement, $maturity, $discount);
     }
 
     /**
@@ -2142,45 +1251,22 @@ class Financial
      *
      * Returns the yield for a Treasury bill.
      *
+     * @deprecated 1.18.0
+     *      Use the yield() method in the Financial\TreasuryBill class instead
+     * @see Financial\TreasuryBill::yield()
+     *
      * @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.
+     *                                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
+     * @param mixed $price The Treasury bill's price per $100 face value
      *
      * @return float|mixed|string
      */
     public static function TBILLYIELD($settlement, $maturity, $price)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $price = Functions::flattenSingleValue($price);
-
-        //    Validate
-        if (is_numeric($price)) {
-            if ($price <= 0) {
-                return Functions::NAN();
-            }
-
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                ++$maturity;
-                $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity) * 360;
-                if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                    //    return date error
-                    return $daysBetweenSettlementAndMaturity;
-                }
-            } else {
-                $daysBetweenSettlementAndMaturity = (DateTime::getDateValue($maturity) - DateTime::getDateValue($settlement));
-            }
-
-            if ($daysBetweenSettlementAndMaturity > 360) {
-                return Functions::NAN();
-            }
-
-            return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
-        }
-
-        return Functions::VALUE();
+        return TreasuryBill::yield($settlement, $maturity, $price);
     }
 
     /**
@@ -2191,6 +1277,10 @@ class Financial
      * Excel Function:
      *        =XIRR(values,dates,guess)
      *
+     * @deprecated 1.18.0
+     *      Use the rate() method in the Financial\CashFlow\Variable\NonPeriodic class instead
+     * @see Financial\CashFlow\Variable\NonPeriodic::rate()
+     *
      * @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
@@ -2202,73 +1292,7 @@ class Financial
      */
     public static function XIRR($values, $dates, $guess = 0.1)
     {
-        if ((!is_array($values)) && (!is_array($dates))) {
-            return Functions::VALUE();
-        }
-        $values = Functions::flattenArray($values);
-        $dates = Functions::flattenArray($dates);
-        $guess = Functions::flattenSingleValue($guess);
-        if (count($values) != count($dates)) {
-            return Functions::NAN();
-        }
-
-        $datesCount = count($dates);
-        for ($i = 0; $i < $datesCount; ++$i) {
-            $dates[$i] = DateTime::getDateValue($dates[$i]);
-            if (!is_numeric($dates[$i])) {
-                return Functions::VALUE();
-            }
-        }
-        if (min($dates) != $dates[0]) {
-            return Functions::NAN();
-        }
-
-        // create an initial range, with a root somewhere between 0 and guess
-        $x1 = 0.0;
-        $x2 = $guess;
-        $f1 = self::XNPV($x1, $values, $dates);
-        if (!is_numeric($f1)) {
-            return $f1;
-        }
-        $f2 = self::XNPV($x2, $values, $dates);
-        if (!is_numeric($f2)) {
-            return $f2;
-        }
-        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
-            if (($f1 * $f2) < 0.0) {
-                break;
-            } elseif (abs($f1) < abs($f2)) {
-                $f1 = self::XNPV($x1 += 1.6 * ($x1 - $x2), $values, $dates);
-            } else {
-                $f2 = self::XNPV($x2 += 1.6 * ($x2 - $x1), $values, $dates);
-            }
-        }
-        if (($f1 * $f2) > 0.0) {
-            return Functions::NAN();
-        }
-
-        $f = self::XNPV($x1, $values, $dates);
-        if ($f < 0.0) {
-            $rtb = $x1;
-            $dx = $x2 - $x1;
-        } else {
-            $rtb = $x2;
-            $dx = $x1 - $x2;
-        }
-
-        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
-            $dx *= 0.5;
-            $x_mid = $rtb + $dx;
-            $f_mid = self::XNPV($x_mid, $values, $dates);
-            if ($f_mid <= 0.0) {
-                $rtb = $x_mid;
-            }
-            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
-                return $x_mid;
-            }
-        }
-
-        return Functions::VALUE();
+        return Financial\CashFlow\Variable\NonPeriodic::rate($values, $dates, $guess);
     }
 
     /**
@@ -2280,45 +1304,26 @@ class Financial
      * Excel Function:
      *        =XNPV(rate,values,dates)
      *
+     * @deprecated 1.18.0
+     *      Use the presentValue() method in the Financial\CashFlow\Variable\NonPeriodic class instead
+     * @see Financial\CashFlow\Variable\NonPeriodic::presentValue()
+     *
      * @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.
+     * @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)
     {
-        $rate = Functions::flattenSingleValue($rate);
-        if (!is_numeric($rate)) {
-            return Functions::VALUE();
-        }
-        if ((!is_array($values)) || (!is_array($dates))) {
-            return Functions::VALUE();
-        }
-        $values = Functions::flattenArray($values);
-        $dates = Functions::flattenArray($dates);
-        $valCount = count($values);
-        if ($valCount != count($dates)) {
-            return Functions::NAN();
-        }
-        if ((min($values) > 0) || (max($values) < 0)) {
-            return Functions::NAN();
-        }
-
-        $xnpv = 0.0;
-        for ($i = 0; $i < $valCount; ++$i) {
-            if (!is_numeric($values[$i])) {
-                return Functions::VALUE();
-            }
-            $xnpv += $values[$i] / pow(1 + $rate, DateTime::DATEDIF($dates[0], $dates[$i], 'd') / 365);
-        }
-
-        return (is_finite($xnpv)) ? $xnpv : Functions::VALUE();
+        return Financial\CashFlow\Variable\NonPeriodic::presentValue($rate, $values, $dates);
     }
 
     /**
@@ -2326,11 +1331,16 @@ class Financial
      *
      * Returns the annual yield of a security that pays interest at maturity.
      *
+     * @deprecated 1.18.0
+     *      Use the yieldDiscounted() method in the Financial\Securities\Yields class instead
+     * @see Financial\Securities\Yields::yieldDiscounted()
+     *
      * @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.
+     *                              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
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $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
@@ -2343,32 +1353,7 @@ class Financial
      */
     public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $price = Functions::flattenSingleValue($price);
-        $redemption = Functions::flattenSingleValue($redemption);
-        $basis = (int) Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if (is_numeric($price) && is_numeric($redemption)) {
-            if (($price <= 0) || ($redemption <= 0)) {
-                return Functions::NAN();
-            }
-            $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-            if (!is_numeric($daysPerYear)) {
-                return $daysPerYear;
-            }
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($settlement, $maturity, $basis);
-            if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-                //    return date error
-                return $daysBetweenSettlementAndMaturity;
-            }
-            $daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-            return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
-        }
-
-        return Functions::VALUE();
+        return Securities\Yields::yieldDiscounted($settlement, $maturity, $price, $redemption, $basis);
     }
 
     /**
@@ -2376,64 +1361,29 @@ class Financial
      *
      * Returns the annual yield of a security that pays interest at maturity.
      *
+     * @deprecated 1.18.0
+     *      Use the yieldAtMaturity() method in the Financial\Securities\Yields class instead
+     * @see Financial\Securities\Yields::yieldAtMaturity()
+     *
      * @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.
+     *                              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.
+     *                            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 mixed $rate The security's interest rate at date of issue
+     * @param mixed $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
+     *                       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)
     {
-        $settlement = Functions::flattenSingleValue($settlement);
-        $maturity = Functions::flattenSingleValue($maturity);
-        $issue = Functions::flattenSingleValue($issue);
-        $rate = Functions::flattenSingleValue($rate);
-        $price = Functions::flattenSingleValue($price);
-        $basis = (int) Functions::flattenSingleValue($basis);
-
-        //    Validate
-        if (is_numeric($rate) && is_numeric($price)) {
-            if (($rate <= 0) || ($price <= 0)) {
-                return Functions::NAN();
-            }
-            $daysPerYear = self::daysPerYear(DateTime::YEAR($settlement), $basis);
-            if (!is_numeric($daysPerYear)) {
-                return $daysPerYear;
-            }
-            $daysBetweenIssueAndSettlement = DateTime::YEARFRAC($issue, $settlement, $basis);
-            if (!is_numeric($daysBetweenIssueAndSettlement)) {
-                //    return date error
-                return $daysBetweenIssueAndSettlement;
-            }
-            $daysBetweenIssueAndSettlement *= $daysPerYear;
-            $daysBetweenIssueAndMaturity = DateTime::YEARFRAC($issue, $maturity, $basis);
-            if (!is_numeric($daysBetweenIssueAndMaturity)) {
-                //    return date error
-                return $daysBetweenIssueAndMaturity;
-            }
-            $daysBetweenIssueAndMaturity *= $daysPerYear;
-            $daysBetweenSettlementAndMaturity = DateTime::YEARFRAC($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 Functions::VALUE();
+        return Securities\Yields::yieldAtMaturity($settlement, $maturity, $issue, $rate, $price, $basis);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
new file mode 100644
index 000000000..a531e31be
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
@@ -0,0 +1,216 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Amortization
+{
+    /**
+     * 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])
+     *
+     * @param mixed $cost The float 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 mixed $period the period (float)
+     * @param mixed $rate rate of depreciation (float)
+     * @param mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
+        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $period = Functions::flattenSingleValue($period);
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $cost = FinancialValidations::validateFloat($cost);
+            $purchased = FinancialValidations::validateDate($purchased);
+            $firstPeriod = FinancialValidations::validateDate($firstPeriod);
+            $salvage = FinancialValidations::validateFloat($salvage);
+            $period = FinancialValidations::validateInt($period);
+            $rate = FinancialValidations::validateFloat($rate);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
+        }
+        /** @var float */
+        $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;
+
+        for ($n = 0; $n < $period; ++$n) {
+            $fNRate = round($rate * $cost, 0);
+            $fRest -= $fNRate;
+
+            if ($fRest < 0.0) {
+                switch ($period - $n) {
+                    case 0:
+                    case 1:
+                        return round($cost * 0.5, 0);
+                    default:
+                        return 0.0;
+                }
+            }
+            $cost -= $fNRate;
+        }
+
+        return $fNRate;
+    }
+
+    /**
+     * 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])
+     *
+     * @param mixed $cost The cost of the asset as a float
+     * @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 mixed $period The period as a float
+     * @param mixed $rate Rate of depreciation as  float
+     * @param mixed $basis Integer indicating 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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
+        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $period = Functions::flattenSingleValue($period);
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $cost = FinancialValidations::validateFloat($cost);
+            $purchased = FinancialValidations::validateDate($purchased);
+            $firstPeriod = FinancialValidations::validateDate($firstPeriod);
+            $salvage = FinancialValidations::validateFloat($salvage);
+            $period = FinancialValidations::validateFloat($period);
+            $rate = FinancialValidations::validateFloat($rate);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $fOneRate = $cost * $rate;
+        $fCostDelta = $cost - $salvage;
+        //    Note, quirky variation for leap years on the YEARFRAC for this function
+        $purchasedYear = DateTimeExcel\DateParts::year($purchased);
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
+        }
+        /** @var float */
+        $yearFrac = $yearFracx;
+
+        if (
+            $basis == FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+            && $yearFrac < 1
+            && DateTimeExcel\Helpers::isLeapYear(Functions::scalar($purchasedYear))
+        ) {
+            $yearFrac *= 365 / 366;
+        }
+
+        $f0Rate = $yearFrac * $rate * $cost;
+        $nNumOfFullPeriods = (int) (($cost - $salvage - $f0Rate) / $fOneRate);
+
+        if ($period == 0) {
+            return $f0Rate;
+        } elseif ($period <= $nNumOfFullPeriods) {
+            return $fOneRate;
+        } elseif ($period == ($nNumOfFullPeriods + 1)) {
+            return $fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate;
+        }
+
+        return 0.0;
+    }
+
+    private static function getAmortizationCoefficient(float $rate): float
+    {
+        //    The depreciation coefficients are:
+        //    Life of assets (1/rate)        Depreciation coefficient
+        //    Less than 3 years            1
+        //    Between 3 and 4 years        1.5
+        //    Between 5 and 6 years        2
+        //    More than 6 years            2.5
+        $fUsePer = 1.0 / $rate;
+
+        if ($fUsePer < 3.0) {
+            return 1.0;
+        } elseif ($fUsePer < 4.0) {
+            return 1.5;
+        } elseif ($fUsePer <= 6.0) {
+            return 2.0;
+        }
+
+        return 2.5;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
new file mode 100644
index 000000000..8ebe9ed72
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class CashFlowValidations extends FinancialValidations
+{
+    /**
+     * @param mixed $rate
+     */
+    public static function validateRate($rate): float
+    {
+        $rate = self::validateFloat($rate);
+
+        return $rate;
+    }
+
+    /**
+     * @param mixed $type
+     */
+    public static function validatePeriodType($type): int
+    {
+        $rate = self::validateInt($type);
+        if (
+            $type !== FinancialConstants::PAYMENT_END_OF_PERIOD &&
+            $type !== FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD
+        ) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $rate;
+    }
+
+    /**
+     * @param mixed $presentValue
+     */
+    public static function validatePresentValue($presentValue): float
+    {
+        return self::validateFloat($presentValue);
+    }
+
+    /**
+     * @param mixed $futureValue
+     */
+    public static function validateFutureValue($futureValue): float
+    {
+        return self::validateFloat($futureValue);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
new file mode 100644
index 000000000..a19c37f60
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+{
+    /**
+     * FV.
+     *
+     * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * Excel Function:
+     *        FV(rate,nper,pmt[,pv[,type]])
+     *
+     * @param mixed $rate The interest rate per period
+     * @param mixed $numberOfPeriods Total number of payment periods in an annuity as an integer
+     * @param mixed $payment 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 mixed $presentValue present Value, or the lump-sum amount that a series of
+     *                            future payments is worth right now
+     * @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
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
+        $presentValue = ($presentValue === null) ? 0.0 : Functions::flattenSingleValue($presentValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::calculateFutureValue($rate, $numberOfPeriods, $payment, $presentValue, $type);
+    }
+
+    /**
+     * PV.
+     *
+     * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $numberOfPeriods Number of periods as an integer
+     * @param mixed $payment Periodic payment (annuity)
+     * @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 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
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($numberOfPeriods < 0) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculatePresentValue($rate, $numberOfPeriods, $payment, $futureValue, $type);
+    }
+
+    /**
+     * NPER.
+     *
+     * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $payment Periodic payment (annuity)
+     * @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 Result, or a string containing an error
+     */
+    public static function periods(
+        $rate,
+        $payment,
+        $presentValue,
+        $futureValue = 0.0,
+        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $payment = Functions::flattenSingleValue($payment);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($payment == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculatePeriods($rate, $payment, $presentValue, $futureValue, $type);
+    }
+
+    private static function calculateFutureValue(
+        float $rate,
+        int $numberOfPeriods,
+        float $payment,
+        float $presentValue,
+        int $type
+    ): float {
+        if ($rate !== null && $rate != 0) {
+            return -$presentValue *
+                (1 + $rate) ** $numberOfPeriods - $payment * (1 + $rate * $type) * ((1 + $rate) ** $numberOfPeriods - 1)
+                    / $rate;
+        }
+
+        return -$presentValue - $payment * $numberOfPeriods;
+    }
+
+    private static function calculatePresentValue(
+        float $rate,
+        int $numberOfPeriods,
+        float $payment,
+        float $futureValue,
+        int $type
+    ): float {
+        if ($rate != 0.0) {
+            return (-$payment * (1 + $rate * $type)
+                    * (((1 + $rate) ** $numberOfPeriods - 1) / $rate) - $futureValue) / (1 + $rate) ** $numberOfPeriods;
+        }
+
+        return -$futureValue - $payment * $numberOfPeriods;
+    }
+
+    /**
+     * @return float|string
+     */
+    private static function calculatePeriods(
+        float $rate,
+        float $payment,
+        float $presentValue,
+        float $futureValue,
+        int $type
+    ) {
+        if ($rate != 0.0) {
+            if ($presentValue == 0.0) {
+                return ExcelError::NAN();
+            }
+
+            return log(($payment * (1 + $rate * $type) / $rate - $futureValue) /
+                    ($presentValue + $payment * (1 + $rate * $type) / $rate)) / log(1 + $rate);
+        }
+
+        return (-$presentValue - $futureValue) / $payment;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
new file mode 100644
index 000000000..b7aaffd82
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+{
+    /**
+     * CUMIPMT.
+     *
+     * Returns the cumulative interest paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMIPMT(rate,nper,pv,start,end[,type])
+     *
+     * @param mixed $rate The Interest rate
+     * @param mixed $periods The total number of payment periods
+     * @param mixed $presentValue Present Value
+     * @param mixed $start The first period in the calculation.
+     *                       Payment periods are numbered beginning with 1.
+     * @param mixed $end the last period in the calculation
+     * @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
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $start = Functions::flattenSingleValue($start);
+        $end = Functions::flattenSingleValue($end);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $periods = CashFlowValidations::validateInt($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $start = CashFlowValidations::validateInt($start);
+            $end = CashFlowValidations::validateInt($end);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($start < 1 || $start > $end) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interest = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $ipmt = Interest::payment($rate, $per, $periods, $presentValue, 0, $type);
+            if (is_string($ipmt)) {
+                return $ipmt;
+            }
+
+            $interest += $ipmt;
+        }
+
+        return $interest;
+    }
+
+    /**
+     * CUMPRINC.
+     *
+     * Returns the cumulative principal paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMPRINC(rate,nper,pv,start,end[,type])
+     *
+     * @param mixed $rate The Interest rate
+     * @param mixed $periods The total number of payment periods as an integer
+     * @param mixed $presentValue Present Value
+     * @param mixed $start The first period in the calculation.
+     *                       Payment periods are numbered beginning with 1.
+     * @param mixed $end the last period in the calculation
+     * @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
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $start = Functions::flattenSingleValue($start);
+        $end = Functions::flattenSingleValue($end);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $periods = CashFlowValidations::validateInt($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $start = CashFlowValidations::validateInt($start);
+            $end = CashFlowValidations::validateInt($end);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($start < 1 || $start > $end) {
+            return ExcelError::VALUE();
+        }
+
+        // Calculate
+        $principal = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $ppmt = Payments::interestPayment($rate, $per, $periods, $presentValue, 0, $type);
+            if (is_string($ppmt)) {
+                return $ppmt;
+            }
+
+            $principal += $ppmt;
+        }
+
+        return $principal;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
new file mode 100644
index 000000000..caec74fc5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+{
+    private const FINANCIAL_MAX_ITERATIONS = 128;
+
+    private const FINANCIAL_PRECISION = 1.0e-08;
+
+    /**
+     * 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])
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $period Period for which we want to find the interest
+     * @param mixed $numberOfPeriods Number of periods
+     * @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
+    ) {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interestAndPrincipal = new InterestAndPrincipal(
+            $interestRate,
+            $period,
+            $numberOfPeriods,
+            $presentValue,
+            $futureValue,
+            $type
+        );
+
+        return $interestAndPrincipal->interest();
+    }
+
+    /**
+     * 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)
+     *
+     * @param mixed $interestRate is the interest rate for the investment
+     * @param mixed $period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
+     * @param mixed $numberOfPeriods is the number of payments for the annuity
+     * @param mixed $principleRemaining is the loan amount or present value of the payments
+     *
+     * @return float|string
+     */
+    public static function schedulePayment($interestRate, $period, $numberOfPeriods, $principleRemaining)
+    {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $principleRemaining = Functions::flattenSingleValue($principleRemaining);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $principleRemaining = CashFlowValidations::validateFloat($principleRemaining);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Return value
+        $returnValue = 0;
+
+        // Calculate
+        $principlePayment = ($principleRemaining * 1.0) / ($numberOfPeriods * 1.0);
+        for ($i = 0; $i <= $period; ++$i) {
+            $returnValue = $interestRate * $principleRemaining * -1;
+            $principleRemaining -= $principlePayment;
+            // principle needs to be 0 after the last payment, don't let floating point screw it up
+            if ($i == $numberOfPeriods) {
+                $returnValue = 0.0;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * 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]]])
+     *
+     * @param mixed $numberOfPeriods The total number of payment periods in an annuity
+     * @param mixed $payment 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 $presentValue The present value - the total amount that a series of future payments is worth now
+     * @param mixed $futureValue 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(
+        $numberOfPeriods,
+        $payment,
+        $presentValue,
+        $futureValue = 0.0,
+        $type = FinancialConstants::PAYMENT_END_OF_PERIOD,
+        $guess = 0.1
+    ) {
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = Functions::flattenSingleValue($payment);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+        $guess = ($guess === null) ? 0.1 : Functions::flattenSingleValue($guess);
+
+        try {
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+            $guess = CashFlowValidations::validateFloat($guess);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $rate = $guess;
+        // rest of code adapted from python/numpy
+        $close = false;
+        $iter = 0;
+        while (!$close && $iter < self::FINANCIAL_MAX_ITERATIONS) {
+            $nextdiff = self::rateNextGuess($rate, $numberOfPeriods, $payment, $presentValue, $futureValue, $type);
+            if (!is_numeric($nextdiff)) {
+                break;
+            }
+            $rate1 = $rate - $nextdiff;
+            $close = abs($rate1 - $rate) < self::FINANCIAL_PRECISION;
+            ++$iter;
+            $rate = $rate1;
+        }
+
+        return $close ? $rate : ExcelError::NAN();
+    }
+
+    /** @return float|string */
+    private static function rateNextGuess(float $rate, int $numberOfPeriods, float $payment, float $presentValue, float $futureValue, int $type)
+    {
+        if ($rate == 0.0) {
+            return ExcelError::NAN();
+        }
+        $tt1 = ($rate + 1) ** $numberOfPeriods;
+        $tt2 = ($rate + 1) ** ($numberOfPeriods - 1);
+        $numerator = $futureValue + $tt1 * $presentValue + $payment * ($tt1 - 1) * ($rate * $type + 1) / $rate;
+        $denominator = $numberOfPeriods * $tt2 * $presentValue - $payment * ($tt1 - 1)
+            * ($rate * $type + 1) / ($rate * $rate) + $numberOfPeriods
+            * $payment * $tt2 * ($rate * $type + 1) / $rate + $payment * ($tt1 - 1) * $type / $rate;
+        if ($denominator == 0) {
+            return ExcelError::NAN();
+        }
+
+        return $numerator / $denominator;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
new file mode 100644
index 000000000..1408d465a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+
+class InterestAndPrincipal
+{
+    /** @var float */
+    protected $interest;
+
+    /** @var float */
+    protected $principal;
+
+    public function __construct(
+        float $rate = 0.0,
+        int $period = 0,
+        int $numberOfPeriods = 0,
+        float $presentValue = 0,
+        float $futureValue = 0,
+        int $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $payment = Payments::annuity($rate, $numberOfPeriods, $presentValue, $futureValue, $type);
+        $capital = $presentValue;
+        $interest = 0.0;
+        $principal = 0.0;
+        for ($i = 1; $i <= $period; ++$i) {
+            $interest = ($type === FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD && $i == 1) ? 0 : -$capital * $rate;
+            $principal = (float) $payment - $interest;
+            $capital += $principal;
+        }
+
+        $this->interest = $interest;
+        $this->principal = $principal;
+    }
+
+    public function interest(): float
+    {
+        return $this->interest;
+    }
+
+    public function principal(): float
+    {
+        return $this->principal;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
new file mode 100644
index 000000000..83965f9d3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+{
+    /**
+     * PMT.
+     *
+     * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $numberOfPeriods Number of periods
+     * @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 Result, or a string containing an error
+     */
+    public static function annuity(
+        $interestRate,
+        $numberOfPeriods,
+        $presentValue,
+        $futureValue = 0,
+        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Calculate
+        if ($interestRate != 0.0) {
+            return (-$futureValue - $presentValue * (1 + $interestRate) ** $numberOfPeriods) /
+                (1 + $interestRate * $type) / (((1 + $interestRate) ** $numberOfPeriods - 1) / $interestRate);
+        }
+
+        return (-$presentValue - $futureValue) / $numberOfPeriods;
+    }
+
+    /**
+     * PPMT.
+     *
+     * Returns the interest payment for a given period for an investment based on periodic, constant payments
+     *         and a constant interest rate.
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $period Period for which we want to find the interest
+     * @param mixed $numberOfPeriods Number of periods
+     * @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 Result, or a string containing an error
+     */
+    public static function interestPayment(
+        $interestRate,
+        $period,
+        $numberOfPeriods,
+        $presentValue,
+        $futureValue = 0,
+        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interestAndPrincipal = new InterestAndPrincipal(
+            $interestRate,
+            $period,
+            $numberOfPeriods,
+            $presentValue,
+            $futureValue,
+            $type
+        );
+
+        return $interestAndPrincipal->principal();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
new file mode 100644
index 000000000..058e89c64
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Single
+{
+    /**
+     * 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)
+     *
+     * @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)
+    {
+        $principal = Functions::flattenSingleValue($principal);
+        $schedule = Functions::flattenArray($schedule);
+
+        try {
+            $principal = CashFlowValidations::validateFloat($principal);
+
+            foreach ($schedule as $rate) {
+                $rate = CashFlowValidations::validateFloat($rate);
+                $principal *= 1 + $rate;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $principal;
+    }
+
+    /**
+     * PDURATION.
+     *
+     * Calculates the number of periods required for an investment to reach a specified value.
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function periods($rate, $presentValue, $futureValue)
+    {
+        $rate = Functions::flattenSingleValue($rate);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = Functions::flattenSingleValue($futureValue);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($rate <= 0.0 || $presentValue <= 0.0 || $futureValue <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (log($futureValue) - log($presentValue)) / log(1 + $rate);
+    }
+
+    /**
+     * RRI.
+     *
+     * 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
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function interestRate($periods = 0.0, $presentValue = 0.0, $futureValue = 0.0)
+    {
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = Functions::flattenSingleValue($futureValue);
+
+        try {
+            $periods = CashFlowValidations::validateFloat($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($periods <= 0.0 || $presentValue <= 0.0 || $futureValue < 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return ($futureValue / $presentValue) ** (1 / $periods) - 1;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
new file mode 100644
index 000000000..b4247b704
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
@@ -0,0 +1,325 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class NonPeriodic
+{
+    const FINANCIAL_MAX_ITERATIONS = 128;
+
+    const FINANCIAL_PRECISION = 1.0e-08;
+
+    const DEFAULT_GUESS = 0.1;
+
+    /**
+     * XIRR.
+     *
+     * Returns the internal rate of return for a schedule of cash flows that is not necessarily periodic.
+     *
+     * Excel Function:
+     *        =XIRR(values,dates,guess)
+     *
+     * @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 mixed $guess        An optional guess at the expected answer
+     *
+     * @return float|string
+     */
+    public static function rate($values, $dates, $guess = self::DEFAULT_GUESS)
+    {
+        $rslt = self::xirrPart1($values, $dates);
+        if ($rslt !== '') {
+            return $rslt;
+        }
+
+        // create an initial range, with a root somewhere between 0 and 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.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)) {
+                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)) {
+                $x1 += 1.6 * ($x1 - $x2);
+                $f1 = self::xnpvOrdered($x1, $values, $dates, false);
+            } else {
+                $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 self::xirrBisection($values, $dates, $x1, $x2);
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * 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)
+     *
+     * @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|string
+     */
+    public static function presentValue($rate, $values, $dates)
+    {
+        return self::xnpvOrdered($rate, $values, $dates, true);
+    }
+
+    private static function bothNegAndPos(bool $neg, bool $pos): bool
+    {
+        return $neg && $pos;
+    }
+
+    /**
+     * @param mixed $values
+     * @param mixed $dates
+     */
+    private static function xirrPart1(&$values, &$dates): string
+    {
+        $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 ExcelError::NAN();
+        }
+
+        $datesCount = count($dates);
+        for ($i = 0; $i < $datesCount; ++$i) {
+            try {
+                $dates[$i] = DateTimeExcel\Helpers::getDateValue($dates[$i]);
+            } catch (Exception $e) {
+                return $e->getMessage();
+            }
+        }
+
+        return self::xirrPart2($values);
+    }
+
+    private static function xirrPart2(array &$values): string
+    {
+        $valCount = count($values);
+        $foundpos = false;
+        $foundneg = false;
+        for ($i = 0; $i < $valCount; ++$i) {
+            $fld = $values[$i];
+            if (!is_numeric($fld)) {
+                return ExcelError::VALUE();
+            } elseif ($fld > 0) {
+                $foundpos = true;
+            } elseif ($fld < 0) {
+                $foundneg = true;
+            }
+        }
+        if (!self::bothNegAndPos($foundneg, $foundpos)) {
+            return ExcelError::NAN();
+        }
+
+        return '';
+    }
+
+    /**
+     * @return float|string
+     */
+    private static function xirrPart3(array $values, array $dates, float $x1, float $x2)
+    {
+        $f = self::xnpvOrdered($x1, $values, $dates, false);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        $rslt = ExcelError::VALUE();
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = (float) self::xnpvOrdered($x_mid, $values, $dates, false);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
+                $rslt = $x_mid;
+
+                break;
+            }
+        }
+
+        return $rslt;
+    }
+
+    /**
+     * @return float|string
+     */
+    private static function xirrBisection(array $values, array $dates, float $x1, float $x2)
+    {
+        $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;
+    }
+
+    /**
+     * @param mixed $rate
+     * @param mixed $values
+     * @param mixed $dates
+     *
+     * @return float|string
+     */
+    private static function xnpvOrdered($rate, $values, $dates, bool $ordered = true, bool $capAtNegative1 = false)
+    {
+        $rate = Functions::flattenSingleValue($rate);
+        $values = Functions::flattenArray($values);
+        $dates = Functions::flattenArray($dates);
+        $valCount = count($values);
+
+        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();
+        }
+
+        $xnpv = 0.0;
+        for ($i = 0; $i < $valCount; ++$i) {
+            if (!is_numeric($values[$i])) {
+                return ExcelError::VALUE();
+            }
+
+            try {
+                $datei = DateTimeExcel\Helpers::getDateValue($dates[$i]);
+            } catch (Exception $e) {
+                return $e->getMessage();
+            }
+            if ($date0 > $datei) {
+                $dif = $ordered ? ExcelError::NAN() : -((int) DateTimeExcel\Difference::interval($datei, $date0, 'd'));
+            } else {
+                $dif = Functions::scalar(DateTimeExcel\Difference::interval($date0, $datei, 'd'));
+            }
+            if (!is_numeric($dif)) {
+                return $dif;
+            }
+            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 : ExcelError::VALUE();
+    }
+
+    /**
+     * @param mixed $rate
+     */
+    private static function validateXnpv($rate, array $values, array $dates): void
+    {
+        if (!is_numeric($rate)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $valCount = count($values);
+        if ($valCount != count($dates)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        if ($valCount > 1 && ((min($values) > 0) || (max($values) < 0))) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
new file mode 100644
index 000000000..d899e8441
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Periodic
+{
+    const FINANCIAL_MAX_ITERATIONS = 128;
+
+    const FINANCIAL_PRECISION = 1.0e-08;
+
+    /**
+     * 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])
+     *
+     * @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 rate($values, $guess = 0.1)
+    {
+        if (!is_array($values)) {
+            return ExcelError::VALUE();
+        }
+        $values = Functions::flattenArray($values);
+        $guess = Functions::flattenSingleValue($guess);
+
+        // create an initial range, with a root somewhere between 0 and guess
+        $x1 = 0.0;
+        $x2 = $guess;
+        $f1 = self::presentValue($x1, $values);
+        $f2 = self::presentValue($x2, $values);
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            if (($f1 * $f2) < 0.0) {
+                break;
+            }
+            if (abs($f1) < abs($f2)) {
+                $f1 = self::presentValue($x1 += 1.6 * ($x1 - $x2), $values);
+            } else {
+                $f2 = self::presentValue($x2 += 1.6 * ($x2 - $x1), $values);
+            }
+        }
+        if (($f1 * $f2) > 0.0) {
+            return ExcelError::VALUE();
+        }
+
+        $f = self::presentValue($x1, $values);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = self::presentValue($x_mid, $values);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
+                return $x_mid;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * 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)
+     *
+     * @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 $financeRate The interest rate you pay on the money used in the cash flows
+     * @param mixed $reinvestmentRate 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 modifiedRate($values, $financeRate, $reinvestmentRate)
+    {
+        if (!is_array($values)) {
+            return ExcelError::DIV0();
+        }
+        $values = Functions::flattenArray($values);
+        $financeRate = Functions::flattenSingleValue($financeRate);
+        $reinvestmentRate = Functions::flattenSingleValue($reinvestmentRate);
+        $n = count($values);
+
+        $rr = 1.0 + $reinvestmentRate;
+        $fr = 1.0 + $financeRate;
+
+        $npvPos = $npvNeg = self::$zeroPointZero;
+        foreach ($values as $i => $v) {
+            if ($v >= 0) {
+                $npvPos += $v / $rr ** $i;
+            } else {
+                $npvNeg += $v / $fr ** $i;
+            }
+        }
+
+        if ($npvNeg === self::$zeroPointZero || $npvPos === self::$zeroPointZero) {
+            return ExcelError::DIV0();
+        }
+
+        $mirr = ((-$npvPos * $rr ** $n)
+                / ($npvNeg * ($rr))) ** (1.0 / ($n - 1)) - 1.0;
+
+        return is_finite($mirr) ? $mirr : ExcelError::NAN();
+    }
+
+    /**
+     * Sop to Scrutinizer.
+     *
+     * @var float
+     */
+    private static $zeroPointZero = 0.0;
+
+    /**
+     * NPV.
+     *
+     * Returns the Net Present Value of a cash flow series given a discount rate.
+     *
+     * @param mixed $rate
+     * @param array $args
+     *
+     * @return float
+     */
+    public static function presentValue($rate, ...$args)
+    {
+        $returnValue = 0;
+
+        $rate = Functions::flattenSingleValue($rate);
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $countArgs = count($aArgs);
+        for ($i = 1; $i <= $countArgs; ++$i) {
+            // Is it a numeric value?
+            if (is_numeric($aArgs[$i - 1])) {
+                $returnValue += $aArgs[$i - 1] / (1 + $rate) ** $i;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php
new file mode 100644
index 000000000..17740b0ac
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+class Constants
+{
+    public const BASIS_DAYS_PER_YEAR_NASD = 0;
+    public const BASIS_DAYS_PER_YEAR_ACTUAL = 1;
+    public const BASIS_DAYS_PER_YEAR_360 = 2;
+    public const BASIS_DAYS_PER_YEAR_365 = 3;
+    public const BASIS_DAYS_PER_YEAR_360_EUROPEAN = 4;
+
+    public const FREQUENCY_ANNUAL = 1;
+    public const FREQUENCY_SEMI_ANNUAL = 2;
+    public const FREQUENCY_QUARTERLY = 4;
+
+    public const PAYMENT_END_OF_PERIOD = 0;
+    public const PAYMENT_BEGINNING_OF_PERIOD = 1;
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
new file mode 100644
index 000000000..4028cd474
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
@@ -0,0 +1,426 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use DateTime;
+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;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+class Coupons
+{
+    private const PERIOD_DATE_PREVIOUS = false;
+    private const PERIOD_DATE_NEXT = true;
+
+    /**
+     * COUPDAYBS.
+     *
+     * Returns the number of days from the beginning of the coupon period to the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYBS(settlement,maturity,frequency[,basis])
+     *
+     * @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 (int).
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (is_string($daysPerYear)) {
+            return ExcelError::VALUE();
+        }
+        $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+
+        if ($basis === FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL) {
+            return abs((float) DateTimeExcel\Days::between($prev, $settlement));
+        }
+
+        return (float) DateTimeExcel\YearFrac::fraction($prev, $settlement, $basis) * $daysPerYear;
+    }
+
+    /**
+     * COUPDAYS.
+     *
+     * Returns the number of days in the coupon period that contains the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYS(settlement,maturity,frequency[,basis])
+     *
+     * @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 mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        switch ($basis) {
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_365:
+                // Actual/365
+                return 365 / $frequency;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL:
+                // Actual/actual
+                if ($frequency == FinancialConstants::FREQUENCY_ANNUAL) {
+                    $daysPerYear = (int) Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+
+                    return $daysPerYear / $frequency;
+                }
+                $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+                $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
+
+                return $next - $prev;
+            default:
+                // US (NASD) 30/360, Actual/360 or European 30/360
+                return 360 / $frequency;
+        }
+    }
+
+    /**
+     * COUPDAYSNC.
+     *
+     * Returns the number of days from the settlement date to the next coupon date.
+     *
+     * Excel Function:
+     *        COUPDAYSNC(settlement,maturity,frequency[,basis])
+     *
+     * @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 mixed $basis The type of day count to use (int) .
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        /** @var int */
+        $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) {
+            $settlementDate = Date::excelToDateTimeObject($settlement);
+            $settlementEoM = Helpers::isLastDayOfMonth($settlementDate);
+            if ($settlementEoM) {
+                ++$settlement;
+            }
+        }
+
+        return (float) DateTimeExcel\YearFrac::fraction($settlement, $next, $basis) * $daysPerYear;
+    }
+
+    /**
+     * COUPNCD.
+     *
+     * Returns the next coupon date after the settlement date.
+     *
+     * Excel Function:
+     *        COUPNCD(settlement,maturity,frequency[,basis])
+     *
+     * @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 mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+            self::doNothing($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
+    }
+
+    /**
+     * 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])
+     *
+     * @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 mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+            self::doNothing($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $yearsBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction(
+            $settlement,
+            $maturity,
+            FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        );
+
+        return (int) ceil((float) $yearsBetweenSettlementAndMaturity * $frequency);
+    }
+
+    /**
+     * COUPPCD.
+     *
+     * Returns the previous coupon date before the settlement date.
+     *
+     * Excel Function:
+     *        COUPPCD(settlement,maturity,frequency[,basis])
+     *
+     * @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 mixed $basis The type of day count to use (int).
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+            self::doNothing($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+    }
+
+    private static function monthsDiff(DateTime $result, int $months, string $plusOrMinus, int $day, bool $lastDayFlag): void
+    {
+        $result->setDate((int) $result->format('Y'), (int) $result->format('m'), 1);
+        $result->modify("$plusOrMinus $months months");
+        $daysInMonth = (int) $result->format('t');
+        $result->setDate((int) $result->format('Y'), (int) $result->format('m'), $lastDayFlag ? $daysInMonth : min($day, $daysInMonth));
+    }
+
+    private static function couponFirstPeriodDate(float $settlement, float $maturity, int $frequency, bool $next): float
+    {
+        $months = 12 / $frequency;
+
+        $result = Date::excelToDateTimeObject($maturity);
+        $day = (int) $result->format('d');
+        $lastDayFlag = Helpers::isLastDayOfMonth($result);
+
+        while ($settlement < Date::PHPToExcel($result)) {
+            self::monthsDiff($result, $months, '-', $day, $lastDayFlag);
+        }
+        if ($next === true) {
+            self::monthsDiff($result, $months, '+', $day, $lastDayFlag);
+        }
+
+        return (float) Date::PHPToExcel($result);
+    }
+
+    private static function validateCouponPeriod(float $settlement, float $maturity): void
+    {
+        if ($settlement >= $maturity) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+
+    /** @param mixed $basis */
+    private static function doNothing($basis): bool
+    {
+        return $basis;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
new file mode 100644
index 000000000..e542a869e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
@@ -0,0 +1,276 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Depreciation
+{
+    /** @var float */
+    private static $zeroPointZero = 0.0;
+
+    /**
+     * 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])
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation.
+     *                             (Sometimes called the salvage value of the asset)
+     * @param mixed $life Number of periods over which the asset is depreciated.
+     *                           (Sometimes called the useful life of the asset)
+     * @param mixed $period The period for which you want to calculate the
+     *                          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)
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+        $month = Functions::flattenSingleValue($month);
+
+        try {
+            $cost = self::validateCost($cost);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+            $month = self::validateMonth($month);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($cost === self::$zeroPointZero) {
+            return 0.0;
+        }
+
+        //    Set Fixed Depreciation Rate
+        $fixedDepreciationRate = 1 - ($salvage / $cost) ** (1 / $life);
+        $fixedDepreciationRate = round($fixedDepreciationRate, 3);
+
+        //    Loop through each period calculating the depreciation
+        // TODO Handle period value between 0 and 1 (e.g. 0.5)
+        $previousDepreciation = 0;
+        $depreciation = 0;
+        for ($per = 1; $per <= $period; ++$per) {
+            if ($per == 1) {
+                $depreciation = $cost * $fixedDepreciationRate * $month / 12;
+            } elseif ($per == ($life + 1)) {
+                $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
+            } else {
+                $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
+            }
+            $previousDepreciation += $depreciation;
+        }
+
+        return $depreciation;
+    }
+
+    /**
+     * 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])
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation.
+     *                                (Sometimes called the salvage value of the asset)
+     * @param mixed $life Number of periods over which the asset is depreciated.
+     *                                (Sometimes called the useful life of the asset)
+     * @param mixed $period The period for which you want to calculate the
+     *                                depreciation. Period must use the same units as life.
+     * @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)
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+        $factor = Functions::flattenSingleValue($factor);
+
+        try {
+            $cost = self::validateCost($cost);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+            $factor = self::validateFactor($factor);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($period > $life) {
+            return ExcelError::NAN();
+        }
+
+        // Loop through each period calculating the depreciation
+        // TODO Handling for fractional $period values
+        $previousDepreciation = 0;
+        $depreciation = 0;
+        for ($per = 1; $per <= $period; ++$per) {
+            $depreciation = min(
+                ($cost - $previousDepreciation) * ($factor / $life),
+                ($cost - $salvage - $previousDepreciation)
+            );
+            $previousDepreciation += $depreciation;
+        }
+
+        return $depreciation;
+    }
+
+    /**
+     * SLN.
+     *
+     * Returns the straight-line depreciation of an asset for one period
+     *
+     * @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)
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+
+        try {
+            $cost = self::validateCost($cost, true);
+            $salvage = self::validateSalvage($salvage, true);
+            $life = self::validateLife($life, true);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($life === self::$zeroPointZero) {
+            return ExcelError::DIV0();
+        }
+
+        return ($cost - $salvage) / $life;
+    }
+
+    /**
+     * SYD.
+     *
+     * Returns the sum-of-years' digits depreciation of an asset for a specified period.
+     *
+     * @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)
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+
+        try {
+            $cost = self::validateCost($cost, true);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($period > $life) {
+            return ExcelError::NAN();
+        }
+
+        $syd = (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
+
+        return $syd;
+    }
+
+    /** @param mixed $cost */
+    private static function validateCost($cost, bool $negativeValueAllowed = false): float
+    {
+        $cost = FinancialValidations::validateFloat($cost);
+        if ($cost < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $cost;
+    }
+
+    /** @param mixed $salvage */
+    private static function validateSalvage($salvage, bool $negativeValueAllowed = false): float
+    {
+        $salvage = FinancialValidations::validateFloat($salvage);
+        if ($salvage < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $salvage;
+    }
+
+    /** @param mixed $life */
+    private static function validateLife($life, bool $negativeValueAllowed = false): float
+    {
+        $life = FinancialValidations::validateFloat($life);
+        if ($life < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $life;
+    }
+
+    /** @param mixed $period */
+    private static function validatePeriod($period, bool $negativeValueAllowed = false): float
+    {
+        $period = FinancialValidations::validateFloat($period);
+        if ($period <= 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $period;
+    }
+
+    /** @param mixed $month */
+    private static function validateMonth($month): int
+    {
+        $month = FinancialValidations::validateInt($month);
+        if ($month < 1) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $month;
+    }
+
+    /** @param mixed $factor */
+    private static function validateFactor($factor): float
+    {
+        $factor = FinancialValidations::validateFloat($factor);
+        if ($factor <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $factor;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
new file mode 100644
index 000000000..b1f0d25c7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
@@ -0,0 +1,132 @@
+<?php
+
+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, 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)
+    {
+        return Format::DOLLAR($number, $precision);
+    }
+
+    /**
+     * 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)
+     *
+     * @param mixed $fractionalDollar Fractional Dollar
+     *              Or can be an array of values
+     * @param mixed $fraction Fraction
+     *              Or can be an array of values
+     *
+     * @return array|float|string
+     */
+    public static function decimal($fractionalDollar = null, $fraction = 0)
+    {
+        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();
+        }
+
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
+        }
+        if ($fraction == 0) {
+            return ExcelError::DIV0();
+        }
+
+        $dollars = ($fractionalDollar < 0) ? ceil($fractionalDollar) : floor($fractionalDollar);
+        $cents = fmod($fractionalDollar, 1.0);
+        $cents /= $fraction;
+        $cents *= 10 ** ceil(log10($fraction));
+
+        return $dollars + $cents;
+    }
+
+    /**
+     * 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)
+     *
+     * @param mixed $decimalDollar Decimal Dollar
+     *              Or can be an array of values
+     * @param mixed $fraction Fraction
+     *              Or can be an array of values
+     *
+     * @return array|float|string
+     */
+    public static function fractional($decimalDollar = null, $fraction = 0)
+    {
+        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();
+        }
+
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
+        }
+        if ($fraction == 0) {
+            return ExcelError::DIV0();
+        }
+
+        $dollars = ($decimalDollar < 0.0) ? ceil($decimalDollar) : floor($decimalDollar);
+        $cents = fmod($decimalDollar, 1);
+        $cents *= $fraction;
+        $cents *= 10 ** (-ceil(log10($fraction)));
+
+        return $dollars + $cents;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
new file mode 100644
index 000000000..1b0441974
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class FinancialValidations
+{
+    /**
+     * @param mixed $date
+     */
+    public static function validateDate($date): float
+    {
+        return DateTimeExcel\Helpers::getDateValue($date);
+    }
+
+    /**
+     * @param mixed $settlement
+     */
+    public static function validateSettlementDate($settlement): float
+    {
+        return self::validateDate($settlement);
+    }
+
+    /**
+     * @param mixed $maturity
+     */
+    public static function validateMaturityDate($maturity): float
+    {
+        return self::validateDate($maturity);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateFloat($value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateInt($value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    /**
+     * @param mixed $rate
+     */
+    public static function validateRate($rate): float
+    {
+        $rate = self::validateFloat($rate);
+        if ($rate < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $rate;
+    }
+
+    /**
+     * @param mixed $frequency
+     */
+    public static function validateFrequency($frequency): int
+    {
+        $frequency = self::validateInt($frequency);
+        if (
+            ($frequency !== FinancialConstants::FREQUENCY_ANNUAL) &&
+            ($frequency !== FinancialConstants::FREQUENCY_SEMI_ANNUAL) &&
+            ($frequency !== FinancialConstants::FREQUENCY_QUARTERLY)
+        ) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $frequency;
+    }
+
+    /**
+     * @param mixed $basis
+     */
+    public static function validateBasis($basis): int
+    {
+        if (!is_numeric($basis)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $basis = (int) $basis;
+        if (($basis < 0) || ($basis > 4)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $basis;
+    }
+
+    /**
+     * @param mixed $price
+     */
+    public static function validatePrice($price): float
+    {
+        $price = self::validateFloat($price);
+        if ($price < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $price;
+    }
+
+    /**
+     * @param mixed $parValue
+     */
+    public static function validateParValue($parValue): float
+    {
+        $parValue = self::validateFloat($parValue);
+        if ($parValue < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $parValue;
+    }
+
+    /**
+     * @param mixed $yield
+     */
+    public static function validateYield($yield): float
+    {
+        $yield = self::validateFloat($yield);
+        if ($yield < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $yield;
+    }
+
+    /**
+     * @param mixed $discount
+     */
+    public static function validateDiscount($discount): float
+    {
+        $discount = self::validateFloat($discount);
+        if ($discount <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $discount;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
new file mode 100644
index 000000000..c7f1f46a2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    /**
+     * daysPerYear.
+     *
+     * Returns the number of days in a specified year, as defined by the "basis" value
+     *
+     * @param int|string $year The year against which we're testing
+     * @param int|string $basis The type of day count:
+     *                              0 or omitted US (NASD)   360
+     *                              1                        Actual (365 or 366 in a leap year)
+     *                              2                        360
+     *                              3                        365
+     *                              4                        European 360
+     *
+     * @return int|string Result, or a string containing an error
+     */
+    public static function daysPerYear($year, $basis = 0)
+    {
+        if (!is_numeric($basis)) {
+            return ExcelError::NAN();
+        }
+
+        switch ($basis) {
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_NASD:
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_360:
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_360_EUROPEAN:
+                return 360;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_365:
+                return 365;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL:
+                return (DateTimeExcel\Helpers::isLeapYear($year)) ? 366 : 365;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * isLastDayOfMonth.
+     *
+     * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
+     *
+     * @param DateTimeInterface $date The date for testing
+     */
+    public static function isLastDayOfMonth(DateTimeInterface $date): bool
+    {
+        return $date->format('d') === $date->format('t');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
new file mode 100644
index 000000000..1cbe2657b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class InterestRate
+{
+    /**
+     * EFFECT.
+     *
+     * Returns the effective interest rate given the nominal rate and the number of
+     *        compounding payments per year.
+     *
+     * Excel Function:
+     *        EFFECT(nominal_rate,npery)
+     *
+     * @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)
+    {
+        $nominalRate = Functions::flattenSingleValue($nominalRate);
+        $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
+
+        try {
+            $nominalRate = FinancialValidations::validateFloat($nominalRate);
+            $periodsPerYear = FinancialValidations::validateInt($periodsPerYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($nominalRate <= 0 || $periodsPerYear < 1) {
+            return ExcelError::NAN();
+        }
+
+        return ((1 + $nominalRate / $periodsPerYear) ** $periodsPerYear) - 1;
+    }
+
+    /**
+     * NOMINAL.
+     *
+     * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
+     *
+     * @param mixed $effectiveRate Effective interest rate as a float
+     * @param mixed $periodsPerYear Integer number of compounding payments per year
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function nominal($effectiveRate = 0, $periodsPerYear = 0)
+    {
+        $effectiveRate = Functions::flattenSingleValue($effectiveRate);
+        $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
+
+        try {
+            $effectiveRate = FinancialValidations::validateFloat($effectiveRate);
+            $periodsPerYear = FinancialValidations::validateInt($periodsPerYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($effectiveRate <= 0 || $periodsPerYear < 1) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        return $periodsPerYear * (($effectiveRate + 1) ** (1 / $periodsPerYear) - 1);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
new file mode 100644
index 000000000..e1bf04b90
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel\YearFrac;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class AccruedInterest
+{
+    public const ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT = true;
+
+    public const ACCRINT_CALCMODE_FIRST_INTEREST_TO_SETTLEMENT = false;
+
+    /**
+     * ACCRINT.
+     *
+     * Returns the accrued interest for a security that pays periodic interest.
+     *
+     * Excel Function:
+     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis][,calc_method])
+     *
+     * @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
+     *
+     * @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
+    ) {
+        self::doNothing($calcMethod);
+        $issue = Functions::flattenSingleValue($issue);
+        $firstInterest = Functions::flattenSingleValue($firstInterest);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $parValue = ($parValue === null) ? 1000 : Functions::flattenSingleValue($parValue);
+        $frequency = ($frequency === null)
+            ? FinancialConstants::FREQUENCY_ANNUAL
+            : Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            SecurityValidations::validateSecurityPeriod($issue, $settlement);
+            $rate = SecurityValidations::validateRate($rate);
+            $parValue = SecurityValidations::validateParValue($parValue);
+            $frequency = SecurityValidations::validateFrequency($frequency);
+            self::doNothing($frequency);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenFirstInterestAndSettlement = Functions::scalar(YearFrac::fraction($firstInterest, $settlement, $basis));
+        if (!is_numeric($daysBetweenFirstInterestAndSettlement)) {
+            //    return date error
+            return $daysBetweenFirstInterestAndSettlement;
+        }
+
+        return $parValue * $rate * $daysBetweenIssueAndSettlement;
+    }
+
+    /**
+     * ACCRINTM.
+     *
+     * Returns the accrued interest for a security that pays interest at maturity.
+     *
+     * Excel Function:
+     *        ACCRINTM(issue,settlement,rate[,par[,basis]])
+     *
+     * @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 parValue, 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 atMaturity(
+        $issue,
+        $settlement,
+        $rate,
+        $parValue = 1000,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $issue = Functions::flattenSingleValue($issue);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $parValue = ($parValue === null) ? 1000 : Functions::flattenSingleValue($parValue);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            SecurityValidations::validateSecurityPeriod($issue, $settlement);
+            $rate = SecurityValidations::validateRate($rate);
+            $parValue = SecurityValidations::validateParValue($parValue);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+
+        return $parValue * $rate * $daysBetweenIssueAndSettlement;
+    }
+
+    /** @param mixed $arg */
+    private static function doNothing($arg): bool
+    {
+        return (bool) $arg;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
new file mode 100644
index 000000000..22c93c0e2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
@@ -0,0 +1,284 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+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
+{
+    /**
+     * PRICE.
+     *
+     * Returns the price per $100 face value of a security that pays periodic interest.
+     *
+     * @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 $rate the security's annual coupon rate
+     * @param mixed $yield the security's annual yield
+     * @param mixed $redemption The number of coupon payments per year.
+     *                              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
+     *                         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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $rate = Functions::flattenSingleValue($rate);
+        $yield = Functions::flattenSingleValue($yield);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $rate = SecurityValidations::validateRate($rate);
+            $yield = SecurityValidations::validateYield($yield);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $frequency = SecurityValidations::validateFrequency($frequency);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $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);
+        $de = $dsc / $e;
+
+        $result = $redemption / $baseYF ** (--$n + $de);
+        for ($k = 0; $k <= $n; ++$k) {
+            $result += $rfp / ($baseYF ** ($k + $de));
+        }
+        $result -= $rfp * ($a / $e);
+
+        return $result;
+    }
+
+    /**
+     * PRICEDISC.
+     *
+     * Returns the price per $100 face value of a discounted security.
+     *
+     * @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 $discount The security's discount rate
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @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 priceDiscounted(
+        $settlement,
+        $maturity,
+        $discount,
+        $redemption,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $discount = SecurityValidations::validateDiscount($discount);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * PRICEMAT.
+     *
+     * Returns the price per $100 face value of a security that pays interest at maturity.
+     *
+     * @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 mixed $rate The security's interest rate at date of issue
+     * @param mixed $yield The security's annual yield
+     * @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 priceAtMaturity(
+        $settlement,
+        $maturity,
+        $issue,
+        $rate,
+        $yield,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $issue = Functions::flattenSingleValue($issue);
+        $rate = Functions::flattenSingleValue($rate);
+        $yield = Functions::flattenSingleValue($yield);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $rate = SecurityValidations::validateRate($rate);
+            $yield = SecurityValidations::validateYield($yield);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenIssueAndSettlement *= $daysPerYear;
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
+        if (!is_numeric($daysBetweenIssueAndMaturity)) {
+            //    return date error
+            return $daysBetweenIssueAndMaturity;
+        }
+        $daysBetweenIssueAndMaturity *= $daysPerYear;
+        $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);
+    }
+
+    /**
+     * RECEIVED.
+     *
+     * Returns the amount received at maturity for a fully invested Security.
+     *
+     * @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 = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $investment = Functions::flattenSingleValue($investment);
+        $discount = Functions::flattenSingleValue($discount);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $investment = SecurityValidations::validateFloat($investment);
+            $discount = SecurityValidations::validateDiscount($discount);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($investment <= 0) {
+            return ExcelError::NAN();
+        }
+        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return Functions::scalar($daysBetweenSettlementAndMaturity);
+        }
+
+        return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
new file mode 100644
index 000000000..f8d867367
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+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 Rates
+{
+    /**
+     * DISC.
+     *
+     * Returns the discount rate for a security.
+     *
+     * Excel Function:
+     *        DISC(settlement,maturity,price,redemption[,basis])
+     *
+     * @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 $price The security's price per $100 face value
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @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
+     */
+    public static function discount(
+        $settlement,
+        $maturity,
+        $price,
+        $redemption,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $price = SecurityValidations::validatePrice($price);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($price <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return (1 - $price / $redemption) / $daysBetweenSettlementAndMaturity;
+    }
+
+    /**
+     * INTRATE.
+     *
+     * Returns the interest rate for a fully invested security.
+     *
+     * Excel Function:
+     *        INTRATE(settlement,maturity,investment,redemption[,basis])
+     *
+     * @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 $redemption the amount to be received at maturity
+     * @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
+     */
+    public static function interest(
+        $settlement,
+        $maturity,
+        $investment,
+        $redemption,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $investment = Functions::flattenSingleValue($investment);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $investment = SecurityValidations::validateFloat($investment);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($investment <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
new file mode 100644
index 000000000..d3196f0f7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class SecurityValidations extends FinancialValidations
+{
+    /**
+     * @param mixed $issue
+     */
+    public static function validateIssueDate($issue): float
+    {
+        return self::validateDate($issue);
+    }
+
+    /**
+     * @param mixed $settlement
+     * @param mixed $maturity
+     */
+    public static function validateSecurityPeriod($settlement, $maturity): void
+    {
+        if ($settlement >= $maturity) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+
+    /**
+     * @param mixed $redemption
+     */
+    public static function validateRedemption($redemption): float
+    {
+        $redemption = self::validateFloat($redemption);
+        if ($redemption <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $redemption;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
new file mode 100644
index 000000000..d8aa67a49
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Helpers;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Yields
+{
+    /**
+     * YIELDDISC.
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @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 $price The security's price per $100 face value
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @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 yieldDiscounted(
+        $settlement,
+        $maturity,
+        $price,
+        $redemption,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $price = SecurityValidations::validatePrice($price);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+        $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+        return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * YIELDMAT.
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @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 mixed $rate The security's interest rate at date of issue
+     * @param mixed $price The security's price per $100 face value
+     * @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 yieldAtMaturity(
+        $settlement,
+        $maturity,
+        $issue,
+        $rate,
+        $price,
+        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $issue = Functions::flattenSingleValue($issue);
+        $rate = Functions::flattenSingleValue($rate);
+        $price = Functions::flattenSingleValue($price);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $rate = SecurityValidations::validateRate($rate);
+            $price = SecurityValidations::validatePrice($price);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenIssueAndSettlement *= $daysPerYear;
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
+        if (!is_numeric($daysBetweenIssueAndMaturity)) {
+            //    return date error
+            return $daysBetweenIssueAndMaturity;
+        }
+        $daysBetweenIssueAndMaturity *= $daysPerYear;
+        $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);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
new file mode 100644
index 000000000..7ee34f732
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+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 TreasuryBill
+{
+    /**
+     * TBILLEQ.
+     *
+     * Returns the bond-equivalent yield for a Treasury bill.
+     *
+     * @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 mixed $discount The Treasury bill's discount rate
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function bondEquivalentYield($settlement, $maturity, $discount)
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $discount = FinancialValidations::validateFloat($discount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($discount <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * TBILLPRICE.
+     *
+     * Returns the price per $100 face value for a Treasury bill.
+     *
+     * @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 mixed $discount The Treasury bill's discount rate
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function price($settlement, $maturity, $discount)
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $discount = FinancialValidations::validateFloat($discount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($discount <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        $price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
+        if ($price < 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return $price;
+    }
+
+    /**
+     * TBILLYIELD.
+     *
+     * Returns the yield for a Treasury bill.
+     *
+     * @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 mixed $price The Treasury bill's price per $100 face value
+     *
+     * @return float|string
+     */
+    public static function yield($settlement, $maturity, $price)
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $price = FinancialValidations::validatePrice($price);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
index 9b3c66e9e..14c5ae50a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -61,19 +61,17 @@ class FormulaParser
     /**
      * Create a new FormulaParser.
      *
-     * @param string $pFormula Formula to parse
-     *
-     * @throws Exception
+     * @param ?string $formula Formula to parse
      */
-    public function __construct($pFormula = '')
+    public function __construct($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();
     }
@@ -91,19 +89,15 @@ class FormulaParser
     /**
      * Get Token.
      *
-     * @param int $pId Token id
-     *
-     * @throws Exception
-     *
-     * @return string
+     * @param int $id Token id
      */
-    public function getToken($pId = 0)
+    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.");
     }
 
     /**
@@ -129,7 +123,7 @@ class FormulaParser
     /**
      * Parse to tokens.
      */
-    private function parseToTokens()
+    private function parseToTokens(): void
     {
         // No attempt is made to verify formulas; assumes formulas are derived from Excel, where
         // they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
@@ -143,7 +137,8 @@ class FormulaParser
         // Helper variables
         $tokens1 = $tokens2 = $stack = [];
         $inString = $inPath = $inRange = $inError = false;
-        $token = $previousToken = $nextToken = null;
+        $nextToken = null;
+        //$token = $previousToken = null;
 
         $index = 1;
         $value = '';
@@ -494,11 +489,13 @@ class FormulaParser
                 continue;
             }
 
-            if (!(
-                (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+            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)
-            )) {
+                )
+            ) {
                 continue;
             }
 
@@ -506,11 +503,13 @@ class FormulaParser
                 continue;
             }
 
-            if (!(
-                (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
+            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)
-            )) {
+                )
+            ) {
                 continue;
             }
 
@@ -529,11 +528,11 @@ class FormulaParser
             } else {
                 $previousToken = null;
             }
-            if (isset($tokens2[$i + 1])) {
-                $nextToken = $tokens2[$i + 1];
-            } else {
-                $nextToken = null;
-            }
+            //if (isset($tokens2[$i + 1])) {
+            //    $nextToken = $tokens2[$i + 1];
+            //} else {
+            //    $nextToken = null;
+            //}
 
             if ($token === null) {
                 continue;
@@ -542,12 +541,14 @@ class FormulaParser
             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) &&
+                } 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_OPERAND)
+                ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
@@ -561,12 +562,14 @@ class FormulaParser
             if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '+') {
                 if ($i == 0) {
                     continue;
-                } elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                } 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_OPERAND)
+                ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     continue;
@@ -577,8 +580,10 @@ class FormulaParser
                 continue;
             }
 
-            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if (
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
+                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+            ) {
                 if (strpos('<>=', substr($token->getValue(), 0, 1)) !== false) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
                 } elseif ($token->getValue() == '&') {
@@ -592,8 +597,10 @@ class FormulaParser
                 continue;
             }
 
-            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if (
+                $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') {
                         $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
index 66618d4a0..68e5eead8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
@@ -76,16 +76,16 @@ class FormulaToken
     /**
      * 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 $value
+     * @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($value, $tokenType = self::TOKEN_TYPE_UNKNOWN, $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;
     }
 
     /**
@@ -103,7 +103,7 @@ class FormulaToken
      *
      * @param string $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
         $this->value = $value;
     }
@@ -123,7 +123,7 @@ class FormulaToken
      *
      * @param string $value
      */
-    public function setTokenType($value)
+    public function setTokenType($value): void
     {
         $this->tokenType = $value;
     }
@@ -143,7 +143,7 @@ class FormulaToken
      *
      * @param string $value
      */
-    public function setTokenSubType($value)
+    public function setTokenSubType($value): void
     {
         $this->tokenSubType = $value;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
index bb2170be1..0ec396f6e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
 
 class Functions
 {
@@ -13,12 +14,13 @@ 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';
@@ -38,38 +40,21 @@ class Functions
      */
     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',
-    ];
-
     /**
      * Set the Compatibility Mode.
      *
-     * @category Function Configuration
-     *
      * @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)
     {
-        if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
+        if (
+            ($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
             ($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
             ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)
         ) {
@@ -84,13 +69,11 @@ class Functions
     /**
      * Return the current Compatibility Mode.
      *
-     * @category Function Configuration
-     *
      * @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()
     {
@@ -98,21 +81,20 @@ class Functions
     }
 
     /**
-     * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
-     *
-     * @category Function Configuration
+     * 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)
     {
-        if (($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP) ||
+        if (
+            ($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP) ||
             ($returnDateType == self::RETURNDATE_PHP_DATETIME_OBJECT) ||
             ($returnDateType == self::RETURNDATE_EXCEL)
         ) {
@@ -127,13 +109,11 @@ class Functions
     /**
      * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
      *
-     * @category Function Configuration
-     *
      * @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()
     {
@@ -143,8 +123,6 @@ class Functions
     /**
      * DUMMY.
      *
-     * @category Error Returns
-     *
      * @return string #Not Yet Implemented
      */
     public static function DUMMY()
@@ -152,16 +130,129 @@ class Functions
         return '#Not Yet Implemented';
     }
 
-    /**
-     * DIV0.
-     *
-     * @category Error Returns
-     *
-     * @return string #Not Yet Implemented
-     */
-    public static function DIV0()
+    /** @param mixed $idx */
+    public static function isMatrixValue($idx): bool
     {
-        return self::$errorCodes['divisionbyzero'];
+        return (substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0);
+    }
+
+    /** @param mixed $idx */
+    public static function isValue($idx): bool
+    {
+        return substr_count($idx, '.') === 0;
+    }
+
+    /** @param mixed $idx */
+    public static function isCellValue($idx): bool
+    {
+        return substr_count($idx, '.') > 1;
+    }
+
+    /** @param mixed $condition */
+    public static function ifCondition($condition): string
+    {
+        $condition = self::flattenSingleValue($condition);
+
+        if ($condition === '') {
+            return '=""';
+        }
+        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));
+            }
+
+            return str_replace('""""', '""', '=' . $condition);
+        }
+        preg_match('/(=|<[>=]?|>=?)(.*)/', $condition, $matches);
+        [, $operator, $operand] = $matches;
+
+        $operand = self::operandSpecialHandling($operand);
+        if (is_numeric(trim($operand, '"'))) {
+            $operand = trim($operand, '"');
+        } elseif (!is_numeric($operand) && $operand !== 'FALSE' && $operand !== 'TRUE') {
+            $operand = str_replace('"', '""', $operand);
+            $operand = Calculation::wrapResult(strtoupper($operand));
+        }
+
+        return str_replace('""""', '""', $operator . $operand);
+    }
+
+    /**
+     * @param mixed $operand
+     *
+     * @return mixed
+     */
+    private static function operandSpecialHandling($operand)
+    {
+        if (is_numeric($operand) || is_bool($operand)) {
+            return $operand;
+        } elseif (strtoupper($operand) === Calculation::getTRUE() || strtoupper($operand) === Calculation::getFALSE()) {
+            return strtoupper($operand);
+        }
+
+        // Check for percentage
+        if (preg_match('/^\-?\d*\.?\d*\s?\%$/', $operand)) {
+            return ((float) rtrim($operand, '%')) / 100;
+        }
+
+        // Check for dates
+        if (($dateValueOperand = Date::stringToExcel($operand)) !== false) {
+            return $dateValueOperand;
+        }
+
+        return $operand;
+    }
+
+    /**
+     * NULL.
+     *
+     * Returns the error value #NULL!
+     *
+     * @deprecated 1.23.0 Use the null() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::null()
+     *
+     * @return string #NULL!
+     */
+    public static function null()
+    {
+        return Information\ExcelError::null();
+    }
+
+    /**
+     * NaN.
+     *
+     * Returns the error value #NUM!
+     *
+     * @deprecated 1.23.0 Use the NAN() method in the Information\Error class instead
+     * @see Information\ExcelError::NAN()
+     *
+     * @return string #NUM!
+     */
+    public static function NAN()
+    {
+        return Information\ExcelError::NAN();
+    }
+
+    /**
+     * REF.
+     *
+     * Returns the error value #REF!
+     *
+     * @deprecated 1.23.0 Use the REF() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::REF()
+     *
+     * @return string #REF!
+     */
+    public static function REF()
+    {
+        return Information\ExcelError::REF();
     }
 
     /**
@@ -173,69 +264,14 @@ class Functions
      * Returns the error value #N/A
      *        #N/A is the error value that means "no value is available."
      *
-     * @category Logical Functions
+     * @deprecated 1.23.0 Use the NA() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::NA()
      *
      * @return string #N/A!
      */
     public static function NA()
     {
-        return self::$errorCodes['na'];
-    }
-
-    /**
-     * NaN.
-     *
-     * Returns the error value #NUM!
-     *
-     * @category Error Returns
-     *
-     * @return string #NUM!
-     */
-    public static function NAN()
-    {
-        return self::$errorCodes['num'];
-    }
-
-    /**
-     * NAME.
-     *
-     * Returns the error value #NAME?
-     *
-     * @category Error Returns
-     *
-     * @return string #NAME?
-     */
-    public static function NAME()
-    {
-        return self::$errorCodes['name'];
-    }
-
-    /**
-     * REF.
-     *
-     * Returns the error value #REF!
-     *
-     * @category Error Returns
-     *
-     * @return string #REF!
-     */
-    public static function REF()
-    {
-        return self::$errorCodes['reference'];
-    }
-
-    /**
-     * NULL.
-     *
-     * Returns the error value #NULL!
-     *
-     * @category Error Returns
-     *
-     * @return string #NULL!
-     */
-    public static function null()
-    {
-        return self::$errorCodes['null'];
+        return Information\ExcelError::NA();
     }
 
     /**
@@ -243,56 +279,42 @@ class Functions
      *
      * Returns the error value #VALUE!
      *
-     * @category Error Returns
+     * @deprecated 1.23.0 Use the VALUE() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::VALUE()
      *
      * @return string #VALUE!
      */
     public static function VALUE()
     {
-        return self::$errorCodes['value'];
+        return Information\ExcelError::VALUE();
     }
 
-    public static function isMatrixValue($idx)
+    /**
+     * NAME.
+     *
+     * Returns the error value #NAME?
+     *
+     * @deprecated 1.23.0 Use the NAME() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::NAME()
+     *
+     * @return string #NAME?
+     */
+    public static function NAME()
     {
-        return (substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0);
+        return Information\ExcelError::NAME();
     }
 
-    public static function isValue($idx)
+    /**
+     * DIV0.
+     *
+     * @deprecated 1.23.0 Use the DIV0() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::DIV0()
+     *
+     * @return string #Not Yet Implemented
+     */
+    public static function DIV0()
     {
-        return substr_count($idx, '.') == 0;
-    }
-
-    public static function isCellValue($idx)
-    {
-        return substr_count($idx, '.') > 1;
-    }
-
-    public static function ifCondition($condition)
-    {
-        $condition = self::flattenSingleValue($condition);
-
-        if ($condition === '') {
-            $condition = '=""';
-        }
-
-        if (!is_string($condition) || !in_array($condition[0], ['>', '<', '='])) {
-            if (!is_numeric($condition)) {
-                $condition = Calculation::wrapResult(strtoupper($condition));
-            }
-
-            return str_replace('""""', '""', '=' . $condition);
-        }
-        preg_match('/(=|<[>=]?|>=?)(.*)/', $condition, $matches);
-        [, $operator, $operand] = $matches;
-
-        if (is_numeric(trim($operand, '"'))) {
-            $operand = trim($operand, '"');
-        } elseif (!is_numeric($operand)) {
-            $operand = str_replace('"', '""', $operand);
-            $operand = Calculation::wrapResult(strtoupper($operand));
-        }
-
-        return str_replace('""""', '""', $operator . $operand);
+        return Information\ExcelError::DIV0();
     }
 
     /**
@@ -300,21 +322,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the type() method in the Information\ExcelError class instead
+     * @see Information\ExcelError::type()
+     *
+     * @return array|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();
+        return Information\ExcelError::type($value);
     }
 
     /**
@@ -322,15 +337,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isBlank() method in the Information\Value class instead
+     * @see Information\Value::isBlank()
+     *
+     * @return array|bool
      */
     public static function isBlank($value = null)
     {
-        if ($value !== null) {
-            $value = self::flattenSingleValue($value);
-        }
-
-        return $value === null;
+        return Information\Value::isBlank($value);
     }
 
     /**
@@ -338,13 +352,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isErr() method in the Information\ErrorValue class instead
+     * @see Information\ErrorValue::isErr()
+     *
+     * @return array|bool
      */
     public static function isErr($value = '')
     {
-        $value = self::flattenSingleValue($value);
-
-        return self::isError($value) && (!self::isNa(($value)));
+        return Information\ErrorValue::isErr($value);
     }
 
     /**
@@ -352,17 +367,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isError() method in the Information\ErrorValue class instead
+     * @see Information\ErrorValue::isError()
+     *
+     * @return array|bool
      */
     public static function isError($value = '')
     {
-        $value = self::flattenSingleValue($value);
-
-        if (!is_string($value)) {
-            return false;
-        }
-
-        return in_array($value, self::$errorCodes);
+        return Information\ErrorValue::isError($value);
     }
 
     /**
@@ -370,13 +382,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isNa() method in the Information\ErrorValue class instead
+     * @see Information\ErrorValue::isNa()
+     *
+     * @return array|bool
      */
     public static function isNa($value = '')
     {
-        $value = self::flattenSingleValue($value);
-
-        return $value === self::NA();
+        return Information\ErrorValue::isNa($value);
     }
 
     /**
@@ -384,19 +397,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool|string
+     * @deprecated 1.23.0 Use the isEven() method in the Information\Value class instead
+     * @see Information\Value::isEven()
+     *
+     * @return array|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;
+        return Information\Value::isEven($value);
     }
 
     /**
@@ -404,19 +412,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool|string
+     * @deprecated 1.23.0 Use the isOdd() method in the Information\Value class instead
+     * @see Information\Value::isOdd()
+     *
+     * @return array|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;
+        return Information\Value::isOdd($value);
     }
 
     /**
@@ -424,17 +427,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isNumber() method in the Information\Value class instead
+     * @see Information\Value::isNumber()
+     *
+     * @return array|bool
      */
     public static function isNumber($value = null)
     {
-        $value = self::flattenSingleValue($value);
-
-        if (is_string($value)) {
-            return false;
-        }
-
-        return is_numeric($value);
+        return Information\Value::isNumber($value);
     }
 
     /**
@@ -442,13 +442,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isLogical() method in the Information\Value class instead
+     * @see Information\Value::isLogical()
+     *
+     * @return array|bool
      */
     public static function isLogical($value = null)
     {
-        $value = self::flattenSingleValue($value);
-
-        return is_bool($value);
+        return Information\Value::isLogical($value);
     }
 
     /**
@@ -456,13 +457,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isText() method in the Information\Value class instead
+     * @see Information\Value::isText()
+     *
+     * @return array|bool
      */
     public static function isText($value = null)
     {
-        $value = self::flattenSingleValue($value);
-
-        return is_string($value) && !self::isError($value);
+        return Information\Value::isText($value);
     }
 
     /**
@@ -470,11 +472,14 @@ class Functions
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @deprecated 1.23.0 Use the isNonText() method in the Information\Value class instead
+     * @see Information\Value::isNonText()
+     *
+     * @return array|bool
      */
     public static function isNonText($value = null)
     {
-        return !self::isText($value);
+        return Information\Value::isNonText($value);
     }
 
     /**
@@ -482,9 +487,12 @@ class Functions
      *
      * Returns a value converted to a number
      *
+     * @deprecated 1.23.0 Use the asNumber() method in the Information\Value class instead
+     * @see Information\Value::asNumber()
+     *
      * @param null|mixed $value The value you want converted
      *
-     * @return number N converts values listed in the following table
+     * @return number|string 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
@@ -495,27 +503,7 @@ class Functions
      */
     public static function n($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 ((strlen($value) > 0) && ($value[0] == '#')) {
-                    return $value;
-                }
-
-                break;
-        }
-
-        return 0;
+        return Information\Value::asNumber($value);
     }
 
     /**
@@ -523,6 +511,9 @@ class Functions
      *
      * Returns a number that identifies the type of a value
      *
+     * @deprecated 1.23.0 Use the type() method in the Information\Value class instead
+     * @see Information\Value::type()
+     *
      * @param null|mixed $value The value you want tested
      *
      * @return number N converts values listed in the following table
@@ -535,45 +526,13 @@ class Functions
      */
     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;
-            }
-
-            return 2;
-        }
-
-        return 0;
+        return Information\Value::type($value);
     }
 
     /**
      * Convert a multi-dimensional array to a simple 1-dimensional array.
      *
-     * @param array $array Array to be flattened
+     * @param array|mixed $array Array to be flattened
      *
      * @return array Flattened array
      */
@@ -583,30 +542,44 @@ class Functions
             return (array) $array;
         }
 
-        $arrayValues = [];
-        foreach ($array as $value) {
+        $flattened = [];
+        $stack = array_values($array);
+
+        while (!empty($stack)) {
+            $value = array_shift($stack);
+
             if (is_array($value)) {
-                foreach ($value as $val) {
-                    if (is_array($val)) {
-                        foreach ($val as $v) {
-                            $arrayValues[] = $v;
-                        }
-                    } else {
-                        $arrayValues[] = $val;
-                    }
-                }
+                array_unshift($stack, ...array_values($value));
             } else {
-                $arrayValues[] = $value;
+                $flattened[] = $value;
             }
         }
 
-        return $arrayValues;
+        return $flattened;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return null|mixed
+     */
+    public static function scalar($value)
+    {
+        if (!is_array($value)) {
+            return $value;
+        }
+
+        do {
+            $value = array_pop($value);
+        } while (is_array($value));
+
+        return $value;
     }
 
     /**
      * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing.
      *
-     * @param array $array Array to be flattened
+     * @param array|mixed $array Array to be flattened
      *
      * @return array Flattened array
      */
@@ -646,7 +619,7 @@ class Functions
     public static function flattenSingleValue($value = '')
     {
         while (is_array($value)) {
-            $value = array_pop($value);
+            $value = array_shift($value);
         }
 
         return $value;
@@ -655,26 +628,50 @@ class Functions
     /**
      * ISFORMULA.
      *
-     * @param mixed $cellReference The cell to check
-     * @param Cell $pCell The current cell (containing this formula)
+     * @deprecated 1.23.0 Use the isFormula() method in the Information\Value class instead
+     * @see Information\Value::isFormula()
      *
-     * @return bool|string
+     * @param mixed $cellReference The cell to check
+     * @param ?Cell $cell The current cell (containing this formula)
+     *
+     * @return array|bool|string
      */
-    public static function isFormula($cellReference = '', Cell $pCell = null)
+    public static function isFormula($cellReference = '', ?Cell $cell = null)
     {
-        if ($pCell === null) {
-            return self::REF();
+        return Information\Value::isFormula($cellReference, $cell);
+    }
+
+    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 = trim($matches[3], "'");
+    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 (strpos($coordinate, '!') !== false) {
+            $coordinate = substr($coordinate, strrpos($coordinate, '!') + 1);
+        }
 
-        return $worksheet->getCell($cellReference)->isFormula();
+        return $coordinate;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
new file mode 100644
index 000000000..4b9f818fe
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+
+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($value = '')
+    {
+        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($value = '')
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (!is_string($value)) {
+            return false;
+        }
+
+        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($value = '')
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === ExcelError::NA();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
new file mode 100644
index 000000000..06f386635
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
@@ -0,0 +1,171 @@
+<?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
+    ];
+
+    /**
+     * List of error codes. Replaced by constant;
+     * previously it was public and updateable, allowing
+     * user to make inappropriate alterations.
+     *
+     * @deprecated 1.25.0 Use ERROR_CODES constant instead.
+     *
+     * @var array<string, string>
+     */
+    public static $errorCodes = self::ERROR_CODES;
+
+    /**
+     * @param mixed $value
+     */
+    public static function throwError($value): string
+    {
+        return in_array($value, self::ERROR_CODES, true) ? $value : self::ERROR_CODES['value'];
+    }
+
+    /**
+     * ERROR_TYPE.
+     *
+     * @param mixed $value Value to check
+     *
+     * @return array|int|string
+     */
+    public static function type($value = '')
+    {
+        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'];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
new file mode 100644
index 000000000..341d93b98
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
@@ -0,0 +1,328 @@
+<?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($value = null)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === null;
+    }
+
+    /**
+     * IS_REF.
+     *
+     * @param mixed $value Value to check
+     *
+     * @return bool
+     */
+    public static function isRef($value, ?Cell $cell = null)
+    {
+        if ($cell === null || $value === $cell->getCoordinate()) {
+            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($value = null)
+    {
+        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($value = null)
+    {
+        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($value = null)
+    {
+        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($value = null)
+    {
+        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($value = null)
+    {
+        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($value = null)
+    {
+        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)
+     *
+     * @return array|bool|string
+     */
+    public static function isFormula($cellReference = '', ?Cell $cell = null)
+    {
+        if ($cell === null) {
+            return ExcelError::REF();
+        }
+
+        $fullCellReference = Functions::expandDefinedName((string) $cellReference, $cell);
+
+        if (strpos($cellReference, '!') !== false) {
+            $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 ((strlen($value) > 0) && ($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 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 = 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 ((strlen($value) > 0) && ($value[0] == '#')) {
+                return 16;
+            }
+
+            return 2;
+        }
+
+        return 0;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
new file mode 100644
index 000000000..22c95e86c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Internal;
+
+class MakeMatrix
+{
+    /** @param array $args */
+    public static function make(...$args): array
+    {
+        return $args;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
new file mode 100644
index 000000000..371ad8b3d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Internal;
+
+class WildcardMatch
+{
+    private const SEARCH_SET = [
+        '~~', // 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 = [
+        "\x1c",
+        '[*]',
+        '.*',
+        '[?]',
+        '.',
+        '~',
+    ];
+
+    public static function wildcard(string $wildcard): string
+    {
+        // Preg Escape the wildcard, but protecting the Excel * and ? search characters
+        return str_replace(self::SEARCH_SET, self::REPLACEMENT_SET, preg_quote($wildcard, '/'));
+    }
+
+    public static function compare(?string $value, string $wildcard): bool
+    {
+        if ($value === '' || $value === null) {
+            return false;
+        }
+
+        return (bool) preg_match("/^{$wildcard}\$/mui", $value);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php
index 416d119ac..92e779e06 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php
@@ -2,6 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Logical\Boolean;
+
+/**
+ * @deprecated 1.17.0
+ */
 class Logical
 {
     /**
@@ -12,13 +17,15 @@ class Logical
      * Excel Function:
      *        =TRUE()
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the TRUE() method in the Logical\Boolean class instead
+     * @see Logical\Boolean::TRUE()
      *
      * @return bool True
      */
-    public static function true()
+    public static function true(): bool
     {
-        return true;
+        return Boolean::true();
     }
 
     /**
@@ -29,39 +36,15 @@ class Logical
      * Excel Function:
      *        =FALSE()
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the FALSE() method in the Logical\Boolean class instead
+     * @see Logical\Boolean::FALSE()
      *
      * @return bool False
      */
-    public static function false()
+    public static function false(): bool
     {
-        return false;
-    }
-
-    private static function countTrueValues(array $args)
-    {
-        $returnValue = 0;
-
-        foreach ($args as $arg) {
-            // Is it a boolean value?
-            if (is_bool($arg)) {
-                $returnValue += $arg;
-            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
-                $returnValue += ((int) $arg != 0);
-            } elseif (is_string($arg)) {
-                $arg = strtoupper($arg);
-                if (($arg == 'TRUE') || ($arg == Calculation::getTRUE())) {
-                    $arg = true;
-                } elseif (($arg == 'FALSE') || ($arg == Calculation::getFALSE())) {
-                    $arg = false;
-                } else {
-                    return Functions::VALUE();
-                }
-                $returnValue += ($arg != 0);
-            }
-        }
-
-        return $returnValue;
+        return Boolean::false();
     }
 
     /**
@@ -77,10 +60,12 @@ class Logical
      *
      *        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
+     *        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
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the logicalAnd() method in the Logical\Operations class instead
+     * @see Logical\Operations::logicalAnd()
      *
      * @param mixed ...$args Data values
      *
@@ -88,23 +73,7 @@ class Logical
      */
     public static function logicalAnd(...$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) == '');
-        });
-        $argCount = count($args);
-
-        $returnValue = self::countTrueValues($args);
-        if (is_string($returnValue)) {
-            return $returnValue;
-        }
-
-        return ($returnValue > 0) && ($returnValue == $argCount);
+        return Logical\Operations::logicalAnd(...$args);
     }
 
     /**
@@ -120,10 +89,12 @@ class Logical
      *
      *        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
+     *        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
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the logicalOr() method in the Logical\Operations class instead
+     * @see Logical\Operations::logicalOr()
      *
      * @param mixed $args Data values
      *
@@ -131,29 +102,15 @@ class Logical
      */
     public static function logicalOr(...$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 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.
+     * 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[, ...]])
@@ -163,10 +120,12 @@ class Logical
      *
      *        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
+     *        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
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the logicalXor() method in the Logical\Operations class instead
+     * @see Logical\Operations::logicalXor()
      *
      * @param mixed $args Data values
      *
@@ -174,22 +133,7 @@ class Logical
      */
     public static function logicalXor(...$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 Logical\Operations::logicalXor(...$args);
     }
 
     /**
@@ -204,31 +148,20 @@ class Logical
      *
      *        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
+     *        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
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the NOT() method in the Logical\Operations class instead
+     * @see Logical\Operations::NOT()
      *
      * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
      *
-     * @return bool|string the boolean inverse of the argument
+     * @return array|bool|string the boolean inverse of the argument
      */
     public static function NOT($logical = false)
     {
-        $logical = Functions::flattenSingleValue($logical);
-
-        if (is_string($logical)) {
-            $logical = strtoupper($logical);
-            if (($logical == 'TRUE') || ($logical == Calculation::getTRUE())) {
-                return false;
-            } elseif (($logical == 'FALSE') || ($logical == Calculation::getFALSE())) {
-                return true;
-            }
-
-            return Functions::VALUE();
-        }
-
-        return !$logical;
+        return Logical\Operations::NOT($logical);
     }
 
     /**
@@ -244,19 +177,21 @@ class Logical
      *            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.
+     *            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".
+     *            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.
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the statementIf() method in the Logical\Conditional class instead
+     * @see Logical\Conditional::statementIf()
      *
      * @param mixed $condition Condition to evaluate
      * @param mixed $returnIfTrue Value to return when condition is true
@@ -266,15 +201,7 @@ class Logical
      */
     public static function statementIf($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
     {
-        if (Functions::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);
-
-        return ($condition) ? $returnIfTrue : $returnIfFalse;
+        return Logical\Conditional::statementIf($condition, $returnIfTrue, $returnIfFalse);
     }
 
     /**
@@ -288,13 +215,18 @@ class Logical
      *        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.
+     *              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.
+     *              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).
+     *              Optional. It is the default to return if expression does not match any of the values
+     *              (value1, value2, ... value_n).
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the statementSwitch() method in the Logical\Conditional class instead
+     * @see Logical\Conditional::statementSwitch()
      *
      * @param mixed $arguments Statement arguments
      *
@@ -302,33 +234,7 @@ class Logical
      */
     public static function statementSwitch(...$arguments)
     {
-        $result = Functions::VALUE();
-
-        if (count($arguments) > 0) {
-            $targetValue = Functions::flattenSingleValue($arguments[0]);
-            $argc = count($arguments) - 1;
-            $switchCount = floor($argc / 2);
-            $switchSatisfied = false;
-            $hasDefaultClause = $argc % 2 !== 0;
-            $defaultClause = $argc % 2 === 0 ? null : $arguments[count($arguments) - 1];
-
-            if ($switchCount) {
-                for ($index = 0; $index < $switchCount; ++$index) {
-                    if ($targetValue == $arguments[$index * 2 + 1]) {
-                        $result = $arguments[$index * 2 + 2];
-                        $switchSatisfied = true;
-
-                        break;
-                    }
-                }
-            }
-
-            if (!$switchSatisfied) {
-                $result = $hasDefaultClause ? $defaultClause : Functions::NA();
-            }
-        }
-
-        return $result;
+        return Logical\Conditional::statementSwitch(...$arguments);
     }
 
     /**
@@ -337,7 +243,9 @@ class Logical
      * Excel Function:
      *        =IFERROR(testValue,errorpart)
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the IFERROR() method in the Logical\Conditional class instead
+     * @see Logical\Conditional::IFERROR()
      *
      * @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
@@ -346,10 +254,7 @@ class Logical
      */
     public static function IFERROR($testValue = '', $errorpart = '')
     {
-        $testValue = ($testValue === null) ? '' : Functions::flattenSingleValue($testValue);
-        $errorpart = ($errorpart === null) ? '' : Functions::flattenSingleValue($errorpart);
-
-        return self::statementIf(Functions::isError($testValue), $errorpart, $testValue);
+        return Logical\Conditional::IFERROR($testValue, $errorpart);
     }
 
     /**
@@ -358,7 +263,9 @@ class Logical
      * Excel Function:
      *        =IFNA(testValue,napart)
      *
-     * @category Logical Functions
+     * @deprecated 1.17.0
+     * Use the IFNA() method in the Logical\Conditional class instead
+     * @see Logical\Conditional::IFNA()
      *
      * @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
@@ -367,9 +274,30 @@ class Logical
      */
     public static function IFNA($testValue = '', $napart = '')
     {
-        $testValue = ($testValue === null) ? '' : Functions::flattenSingleValue($testValue);
-        $napart = ($napart === null) ? '' : Functions::flattenSingleValue($napart);
+        return Logical\Conditional::IFNA($testValue, $napart);
+    }
 
-        return self::statementIf(Functions::isNa($testValue), $napart, $testValue);
+    /**
+     * 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
+     * Use the IFS() method in the Logical\Conditional class instead
+     * @see Logical\Conditional::IFS()
+     *
+     * @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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php
new file mode 100644
index 000000000..8f1e9354d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
+
+class Boolean
+{
+    /**
+     * TRUE.
+     *
+     * Returns the boolean TRUE.
+     *
+     * Excel Function:
+     *        =TRUE()
+     *
+     * @return bool True
+     */
+    public static function true(): bool
+    {
+        return true;
+    }
+
+    /**
+     * FALSE.
+     *
+     * Returns the boolean FALSE.
+     *
+     * Excel Function:
+     *        =FALSE()
+     *
+     * @return bool False
+     */
+    public static function false(): bool
+    {
+        return false;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
new file mode 100644
index 000000000..55d5f3274
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
@@ -0,0 +1,211 @@
+<?php
+
+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.
+     *
+     * 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.
+     *
+     * @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)
+    {
+        $condition = ($condition === null) ? true : Functions::flattenSingleValue($condition);
+
+        if (ErrorValue::isError($condition)) {
+            return $condition;
+        }
+
+        $returnIfTrue = $returnIfTrue ?? 0;
+        $returnIfFalse = $returnIfFalse ?? false;
+
+        return ((bool) $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.
+     *              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)
+    {
+        $result = ExcelError::VALUE();
+
+        if (count($arguments) > 0) {
+            $targetValue = Functions::flattenSingleValue($arguments[0]);
+            $argc = count($arguments) - 1;
+            $switchCount = floor($argc / 2);
+            $hasDefaultClause = $argc % 2 !== 0;
+            $defaultClause = $argc % 2 === 0 ? null : $arguments[$argc];
+
+            $switchSatisfied = false;
+            if ($switchCount > 0) {
+                for ($index = 0; $index < $switchCount; ++$index) {
+                    if ($targetValue == Functions::flattenSingleValue($arguments[$index * 2 + 1])) {
+                        $result = $arguments[$index * 2 + 2];
+                        $switchSatisfied = true;
+
+                        break;
+                    }
+                }
+            }
+
+            if ($switchSatisfied !== true) {
+                $result = $hasDefaultClause ? $defaultClause : ExcelError::NA();
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * IFERROR.
+     *
+     * Excel Function:
+     *        =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 = '')
+    {
+        if (is_array($testValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $testValue, $errorpart);
+        }
+
+        $errorpart = $errorpart ?? '';
+        $testValue = $testValue ?? 0; // this is how Excel handles empty cell
+
+        return self::statementIf(ErrorValue::isError($testValue), $errorpart, $testValue);
+    }
+
+    /**
+     * IFNA.
+     *
+     * Excel Function:
+     *        =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 = '')
+    {
+        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(ErrorValue::isNa($testValue), $napart, $testValue);
+    }
+
+    /**
+     * 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
+     *
+     * @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)
+    {
+        $argumentCount = count($arguments);
+
+        if ($argumentCount % 2 != 0) {
+            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) ? '' : $arguments[$i + 1];
+            $result = self::statementIf($testValue, $returnIfTrue, $falseValueException);
+
+            if ($result !== $falseValueException) {
+                return $result;
+            }
+        }
+
+        return ExcelError::NA();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
new file mode 100644
index 000000000..f09785919
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
@@ -0,0 +1,172 @@
+<?php
+
+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.
+     *
+     * 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
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return bool|string the logical AND of the arguments
+     */
+    public static function logicalAnd(...$args)
+    {
+        return self::countTrueValues($args, function (int $trueValueCount, int $count): bool {
+            return $trueValueCount === $count;
+        });
+    }
+
+    /**
+     * 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
+     *
+     * @param mixed $args Data values
+     *
+     * @return bool|string the logical OR of the arguments
+     */
+    public static function logicalOr(...$args)
+    {
+        return self::countTrueValues($args, function (int $trueValueCount): bool {
+            return $trueValueCount > 0;
+        });
+    }
+
+    /**
+     * 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
+     *
+     * @param mixed $args Data values
+     *
+     * @return bool|string the logical XOR of the arguments
+     */
+    public static function logicalXor(...$args)
+    {
+        return self::countTrueValues($args, function (int $trueValueCount): bool {
+            return $trueValueCount % 2 === 1;
+        });
+    }
+
+    /**
+     * 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
+     *
+     * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($logical)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $logical);
+        }
+
+        if (is_string($logical)) {
+            $logical = mb_strtoupper($logical, 'UTF-8');
+            if (($logical == 'TRUE') || ($logical == Calculation::getTRUE())) {
+                return false;
+            } elseif (($logical == 'FALSE') || ($logical == Calculation::getFALSE())) {
+                return true;
+            }
+
+            return ExcelError::VALUE();
+        }
+
+        return !$logical;
+    }
+
+    /**
+     * @return bool|string
+     */
+    private static function countTrueValues(array $args, callable $func)
+    {
+        $trueValueCount = 0;
+        $count = 0;
+
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            ++$count;
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $trueValueCount += $arg;
+            } elseif (is_string($arg)) {
+                $isLiteral = !Functions::isCellValue($k);
+                $arg = mb_strtoupper($arg, 'UTF-8');
+                if ($isLiteral && ($arg == 'TRUE' || $arg == Calculation::getTRUE())) {
+                    ++$trueValueCount;
+                } elseif ($isLiteral && ($arg == 'FALSE' || $arg == Calculation::getFALSE())) {
+                    //$trueValueCount += 0;
+                } else {
+                    --$count;
+                }
+            } elseif (is_int($arg) || is_float($arg)) {
+                $trueValueCount += (int) ($arg != 0);
+            } else {
+                --$count;
+            }
+        }
+
+        return ($count === 0) ? ExcelError::VALUE() : $func($trueValueCount, $count);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php
index 48434300b..c7ddf8945 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -2,11 +2,20 @@
 
 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\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
+/**
+ * @deprecated 1.18.0
+ */
 class LookupRef
 {
     /**
@@ -17,103 +26,53 @@ class LookupRef
      * Excel Function:
      *        =ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
      *
+     * @deprecated 1.18.0
+     *      Use the cell() method in the LookupRef\Address class instead
+     * @see LookupRef\Address::cell()
+     *
      * @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
+     *                                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
+     *                                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
+     * @param array|string $sheetText Optional Name of worksheet to use
      *
-     * @return string
+     * @return array|string
      */
     public static function cellAddress($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '')
     {
-        $row = Functions::flattenSingleValue($row);
-        $column = Functions::flattenSingleValue($column);
-        $relativity = Functions::flattenSingleValue($relativity);
-        $sheetText = Functions::flattenSingleValue($sheetText);
-
-        if (($row < 1) || ($column < 1)) {
-            return Functions::VALUE();
-        }
-
-        if ($sheetText > '') {
-            if (strpos($sheetText, ' ') !== false) {
-                $sheetText = "'" . $sheetText . "'";
-            }
-            $sheetText .= '!';
-        }
-        if ((!is_bool($referenceStyle)) || $referenceStyle) {
-            $rowRelative = $columnRelative = '$';
-            $column = Coordinate::stringFromColumnIndex($column);
-            if (($relativity == 2) || ($relativity == 4)) {
-                $columnRelative = '';
-            }
-            if (($relativity == 3) || ($relativity == 4)) {
-                $rowRelative = '';
-            }
-
-            return $sheetText . $columnRelative . $column . $rowRelative . $row;
-        }
-        if (($relativity == 2) || ($relativity == 4)) {
-            $column = '[' . $column . ']';
-        }
-        if (($relativity == 3) || ($relativity == 4)) {
-            $row = '[' . $row . ']';
-        }
-
-        return $sheetText . 'R' . $row . 'C' . $column;
+        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 0.
+     *     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
+     *      Use the COLUMN() method in the LookupRef\RowColumnInformation class instead
+     * @see LookupRef\RowColumnInformation::COLUMN()
+     *
      * @param null|array|string $cellAddress A reference to a range of cells for which you want the column numbers
      *
-     * @return int|int[]
+     * @return int|int[]|string
      */
-    public static function COLUMN($cellAddress = null)
+    public static function COLUMN($cellAddress = null, ?Cell $cell = null)
     {
-        if ($cellAddress === null || trim($cellAddress) === '') {
-            return 0;
-        }
-
-        if (is_array($cellAddress)) {
-            foreach ($cellAddress as $columnKey => $value) {
-                $columnKey = preg_replace('/[^a-z]/i', '', $columnKey);
-
-                return (int) Coordinate::columnIndexFromString($columnKey);
-            }
-        } else {
-            [$sheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-            if (strpos($cellAddress, ':') !== false) {
-                [$startAddress, $endAddress] = explode(':', $cellAddress);
-                $startAddress = preg_replace('/[^a-z]/i', '', $startAddress);
-                $endAddress = preg_replace('/[^a-z]/i', '', $endAddress);
-                $returnValue = [];
-                do {
-                    $returnValue[] = (int) Coordinate::columnIndexFromString($startAddress);
-                } while ($startAddress++ != $endAddress);
-
-                return $returnValue;
-            }
-            $cellAddress = preg_replace('/[^a-z]/i', '', $cellAddress);
-
-            return (int) Coordinate::columnIndexFromString($cellAddress);
-        }
+        return RowColumnInformation::COLUMN($cellAddress, $cell);
     }
 
     /**
@@ -124,73 +83,44 @@ class LookupRef
      * Excel Function:
      *        =COLUMNS(cellAddress)
      *
-     * @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
+     * @deprecated 1.18.0
+     *      Use the COLUMNS() method in the LookupRef\RowColumnInformation class instead
+     * @see LookupRef\RowColumnInformation::COLUMNS()
      *
-     * @return int The number of columns in cellAddress
+     * @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)
     {
-        if ($cellAddress === null || $cellAddress === '') {
-            return 1;
-        } elseif (!is_array($cellAddress)) {
-            return Functions::VALUE();
-        }
-
-        reset($cellAddress);
-        $isMatrix = (is_numeric(key($cellAddress)));
-        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
-
-        if ($isMatrix) {
-            return $rows;
-        }
-
-        return $columns;
+        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 0.
+     *     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
+     *      Use the ROW() method in the LookupRef\RowColumnInformation class instead
+     * @see LookupRef\RowColumnInformation::ROW()
+     *
      * @param null|array|string $cellAddress A reference to a range of cells for which you want the row numbers
      *
-     * @return int or array of integer
+     * @return int|mixed[]|string
      */
-    public static function ROW($cellAddress = null)
+    public static function ROW($cellAddress = null, ?Cell $cell = null)
     {
-        if ($cellAddress === null || trim($cellAddress) === '') {
-            return 0;
-        }
-
-        if (is_array($cellAddress)) {
-            foreach ($cellAddress as $columnKey => $rowValue) {
-                foreach ($rowValue as $rowKey => $cellValue) {
-                    return (int) preg_replace('/\D/', '', $rowKey);
-                }
-            }
-        } else {
-            [$sheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-            if (strpos($cellAddress, ':') !== false) {
-                [$startAddress, $endAddress] = explode(':', $cellAddress);
-                $startAddress = preg_replace('/\D/', '', $startAddress);
-                $endAddress = preg_replace('/\D/', '', $endAddress);
-                $returnValue = [];
-                do {
-                    $returnValue[][] = (int) $startAddress;
-                } while ($startAddress++ != $endAddress);
-
-                return $returnValue;
-            }
-            [$cellAddress] = explode(':', $cellAddress);
-
-            return (int) preg_replace('/\D/', '', $cellAddress);
-        }
+        return RowColumnInformation::ROW($cellAddress, $cell);
     }
 
     /**
@@ -201,27 +131,18 @@ class LookupRef
      * Excel Function:
      *        =ROWS(cellAddress)
      *
-     * @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
+     * @deprecated 1.18.0
+     *      Use the ROWS() method in the LookupRef\RowColumnInformation class instead
+     * @see LookupRef\RowColumnInformation::ROWS()
      *
-     * @return int The number of rows in cellAddress
+     * @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)
     {
-        if ($cellAddress === null || $cellAddress === '') {
-            return 1;
-        } elseif (!is_array($cellAddress)) {
-            return Functions::VALUE();
-        }
-
-        reset($cellAddress);
-        $isMatrix = (is_numeric(key($cellAddress)));
-        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
-
-        if ($isMatrix) {
-            return $columns;
-        }
-
-        return $rows;
+        return RowColumnInformation::ROWS($cellAddress);
     }
 
     /**
@@ -230,31 +151,19 @@ class LookupRef
      * Excel Function:
      *        =HYPERLINK(linkURL,displayName)
      *
-     * @category Logical Functions
+     * @deprecated 1.18.0
+     *      Use the set() method in the LookupRef\Hyperlink class instead
+     * @see LookupRef\Hyperlink::set()
      *
-     * @param string $linkURL Value to check, is also the value returned when no error
-     * @param string $displayName Value to return when testValue is an error condition
-     * @param Cell $pCell The cell to set the hyperlink in
+     * @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 $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 HYPERLINK($linkURL = '', $displayName = null, Cell $pCell = null)
+    public static function HYPERLINK($linkURL = '', $displayName = null, ?Cell $cell = null)
     {
-        $linkURL = ($linkURL === null) ? '' : Functions::flattenSingleValue($linkURL);
-        $displayName = ($displayName === null) ? '' : Functions::flattenSingleValue($displayName);
-
-        if ((!is_object($pCell)) || (trim($linkURL) == '')) {
-            return Functions::REF();
-        }
-
-        if ((is_object($displayName)) || trim($displayName) == '') {
-            $displayName = $linkURL;
-        }
-
-        $pCell->getHyperlink()->setUrl($linkURL);
-        $pCell->getHyperlink()->setTooltip($displayName);
-
-        return $displayName;
+        return LookupRef\Hyperlink::set($linkURL, $displayName, $cell);
     }
 
     /**
@@ -266,54 +175,20 @@ class LookupRef
      * Excel Function:
      *        =INDIRECT(cellAddress)
      *
+     * @deprecated 1.18.0
+     *      Use the INDIRECT() method in the LookupRef\Indirect class instead
+     * @see LookupRef\Indirect::INDIRECT()
+     *
+     * @param array|string $cellAddress $cellAddress The cell address of 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
+     *
      * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
-     *
-     * @param null|array|string $cellAddress $cellAddress The cell address of the current cell (containing this formula)
-     * @param Cell $pCell The current cell (containing this formula)
-     *
-     * @return mixed The cells referenced by cellAddress
-     *
-     * @todo    Support for the optional a1 parameter introduced in Excel 2010
      */
-    public static function INDIRECT($cellAddress = null, Cell $pCell = null)
+    public static function INDIRECT($cellAddress, Cell $cell)
     {
-        $cellAddress = Functions::flattenSingleValue($cellAddress);
-        if ($cellAddress === null || $cellAddress === '') {
-            return Functions::REF();
-        }
-
-        $cellAddress1 = $cellAddress;
-        $cellAddress2 = null;
-        if (strpos($cellAddress, ':') !== false) {
-            [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
-        }
-
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
-            (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))) {
-            if (!preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
-                return Functions::REF();
-            }
-
-            if (strpos($cellAddress, '!') !== false) {
-                [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-                $sheetName = trim($sheetName, "'");
-                $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-            } else {
-                $pSheet = $pCell->getWorksheet();
-            }
-
-            return Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, false);
-        }
-
-        if (strpos($cellAddress, '!') !== false) {
-            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-            $sheetName = trim($sheetName, "'");
-            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-        } else {
-            $pSheet = $pCell->getWorksheet();
-        }
-
-        return Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+        return Indirect::INDIRECT($cellAddress, true, $cell);
     }
 
     /**
@@ -326,88 +201,33 @@ class LookupRef
      * Excel Function:
      *        =OFFSET(cellAddress, rows, cols, [height], [width])
      *
-     * @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.
-     * @param null|Cell $pCell
+     * @deprecated 1.18.0
+     *      Use the OFFSET() method in the LookupRef\Offset class instead
+     * @see LookupRef\Offset::OFFSET()
      *
-     * @return string A reference to a cell or range of cells
+     * @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|int|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($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null, ?Cell $cell = null)
     {
-        $rows = Functions::flattenSingleValue($rows);
-        $columns = Functions::flattenSingleValue($columns);
-        $height = Functions::flattenSingleValue($height);
-        $width = Functions::flattenSingleValue($width);
-        if ($cellAddress === null) {
-            return 0;
-        }
-
-        if (!is_object($pCell)) {
-            return Functions::REF();
-        }
-
-        $sheetName = null;
-        if (strpos($cellAddress, '!')) {
-            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-            $sheetName = trim($sheetName, "'");
-        }
-        if (strpos($cellAddress, ':')) {
-            [$startCell, $endCell] = explode(':', $cellAddress);
-        } else {
-            $startCell = $endCell = $cellAddress;
-        }
-        [$startCellColumn, $startCellRow] = Coordinate::coordinateFromString($startCell);
-        [$endCellColumn, $endCellRow] = Coordinate::coordinateFromString($endCell);
-
-        $startCellRow += $rows;
-        $startCellColumn = Coordinate::columnIndexFromString($startCellColumn) - 1;
-        $startCellColumn += $columns;
-
-        if (($startCellRow <= 0) || ($startCellColumn < 0)) {
-            return Functions::REF();
-        }
-        $endCellColumn = Coordinate::columnIndexFromString($endCellColumn) - 1;
-        if (($width != null) && (!is_object($width))) {
-            $endCellColumn = $startCellColumn + $width - 1;
-        } else {
-            $endCellColumn += $columns;
-        }
-        $startCellColumn = Coordinate::stringFromColumnIndex($startCellColumn + 1);
-
-        if (($height != null) && (!is_object($height))) {
-            $endCellRow = $startCellRow + $height - 1;
-        } else {
-            $endCellRow += $rows;
-        }
-
-        if (($endCellRow <= 0) || ($endCellColumn < 0)) {
-            return Functions::REF();
-        }
-        $endCellColumn = Coordinate::stringFromColumnIndex($endCellColumn + 1);
-
-        $cellAddress = $startCellColumn . $startCellRow;
-        if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-            $cellAddress .= ':' . $endCellColumn . $endCellRow;
-        }
-
-        if ($sheetName !== null) {
-            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
-        } else {
-            $pSheet = $pCell->getWorksheet();
-        }
-
-        return Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+        return Offset::OFFSET($cellAddress, $rows, $columns, $height, $width, $cell);
     }
 
     /**
@@ -419,39 +239,17 @@ class LookupRef
      * Excel Function:
      *        =CHOOSE(index_num, value1, [value2], ...)
      *
-     * @param mixed $index_num Specifies which value argument is selected.
-     *                            Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number
-     *                                between 1 and 254.
-     * @param mixed $value1 ... Value1 is required, subsequent values are optional.
-     *                            Between 1 to 254 value arguments from which CHOOSE selects a value or an action to perform based on
-     *                                index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or
-     *                                text.
+     * @deprecated 1.18.0
+     *      Use the choose() method in the LookupRef\Selection class instead
+     * @see LookupRef\Selection::choose()
+     *
+     * @param array $chooseArgs
      *
      * @return mixed The selected value
      */
     public static function CHOOSE(...$chooseArgs)
     {
-        $chosenEntry = Functions::flattenArray(array_shift($chooseArgs));
-        $entryCount = count($chooseArgs) - 1;
-
-        if (is_array($chosenEntry)) {
-            $chosenEntry = array_shift($chosenEntry);
-        }
-        if ((is_numeric($chosenEntry)) && (!is_bool($chosenEntry))) {
-            --$chosenEntry;
-        } else {
-            return Functions::VALUE();
-        }
-        $chosenEntry = floor($chosenEntry);
-        if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
-            return Functions::VALUE();
-        }
-
-        if (is_array($chooseArgs[$chosenEntry])) {
-            return Functions::flattenArray($chooseArgs[$chosenEntry]);
-        }
-
-        return $chooseArgs[$chosenEntry];
+        return LookupRef\Selection::choose(...$chooseArgs);
     }
 
     /**
@@ -462,153 +260,20 @@ class LookupRef
      * Excel Function:
      *        =MATCH(lookup_value, lookup_array, [match_type])
      *
+     * @deprecated 1.18.0
+     *      Use the MATCH() method in the LookupRef\ExcelMatch class instead
+     * @see LookupRef\ExcelMatch::MATCH()
+     *
      * @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
+     * @return array|int|string The relative position of the found item
      */
     public static function MATCH($lookupValue, $lookupArray, $matchType = 1)
     {
-        $lookupArray = Functions::flattenArray($lookupArray);
-        $lookupValue = Functions::flattenSingleValue($lookupValue);
-        $matchType = ($matchType === null) ? 1 : (int) Functions::flattenSingleValue($matchType);
-
-        // MATCH is not case sensitive, so we convert lookup value to be lower cased in case it's string type.
-        if (is_string($lookupValue)) {
-            $lookupValue = StringHelper::strToLower($lookupValue);
-        }
-
-        // Lookup_value type has to be number, text, or logical values
-        if ((!is_numeric($lookupValue)) && (!is_string($lookupValue)) && (!is_bool($lookupValue))) {
-            return Functions::NA();
-        }
-
-        // Match_type is 0, 1 or -1
-        if (($matchType !== 0) && ($matchType !== -1) && ($matchType !== 1)) {
-            return Functions::NA();
-        }
-
-        // Lookup_array should not be empty
-        $lookupArraySize = count($lookupArray);
-        if ($lookupArraySize <= 0) {
-            return Functions::NA();
-        }
-
-        // Lookup_array should contain only number, text, or logical values, or empty (null) cells
-        foreach ($lookupArray as $i => $lookupArrayValue) {
-            //    check the type of the value
-            if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
-                (!is_bool($lookupArrayValue)) && ($lookupArrayValue !== null)
-            ) {
-                return Functions::NA();
-            }
-            // Convert strings to lowercase for case-insensitive testing
-            if (is_string($lookupArrayValue)) {
-                $lookupArray[$i] = StringHelper::strToLower($lookupArrayValue);
-            }
-            if (($lookupArrayValue === null) && (($matchType == 1) || ($matchType == -1))) {
-                $lookupArray = array_slice($lookupArray, 0, $i - 1);
-            }
-        }
-
-        if ($matchType == 1) {
-            // If match_type is 1 the list has to be processed from last to first
-
-            $lookupArray = array_reverse($lookupArray);
-            $keySet = array_reverse(array_keys($lookupArray));
-        }
-
-        // **
-        // find the match
-        // **
-
-        if ($matchType === 0 || $matchType === 1) {
-            foreach ($lookupArray as $i => $lookupArrayValue) {
-                $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
-                $exactTypeMatch = $typeMatch && $lookupArrayValue === $lookupValue;
-                $nonOnlyNumericExactMatch = !$typeMatch && $lookupArrayValue === $lookupValue;
-                $exactMatch = $exactTypeMatch || $nonOnlyNumericExactMatch;
-
-                if ($matchType === 0) {
-                    if ($typeMatch && is_string($lookupValue) && (bool) preg_match('/([\?\*])/', $lookupValue)) {
-                        $splitString = $lookupValue;
-                        $chars = array_map(function ($i) use ($splitString) {
-                            return mb_substr($splitString, $i, 1);
-                        }, range(0, mb_strlen($splitString) - 1));
-
-                        $length = count($chars);
-                        $pattern = '/^';
-                        for ($j = 0; $j < $length; ++$j) {
-                            if ($chars[$j] === '~') {
-                                if (isset($chars[$j + 1])) {
-                                    if ($chars[$j + 1] === '*') {
-                                        $pattern .= preg_quote($chars[$j + 1], '/');
-                                        ++$j;
-                                    } elseif ($chars[$j + 1] === '?') {
-                                        $pattern .= preg_quote($chars[$j + 1], '/');
-                                        ++$j;
-                                    }
-                                } else {
-                                    $pattern .= preg_quote($chars[$j], '/');
-                                }
-                            } elseif ($chars[$j] === '*') {
-                                $pattern .= '.*';
-                            } elseif ($chars[$j] === '?') {
-                                $pattern .= '.{1}';
-                            } else {
-                                $pattern .= preg_quote($chars[$j], '/');
-                            }
-                        }
-
-                        $pattern .= '$/';
-                        if ((bool) preg_match($pattern, $lookupArrayValue)) {
-                            // exact match
-                            return $i + 1;
-                        }
-                    } elseif ($exactMatch) {
-                        // exact match
-                        return $i + 1;
-                    }
-                } elseif (($matchType === 1) && $typeMatch && ($lookupArrayValue <= $lookupValue)) {
-                    $i = array_search($i, $keySet);
-
-                    // The current value is the (first) match
-                    return $i + 1;
-                }
-            }
-        } else {
-            $maxValueKey = null;
-
-            // 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);
-                $exactTypeMatch = $typeMatch && $lookupArrayValue === $lookupValue;
-                $nonOnlyNumericExactMatch = !$typeMatch && $lookupArrayValue === $lookupValue;
-                $exactMatch = $exactTypeMatch || $nonOnlyNumericExactMatch;
-
-                if ($exactMatch) {
-                    // Another "special" case. If a perfect match is found,
-                    // the algorithm gives up immediately
-                    return $i + 1;
-                } elseif ($typeMatch & $lookupArrayValue >= $lookupValue) {
-                    $maxValueKey = $i + 1;
-                } elseif ($typeMatch & $lookupArrayValue < $lookupValue) {
-                    //Excel algorithm gives up immediately if the first element is smaller than the searched value
-                    break;
-                }
-            }
-
-            if ($maxValueKey !== null) {
-                return $maxValueKey;
-            }
-        }
-
-        // Unsuccessful in finding a match, return #N/A error value
-        return Functions::NA();
+        return LookupRef\ExcelMatch::MATCH($lookupValue, $lookupArray, $matchType);
     }
 
     /**
@@ -619,254 +284,94 @@ class LookupRef
      * Excel Function:
      *        =INDEX(range_array, row_num, [column_num])
      *
-     * @param mixed $arrayValues A range of cells or an array constant
-     * @param mixed $rowNum The row in array from which to return a value. If row_num is omitted, column_num is required.
-     * @param mixed $columnNum The column in array from which to return a value. If column_num is omitted, row_num is required.
+     * @deprecated 1.18.0
+     *      Use the index() method in the LookupRef\Matrix class instead
+     * @see LookupRef\Matrix::index()
+     *
+     * @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($arrayValues, $rowNum = 0, $columnNum = 0)
+    public static function INDEX($matrix, $rowNum = 0, $columnNum = 0)
     {
-        $rowNum = Functions::flattenSingleValue($rowNum);
-        $columnNum = Functions::flattenSingleValue($columnNum);
-
-        if (($rowNum < 0) || ($columnNum < 0)) {
-            return Functions::VALUE();
-        }
-
-        if (!is_array($arrayValues) || ($rowNum > count($arrayValues))) {
-            return Functions::REF();
-        }
-
-        $rowKeys = array_keys($arrayValues);
-        $columnKeys = @array_keys($arrayValues[$rowKeys[0]]);
-
-        if ($columnNum > count($columnKeys)) {
-            return Functions::VALUE();
-        } elseif ($columnNum == 0) {
-            if ($rowNum == 0) {
-                return $arrayValues;
-            }
-            $rowNum = $rowKeys[--$rowNum];
-            $returnArray = [];
-            foreach ($arrayValues as $arrayColumn) {
-                if (is_array($arrayColumn)) {
-                    if (isset($arrayColumn[$rowNum])) {
-                        $returnArray[] = $arrayColumn[$rowNum];
-                    } else {
-                        return [$rowNum => $arrayValues[$rowNum]];
-                    }
-                } else {
-                    return $arrayValues[$rowNum];
-                }
-            }
-
-            return $returnArray;
-        }
-        $columnNum = $columnKeys[--$columnNum];
-        if ($rowNum > count($rowKeys)) {
-            return Functions::VALUE();
-        } elseif ($rowNum == 0) {
-            return $arrayValues[$columnNum];
-        }
-        $rowNum = $rowKeys[--$rowNum];
-
-        return $arrayValues[$rowNum][$columnNum];
+        return Matrix::index($matrix, $rowNum, $columnNum);
     }
 
     /**
      * TRANSPOSE.
      *
+     * @deprecated 1.18.0
+     *      Use the transpose() method in the LookupRef\Matrix class instead
+     * @see LookupRef\Matrix::transpose()
+     *
      * @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
+     * 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)
     {
-        $returnMatrix = [];
-        if (!is_array($matrixData)) {
-            $matrixData = [[$matrixData]];
-        }
-
-        $column = 0;
-        foreach ($matrixData as $matrixRow) {
-            $row = 0;
-            foreach ($matrixRow as $matrixCell) {
-                $returnMatrix[$row][$column] = $matrixCell;
-                ++$row;
-            }
-            ++$column;
-        }
-
-        return $returnMatrix;
-    }
-
-    private static function vlookupSort($a, $b)
-    {
-        reset($a);
-        $firstColumn = key($a);
-        $aLower = StringHelper::strToLower($a[$firstColumn]);
-        $bLower = StringHelper::strToLower($b[$firstColumn]);
-        if ($aLower == $bLower) {
-            return 0;
-        }
-
-        return ($aLower < $bLower) ? -1 : 1;
+        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.
+     * 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
+     *      Use the lookup() method in the LookupRef\VLookup class instead
+     * @see LookupRef\VLookup::lookup()
      *
      * @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 $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)
     {
-        $lookup_value = Functions::flattenSingleValue($lookup_value);
-        $index_number = Functions::flattenSingleValue($index_number);
-        $not_exact_match = Functions::flattenSingleValue($not_exact_match);
-
-        // index_number must be greater than or equal to 1
-        if ($index_number < 1) {
-            return Functions::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))) {
-            return Functions::REF();
-        }
-        $f = array_keys($lookup_array);
-        $firstRow = array_pop($f);
-        if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
-            return Functions::REF();
-        }
-        $columnKeys = array_keys($lookup_array[$firstRow]);
-        $returnColumn = $columnKeys[--$index_number];
-        $firstColumn = array_shift($columnKeys);
-
-        if (!$not_exact_match) {
-            uasort($lookup_array, ['self', 'vlookupSort']);
-        }
-
-        $lookupLower = StringHelper::strToLower($lookup_value);
-        $rowNumber = $rowValue = false;
-        foreach ($lookup_array as $rowKey => $rowData) {
-            $firstLower = StringHelper::strToLower($rowData[$firstColumn]);
-
-            // break if we have passed possible keys
-            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
-                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && ($firstLower > $lookupLower))) {
-                break;
-            }
-            // remember the last key, but only if datatypes match
-            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn])) ||
-                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]))) {
-                if ($not_exact_match) {
-                    $rowNumber = $rowKey;
-
-                    continue;
-                } elseif (($firstLower == $lookupLower)
-                    // Spreadsheets software returns first exact match,
-                    // we have sorted and we might have broken key orders
-                    // we want the first one (by its initial index)
-                    && (($rowNumber == false) || ($rowKey < $rowNumber))
-                ) {
-                    $rowNumber = $rowKey;
-                }
-            }
-        }
-
-        if ($rowNumber !== false) {
-            // return the appropriate value
-            return $lookup_array[$rowNumber][$returnColumn];
-        }
-
-        return Functions::NA();
+        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.
+     * 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
+     *      Use the lookup() method in the LookupRef\HLookup class instead
+     * @see LookupRef\HLookup::lookup()
      *
      * @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 $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)
     {
-        $lookup_value = Functions::flattenSingleValue($lookup_value);
-        $index_number = Functions::flattenSingleValue($index_number);
-        $not_exact_match = Functions::flattenSingleValue($not_exact_match);
-
-        // index_number must be greater than or equal to 1
-        if ($index_number < 1) {
-            return Functions::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))) {
-            return Functions::REF();
-        }
-        $f = array_keys($lookup_array);
-        $firstRow = array_pop($f);
-        if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array))) {
-            return Functions::REF();
-        }
-
-        $firstkey = $f[0] - 1;
-        $returnColumn = $firstkey + $index_number;
-        $firstColumn = array_shift($f);
-        $rowNumber = null;
-        foreach ($lookup_array[$firstColumn] as $rowKey => $rowData) {
-            // break if we have passed possible keys
-            $bothNumeric = is_numeric($lookup_value) && is_numeric($rowData);
-            $bothNotNumeric = !is_numeric($lookup_value) && !is_numeric($rowData);
-            $lookupLower = StringHelper::strToLower($lookup_value);
-            $rowDataLower = StringHelper::strToLower($rowData);
-
-            if ($not_exact_match && (
-                ($bothNumeric && $rowData > $lookup_value) ||
-                ($bothNotNumeric && $rowDataLower > $lookupLower)
-                )) {
-                break;
-            }
-
-            // Remember the last key, but only if datatypes match (as in VLOOKUP)
-            if ($bothNumeric || $bothNotNumeric) {
-                if ($not_exact_match) {
-                    $rowNumber = $rowKey;
-
-                    continue;
-                } elseif ($rowDataLower === $lookupLower
-                    && ($rowNumber === null || $rowKey < $rowNumber)
-                ) {
-                    $rowNumber = $rowKey;
-                }
-            }
-        }
-
-        if ($rowNumber !== null) {
-            //  otherwise return the appropriate value
-            return $lookup_array[$returnColumn][$rowNumber];
-        }
-
-        return Functions::NA();
+        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
+     *      Use the lookup() method in the LookupRef\Lookup class instead
+     * @see LookupRef\Lookup::lookup()
+     *
      * @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
@@ -875,94 +380,23 @@ class LookupRef
      */
     public static function LOOKUP($lookup_value, $lookup_vector, $result_vector = null)
     {
-        $lookup_value = Functions::flattenSingleValue($lookup_value);
-
-        if (!is_array($lookup_vector)) {
-            return Functions::NA();
-        }
-        $hasResultVector = isset($result_vector);
-        $lookupRows = count($lookup_vector);
-        $l = array_keys($lookup_vector);
-        $l = array_shift($l);
-        $lookupColumns = count($lookup_vector[$l]);
-        // we correctly orient our results
-        if (($lookupRows === 1 && $lookupColumns > 1) || (!$hasResultVector && $lookupRows === 2 && $lookupColumns !== 2)) {
-            $lookup_vector = self::TRANSPOSE($lookup_vector);
-            $lookupRows = count($lookup_vector);
-            $l = array_keys($lookup_vector);
-            $lookupColumns = count($lookup_vector[array_shift($l)]);
-        }
-
-        if ($result_vector === null) {
-            $result_vector = $lookup_vector;
-        }
-        $resultRows = count($result_vector);
-        $l = array_keys($result_vector);
-        $l = array_shift($l);
-        $resultColumns = count($result_vector[$l]);
-        // we correctly orient our results
-        if ($resultRows === 1 && $resultColumns > 1) {
-            $result_vector = self::TRANSPOSE($result_vector);
-            $resultRows = count($result_vector);
-            $r = array_keys($result_vector);
-            $resultColumns = count($result_vector[array_shift($r)]);
-        }
-
-        if ($lookupRows === 2 && !$hasResultVector) {
-            $result_vector = array_pop($lookup_vector);
-            $lookup_vector = array_shift($lookup_vector);
-        }
-
-        if ($lookupColumns !== 2) {
-            foreach ($lookup_vector as &$value) {
-                if (is_array($value)) {
-                    $k = array_keys($value);
-                    $key1 = $key2 = array_shift($k);
-                    ++$key2;
-                    $dataValue1 = $value[$key1];
-                } else {
-                    $key1 = 0;
-                    $key2 = 1;
-                    $dataValue1 = $value;
-                }
-                $dataValue2 = array_shift($result_vector);
-                if (is_array($dataValue2)) {
-                    $dataValue2 = array_shift($dataValue2);
-                }
-                $value = [$key1 => $dataValue1, $key2 => $dataValue2];
-            }
-            unset($value);
-        }
-
-        return self::VLOOKUP($lookup_value, $lookup_vector, 2);
+        return Lookup::lookup($lookup_value, $lookup_vector, $result_vector);
     }
 
     /**
      * FORMULATEXT.
      *
+     * @deprecated 1.18.0
+     *      Use the text() method in the LookupRef\Formula class instead
+     * @see LookupRef\Formula::text()
+     *
      * @param mixed $cellReference The cell to check
-     * @param Cell $pCell The current cell (containing this formula)
+     * @param Cell $cell The current cell (containing this formula)
      *
      * @return string
      */
-    public static function FORMULATEXT($cellReference = '', Cell $pCell = null)
+    public static function FORMULATEXT($cellReference = '', ?Cell $cell = null)
     {
-        if ($pCell === null) {
-            return Functions::REF();
-        }
-
-        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
-
-        $cellReference = $matches[6] . $matches[7];
-        $worksheetName = trim($matches[3], "'");
-        $worksheet = (!empty($worksheetName))
-            ? $pCell->getWorksheet()->getParent()->getSheetByName($worksheetName)
-            : $pCell->getWorksheet();
-
-        if (!$worksheet->getCell($cellReference)->isFormula()) {
-            return Functions::NA();
-        }
-
-        return $worksheet->getCell($cellReference)->getValue();
+        return LookupRef\Formula::text($cellReference, $cell);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
new file mode 100644
index 000000000..1a0035d59
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+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;
+    public const ADDRESS_RELATIVE = 4;
+
+    public const REFERENCE_STYLE_A1 = true;
+    public const REFERENCE_STYLE_R1C1 = false;
+
+    /**
+     * ADDRESS.
+     *
+     * Creates a cell address as text, given specified row and column numbers.
+     *
+     * Excel Function:
+     *        =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 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 = '')
+    {
+        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 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);
+        }
+
+        return self::formatAsR1C1($row, $column, $relativity, $sheetName);
+    }
+
+    private static function sheetName(string $sheetName): string
+    {
+        if ($sheetName > '') {
+            if (strpos($sheetName, ' ') !== false || strpos($sheetName, '[') !== false) {
+                $sheetName = "'{$sheetName}'";
+            }
+            $sheetName .= '!';
+        }
+
+        return $sheetName;
+    }
+
+    private static function formatAsA1(int $row, int $column, int $relativity, string $sheetName): string
+    {
+        $rowRelative = $columnRelative = '$';
+        if (($relativity == self::ADDRESS_COLUMN_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $columnRelative = '';
+        }
+        if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $rowRelative = '';
+        }
+        $column = Coordinate::stringFromColumnIndex($column);
+
+        return "{$sheetName}{$columnRelative}{$column}{$rowRelative}{$row}";
+    }
+
+    private static function formatAsR1C1(int $row, int $column, int $relativity, string $sheetName): string
+    {
+        if (($relativity == self::ADDRESS_COLUMN_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $column = "[{$column}]";
+        }
+        if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $row = "[{$row}]";
+        }
+        [$rowChar, $colChar] = AddressHelper::getRowAndColumnChars();
+
+        return "{$sheetName}$rowChar{$row}$colChar{$column}";
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
new file mode 100644
index 000000000..e09477c3f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
@@ -0,0 +1,282 @@
+<?php
+
+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;
+
+    /**
+     * MATCH.
+     *
+     * The MATCH function searches for a specified item in a range of cells
+     *
+     * Excel Function:
+     *        =MATCH(lookup_value, lookup_array, [match_type])
+     *
+     * @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 array|int|string The relative position of the found item
+     */
+    public static function MATCH($lookupValue, $lookupArray, $matchType = self::MATCHTYPE_LARGEST_VALUE)
+    {
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $matchType);
+        }
+
+        $lookupArray = Functions::flattenArray($lookupArray);
+
+        try {
+            // Input validation
+            self::validateLookupValue($lookupValue);
+            $matchType = self::validateMatchType($matchType);
+            self::validateLookupArray($lookupArray);
+
+            $keySet = array_keys($lookupArray);
+            if ($matchType == self::MATCHTYPE_LARGEST_VALUE) {
+                // If match_type is 1 the list has to be processed from last to first
+                $lookupArray = array_reverse($lookupArray);
+                $keySet = array_reverse($keySet);
+            }
+
+            $lookupArray = self::prepareLookupArray($lookupArray, $matchType);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // MATCH() is not case sensitive, so we convert lookup value to be lower cased if it's a string type.
+        if (is_string($lookupValue)) {
+            $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);
+        }
+
+        if ($valueKey !== null) {
+            return ++$valueKey;
+        }
+
+        // Unsuccessful in finding a match, return #N/A error value
+        return ExcelError::NA();
+    }
+
+    /**
+     * @param mixed $lookupValue
+     *
+     * @return mixed
+     */
+    private static function matchFirstValue(array $lookupArray, $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) {
+            if (
+                $valueIsString
+                && is_string($lookupArrayValue)
+            ) {
+                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;
+    }
+
+    /**
+     * @param mixed $lookupValue
+     *
+     * @return mixed
+     */
+    private static function matchLargestValue(array $lookupArray, $lookupValue, array $keySet)
+    {
+        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) {
+            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);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param mixed $lookupValue
+     *
+     * @return mixed
+     */
+    private static function matchSmallestValue(array $lookupArray, $lookupValue)
+    {
+        $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;
+            }
+            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
+                break;
+            }
+        }
+
+        return $valueKey;
+    }
+
+    /**
+     * @param mixed $lookupValue
+     */
+    private static function validateLookupValue($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(ExcelError::NA());
+        }
+    }
+
+    /**
+     * @param mixed $matchType
+     */
+    private static function validateMatchType($matchType): int
+    {
+        // Match_type is 0, 1 or -1
+        // 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(array $lookupArray): void
+    {
+        // Lookup_array should not be empty
+        $lookupArraySize = count($lookupArray);
+        if ($lookupArraySize <= 0) {
+            throw new Exception(ExcelError::NA());
+        }
+    }
+
+    /**
+     * @param mixed $matchType
+     */
+    private static function prepareLookupArray(array $lookupArray, $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(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))
+            ) {
+                unset($lookupArray[$i]);
+            }
+        }
+
+        return $lookupArray;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
new file mode 100644
index 000000000..74fa8321d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Filter
+{
+    /**
+     * @param mixed $lookupArray
+     * @param mixed $matchArray
+     * @param mixed $ifEmpty
+     *
+     * @return mixed
+     */
+    public static function filter($lookupArray, $matchArray, $ifEmpty = null)
+    {
+        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),
+            function ($index) use ($matchArray): bool {
+                return (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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
new file mode 100644
index 000000000..fceb191a0
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+
+class Formula
+{
+    /**
+     * FORMULATEXT.
+     *
+     * @param mixed $cellReference The cell to check
+     * @param Cell $cell The current cell (containing this formula)
+     *
+     * @return string
+     */
+    public static function text($cellReference = '', ?Cell $cell = null)
+    {
+        if ($cell === null) {
+            return ExcelError::REF();
+        }
+
+        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
+
+        $cellReference = $matches[6] . $matches[7];
+        $worksheetName = trim($matches[3], "'");
+        $worksheet = (!empty($worksheetName))
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheetName)
+            : $cell->getWorksheet();
+
+        if (
+            $worksheet === null ||
+            !$worksheet->cellExists($cellReference) ||
+            !$worksheet->getCell($cellReference)->isFormula()
+        ) {
+            return ExcelError::NA();
+        }
+
+        return $worksheet->getCell($cellReference)->getValue();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
new file mode 100644
index 000000000..bc425f873
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+     *     in the same column based on the index_number.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupArray The range of cells being searched
+     * @param mixed $indexNumber The row number in table_array from which the matching value must be returned.
+     *                                The first row is 1.
+     * @param mixed $notExactMatch determines if you are looking for an exact match based on lookup_value
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExactMatch = true)
+    {
+        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();
+        }
+
+        $f = array_keys($lookupArray);
+        $firstRow = reset($f);
+        if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray))) {
+            return ExcelError::REF();
+        }
+
+        $firstkey = $f[0] - 1;
+        $returnColumn = $firstkey + $indexNumber;
+        $firstColumn = array_shift($f) ?? 1;
+        $rowNumber = self::hLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
+
+        if ($rowNumber !== null) {
+            //  otherwise return the appropriate value
+            return $lookupArray[$returnColumn][Coordinate::stringFromColumnIndex($rowNumber)];
+        }
+
+        return ExcelError::NA();
+    }
+
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function hLookupSearch($lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
+    {
+        $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((string) $rowData);
+
+            if (
+                $notExactMatch &&
+                (($bothNumeric && $rowData > $lookupValue) || ($bothNotNumeric && $cellDataLower > $lookupLower))
+            ) {
+                break;
+            }
+
+            $rowNumber = self::checkMatch(
+                $bothNumeric,
+                $bothNotNumeric,
+                $notExactMatch,
+                Coordinate::columnIndexFromString($rowKey),
+                $cellDataLower,
+                $lookupLower,
+                $rowNumber
+            );
+        }
+
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
new file mode 100644
index 000000000..33a748882
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Helpers
+{
+    public const CELLADDRESS_USE_A1 = true;
+
+    public const CELLADDRESS_USE_R1C1 = false;
+
+    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, $baseRow ?? 1, $baseCol ?? 1);
+            if ($cellAddress2) {
+                $cellAddress2 = AddressHelper::convertToA1($cellAddress2, $baseRow ?? 1, $baseCol ?? 1);
+            }
+        }
+
+        return $cellAddress1 . ($cellAddress2 ? ":$cellAddress2" : '');
+    }
+
+    private static function adjustSheetTitle(string &$sheetTitle, ?string $value): void
+    {
+        if ($sheetTitle) {
+            $sheetTitle .= '!';
+            if (stripos($value ?? '', $sheetTitle) === 0) {
+                $sheetTitle = '';
+            }
+        }
+    }
+
+    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = '', ?int $baseRow = null, ?int $baseCol = null): array
+    {
+        $cellAddress1 = $cellAddress;
+        $cellAddress2 = null;
+        $namedRange = DefinedName::resolveName($cellAddress1, $sheet, $sheetName);
+        if ($namedRange !== null) {
+            $workSheet = $namedRange->getWorkSheet();
+            $sheetTitle = ($workSheet === null) ? '' : $workSheet->getTitle();
+            $value = (string) preg_replace('/^=/', '', $namedRange->getValue());
+            self::adjustSheetTitle($sheetTitle, $value);
+            $cellAddress1 = $sheetTitle . $value;
+            $cellAddress = $cellAddress1;
+            $a1 = self::CELLADDRESS_USE_A1;
+        }
+        if (strpos($cellAddress, ':') !== false) {
+            [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
+        }
+        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1, $baseRow, $baseCol);
+
+        return [$cellAddress1, $cellAddress2, $cellAddress];
+    }
+
+    public static function extractWorksheet(string $cellAddress, Cell $cell): array
+    {
+        $sheetName = '';
+        if (strpos($cellAddress, '!') !== false) {
+            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+            $sheetName = trim($sheetName, "'");
+        }
+
+        $worksheet = ($sheetName !== '')
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($sheetName)
+            : $cell->getWorksheet();
+
+        return [$cellAddress, $worksheet, $sheetName];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
new file mode 100644
index 000000000..5387833f8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+
+class Hyperlink
+{
+    /**
+     * HYPERLINK.
+     *
+     * Excel Function:
+     *        =HYPERLINK(linkURL, [displayName])
+     *
+     * @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 $cell The cell to set the hyperlink in
+     *
+     * @return mixed The value of $displayName (or $linkURL if $displayName was blank)
+     */
+    public static function set($linkURL = '', $displayName = null, ?Cell $cell = null)
+    {
+        $linkURL = ($linkURL === null) ? '' : Functions::flattenSingleValue($linkURL);
+        $displayName = ($displayName === null) ? '' : Functions::flattenSingleValue($displayName);
+
+        if ((!is_object($cell)) || (trim($linkURL) == '')) {
+            return ExcelError::REF();
+        }
+
+        if ((is_object($displayName)) || trim($displayName) == '') {
+            $displayName = $linkURL;
+        }
+
+        $cell->getHyperlink()->setUrl($linkURL);
+        $cell->getHyperlink()->setTooltip($displayName);
+
+        return $displayName;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
new file mode 100644
index 000000000..bd76ce930
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+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
+{
+    /**
+     * Determine whether cell address is in A1 (true) or R1C1 (false) format.
+     *
+     * @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
+    {
+        $a1fmt = Functions::flattenSingleValue($a1fmt);
+        if ($a1fmt === null) {
+            return Helpers::CELLADDRESS_USE_A1;
+        }
+        if (is_string($a1fmt)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (bool) $a1fmt;
+    }
+
+    /**
+     * Convert cellAddress to string, verify not null string.
+     *
+     * @param array|string $cellAddress
+     */
+    private static function validateAddress($cellAddress): string
+    {
+        $cellAddress = Functions::flattenSingleValue($cellAddress);
+        if (!is_string($cellAddress) || !$cellAddress) {
+            throw new Exception(ExcelError::REF());
+        }
+
+        return $cellAddress;
+    }
+
+    /**
+     * INDIRECT.
+     *
+     * Returns the reference specified by a text string.
+     * References are immediately evaluated to display their contents.
+     *
+     * Excel Function:
+     *        =INDIRECT(cellAddress, bool) where the bool argument is optional
+     *
+     * @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 $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 $cell)
+    {
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($cell->getCoordinate());
+
+        try {
+            $a1 = self::a1Format($a1fmt);
+            $cellAddress = self::validateAddress($cellAddress);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        [$cellAddress, $worksheet, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+
+        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 $e) {
+            return ExcelError::REF();
+        }
+
+        if (
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress1, $matches)) ||
+            (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress2, $matches)))
+        ) {
+            return ExcelError::REF();
+        }
+
+        return self::extractRequiredCells($worksheet, $cellAddress);
+    }
+
+    /**
+     * Extract range values.
+     *
+     * @return mixed Array of values in range if range contains more than one element.
+     *                  Otherwise, a single value is returned.
+     */
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress)
+    {
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
new file mode 100644
index 000000000..d836633ab
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+class Lookup
+{
+    use ArrayEnabled;
+
+    /**
+     * LOOKUP
+     * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupVector The range of cells being searched
+     * @param null|mixed $resultVector The column from which the matching value must be returned
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup($lookupValue, $lookupVector, $resultVector = null)
+    {
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $lookupValue, $lookupVector, $resultVector);
+        }
+
+        if (!is_array($lookupVector)) {
+            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);
+            $lookupRows = self::rowCount($lookupVector);
+            $lookupColumns = self::columnCount($lookupVector);
+        }
+
+        $resultVector = self::verifyResultVector($resultVector ?? $lookupVector);
+
+        if ($lookupRows === 2 && !$hasResultVector) {
+            $resultVector = array_pop($lookupVector);
+            $lookupVector = array_shift($lookupVector);
+        }
+
+        if ($lookupColumns !== 2) {
+            $lookupVector = self::verifyLookupValues($lookupVector, $resultVector);
+        }
+
+        return VLookup::lookup($lookupValue, $lookupVector, 2);
+    }
+
+    private static function verifyLookupValues(array $lookupVector, array $resultVector): array
+    {
+        foreach ($lookupVector as &$value) {
+            if (is_array($value)) {
+                $k = array_keys($value);
+                $key1 = $key2 = array_shift($k);
+                ++$key2;
+                $dataValue1 = $value[$key1];
+            } else {
+                $key1 = 0;
+                $key2 = 1;
+                $dataValue1 = $value;
+            }
+
+            $dataValue2 = array_shift($resultVector);
+            if (is_array($dataValue2)) {
+                $dataValue2 = array_shift($dataValue2);
+            }
+            $value = [$key1 => $dataValue1, $key2 => $dataValue2];
+        }
+        unset($value);
+
+        return $lookupVector;
+    }
+
+    private static function verifyResultVector(array $resultVector): array
+    {
+        $resultRows = self::rowCount($resultVector);
+        $resultColumns = self::columnCount($resultVector);
+
+        // we correctly orient our results
+        if ($resultRows === 1 && $resultColumns > 1) {
+            $resultVector = LookupRef\Matrix::transpose($resultVector);
+        }
+
+        return $resultVector;
+    }
+
+    private static function rowCount(array $dataArray): int
+    {
+        return count($dataArray);
+    }
+
+    private static function columnCount(array $dataArray): int
+    {
+        $rowKeys = array_keys($dataArray);
+        $row = array_shift($rowKeys);
+
+        return count($dataArray[$row]);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
new file mode 100644
index 000000000..be5d81cb1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+abstract class LookupBase
+{
+    /**
+     * @param mixed $lookup_array
+     */
+    protected static function validateLookupArray($lookup_array): void
+    {
+        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 (empty($lookup_array)) {
+            throw new Exception(ExcelError::REF());
+        }
+
+        return (int) $index_number;
+    }
+
+    protected static function checkMatch(
+        bool $bothNumeric,
+        bool $bothNotNumeric,
+        bool $notExactMatch,
+        int $rowKey,
+        string $cellDataLower,
+        string $lookupLower,
+        ?int $rowNumber
+    ): ?int {
+        // remember the last key, but only if datatypes match
+        if ($bothNumeric || $bothNotNumeric) {
+            // Spreadsheets software returns first exact match,
+            // we have sorted and we might have broken key orders
+            // we want the first one (by its initial index)
+            if ($notExactMatch) {
+                $rowNumber = $rowKey;
+            } elseif (($cellDataLower == $lookupLower) && (($rowNumber === null) || ($rowKey < $rowNumber))) {
+                $rowNumber = $rowKey;
+            }
+        }
+
+        return $rowNumber;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
new file mode 100644
index 000000000..2282bf476
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class LookupRefValidations
+{
+    /**
+     * @param mixed $value
+     */
+    public static function validateInt($value): int
+    {
+        if (!is_numeric($value)) {
+            if (ErrorValue::isError($value)) {
+                throw new Exception($value);
+            }
+
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validatePositiveInt($value, bool $allowZero = true): int
+    {
+        $value = self::validateInt($value);
+
+        if (($allowZero === false && $value <= 0) || $value < 0) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
new file mode 100644
index 000000000..8ee759e87
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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)
+    {
+        $returnMatrix = [];
+        if (!is_array($matrixData)) {
+            $matrixData = [[$matrixData]];
+        }
+
+        $column = 0;
+        foreach ($matrixData as $matrixRow) {
+            $row = 0;
+            foreach ($matrixRow as $matrixCell) {
+                $returnMatrix[$row][$column] = $matrixCell;
+                ++$row;
+            }
+            ++$column;
+        }
+
+        return $returnMatrix;
+    }
+
+    /**
+     * INDEX.
+     *
+     * Uses an index to choose a value from a reference or array
+     *
+     * Excel Function:
+     *        =INDEX(range_array, row_num, [column_num], [area_num])
+     *
+     * @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 = null)
+    {
+        if (is_array($rowNum) || is_array($columnNum)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $matrix, $rowNum, $columnNum);
+        }
+
+        $rowNum = $rowNum ?? 0;
+        $originalColumnNum = $columnNum;
+        $columnNum = $columnNum ?? 0;
+
+        try {
+            $rowNum = LookupRefValidations::validatePositiveInt($rowNum);
+            $columnNum = LookupRefValidations::validatePositiveInt($columnNum);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (!is_array($matrix) || ($rowNum > count($matrix))) {
+            return ExcelError::REF();
+        }
+
+        $rowKeys = array_keys($matrix);
+        $columnKeys = @array_keys($matrix[$rowKeys[0]]);
+
+        if ($columnNum > count($columnKeys)) {
+            return ExcelError::REF();
+        }
+        if ($originalColumnNum === null && 1 < count($columnKeys)) {
+            return ExcelError::REF();
+        }
+
+        if ($columnNum === 0) {
+            return self::extractRowValue($matrix, $rowKeys, $rowNum);
+        }
+
+        $columnNum = $columnKeys[--$columnNum];
+        if ($rowNum === 0) {
+            return array_map(
+                function ($value) {
+                    return [$value];
+                },
+                array_column($matrix, $columnNum)
+            );
+        }
+        $rowNum = $rowKeys[--$rowNum];
+
+        return $matrix[$rowNum][$columnNum];
+    }
+
+    /** @return mixed */
+    private static function extractRowValue(array $matrix, array $rowKeys, int $rowNum)
+    {
+        if ($rowNum === 0) {
+            return $matrix;
+        }
+
+        $rowNum = $rowKeys[--$rowNum];
+        $row = $matrix[$rowNum];
+        if (is_array($row)) {
+            return [$rowNum => $row];
+        }
+
+        return $row;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
new file mode 100644
index 000000000..562d75397
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
@@ -0,0 +1,158 @@
+<?php
+
+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;
+
+class Offset
+{
+    /**
+     * 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])
+     *
+     * @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|int|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 $cell = null)
+    {
+        $rows = Functions::flattenSingleValue($rows);
+        $columns = Functions::flattenSingleValue($columns);
+        $height = Functions::flattenSingleValue($height);
+        $width = Functions::flattenSingleValue($width);
+
+        if ($cellAddress === null || $cellAddress === '') {
+            return ExcelError::VALUE();
+        }
+
+        if (!is_object($cell)) {
+            return ExcelError::REF();
+        }
+
+        [$cellAddress, $worksheet] = self::extractWorksheet($cellAddress, $cell);
+
+        $startCell = $endCell = $cellAddress;
+        if (strpos($cellAddress, ':')) {
+            [$startCell, $endCell] = explode(':', $cellAddress);
+        }
+        [$startCellColumn, $startCellRow] = Coordinate::coordinateFromString($startCell);
+        [$endCellColumn, $endCellRow] = Coordinate::coordinateFromString($endCell);
+
+        $startCellRow += $rows;
+        $startCellColumn = Coordinate::columnIndexFromString($startCellColumn) - 1;
+        $startCellColumn += $columns;
+
+        if (($startCellRow <= 0) || ($startCellColumn < 0)) {
+            return ExcelError::REF();
+        }
+
+        $endCellColumn = self::adjustEndCellColumnForWidth($endCellColumn, $width, $startCellColumn, $columns);
+        $startCellColumn = Coordinate::stringFromColumnIndex($startCellColumn + 1);
+
+        $endCellRow = self::adustEndCellRowForHeight($height, $startCellRow, $rows, $endCellRow);
+
+        if (($endCellRow <= 0) || ($endCellColumn < 0)) {
+            return ExcelError::REF();
+        }
+        $endCellColumn = Coordinate::stringFromColumnIndex($endCellColumn + 1);
+
+        $cellAddress = "{$startCellColumn}{$startCellRow}";
+        if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
+            $cellAddress .= ":{$endCellColumn}{$endCellRow}";
+        }
+
+        return self::extractRequiredCells($worksheet, $cellAddress);
+    }
+
+    /** @return mixed */
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress)
+    {
+        return Calculation::getInstance($worksheet !== null ? $worksheet->getParent() : null)
+            ->extractCellRange($cellAddress, $worksheet, false);
+    }
+
+    private static function extractWorksheet(?string $cellAddress, Cell $cell): array
+    {
+        $cellAddress = self::assessCellAddress($cellAddress ?? '', $cell);
+
+        $sheetName = '';
+        if (strpos($cellAddress, '!') !== false) {
+            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+            $sheetName = trim($sheetName, "'");
+        }
+
+        $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;
+    }
+
+    /**
+     * @param mixed $width
+     * @param mixed $columns
+     */
+    private static function adjustEndCellColumnForWidth(string $endCellColumn, $width, int $startCellColumn, $columns): int
+    {
+        $endCellColumn = Coordinate::columnIndexFromString($endCellColumn) - 1;
+        if (($width !== null) && (!is_object($width))) {
+            $endCellColumn = $startCellColumn + (int) $width - 1;
+        } else {
+            $endCellColumn += (int) $columns;
+        }
+
+        return $endCellColumn;
+    }
+
+    /**
+     * @param mixed $height
+     * @param mixed $rows
+     * @param mixed $endCellRow
+     */
+    private static function adustEndCellRowForHeight($height, int $startCellRow, $rows, $endCellRow): int
+    {
+        if (($height !== null) && (!is_object($height))) {
+            $endCellRow = $startCellRow + (int) $height - 1;
+        } else {
+            $endCellRow += (int) $rows;
+        }
+
+        return $endCellRow;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
new file mode 100644
index 000000000..8bce07e90
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class RowColumnInformation
+{
+    /**
+     * Test if cellAddress is null or whitespace string.
+     *
+     * @param null|array|string $cellAddress A reference to a range of cells
+     */
+    private static function cellAddressNullOrWhitespace($cellAddress): bool
+    {
+        return $cellAddress === null || (!is_array($cellAddress) && trim($cellAddress) === '');
+    }
+
+    private static function cellColumn(?Cell $cell): int
+    {
+        return ($cell !== null) ? (int) Coordinate::columnIndexFromString($cell->getColumn()) : 1;
+    }
+
+    /**
+     * 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])
+     *
+     * @param null|array|string $cellAddress A reference to a range of cells for which you want the column numbers
+     *
+     * @return int|int[]
+     */
+    public static function COLUMN($cellAddress = null, ?Cell $cell = null)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return self::cellColumn($cell);
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $columnKey => $value) {
+                $columnKey = (string) preg_replace('/[^a-z]/i', '', $columnKey);
+
+                return (int) Coordinate::columnIndexFromString($columnKey);
+            }
+
+            return self::cellColumn($cell);
+        }
+
+        $cellAddress = $cellAddress ?? '';
+        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) {
+            [$startAddress, $endAddress] = explode(':', $cellAddress);
+            $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)
+            );
+        }
+
+        $cellAddress = (string) preg_replace('/[^a-z]/i', '', $cellAddress);
+
+        return (int) Coordinate::columnIndexFromString($cellAddress);
+    }
+
+    /**
+     * COLUMNS.
+     *
+     * Returns the number of columns in an array or reference.
+     *
+     * Excel Function:
+     *        =COLUMNS(cellAddress)
+     *
+     * @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)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return 1;
+        }
+        if (!is_array($cellAddress)) {
+            return ExcelError::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $rows;
+        }
+
+        return $columns;
+    }
+
+    private static function cellRow(?Cell $cell): int
+    {
+        return ($cell !== null) ? $cell->getRow() : 1;
+    }
+
+    /**
+     * 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])
+     *
+     * @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)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return self::cellRow($cell);
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $rowKey => $rowValue) {
+                foreach ($rowValue as $columnKey => $cellValue) {
+                    return (int) preg_replace('/\D/', '', $rowKey);
+                }
+            }
+
+            return self::cellRow($cell);
+        }
+
+        $cellAddress = $cellAddress ?? '';
+        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) {
+            [$startAddress, $endAddress] = explode(':', $cellAddress);
+            $startAddress = (string) preg_replace('/\D/', '', $startAddress);
+            $endAddress = (string) preg_replace('/\D/', '', $endAddress);
+
+            return array_map(
+                function ($value) {
+                    return [$value];
+                },
+                range($startAddress, $endAddress)
+            );
+        }
+        [$cellAddress] = explode(':', $cellAddress);
+
+        return (int) preg_replace('/\D/', '', $cellAddress);
+    }
+
+    /**
+     * ROWS.
+     *
+     * Returns the number of rows in an array or reference.
+     *
+     * Excel Function:
+     *        =ROWS(cellAddress)
+     *
+     * @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)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return 1;
+        }
+        if (!is_array($cellAddress)) {
+            return ExcelError::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $columns;
+        }
+
+        return $rows;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
new file mode 100644
index 000000000..0ac917773
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
@@ -0,0 +1,51 @@
+<?php
+
+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.
+     *
+     * 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], ...)
+     *
+     * @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($chosenEntry, ...$chooseArgs)
+    {
+        if (is_array($chosenEntry)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $chosenEntry, ...$chooseArgs);
+        }
+
+        $entryCount = count($chooseArgs) - 1;
+
+        if (is_numeric($chosenEntry)) {
+            --$chosenEntry;
+        } else {
+            return ExcelError::VALUE();
+        }
+        $chosenEntry = floor($chosenEntry);
+        if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
+            return ExcelError::VALUE();
+        }
+
+        if (is_array($chooseArgs[$chosenEntry])) {
+            return Functions::flattenArray($chooseArgs[$chosenEntry]);
+        }
+
+        return $chooseArgs[$chosenEntry];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
new file mode 100644
index 000000000..ff78fbea8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
@@ -0,0 +1,342 @@
+<?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($sortArray, $sortIndex = 1, $sortOrder = self::ORDER_ASCENDING, $byColumn = false)
+    {
+        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($sortArray, ...$args)
+    {
+        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);
+    }
+
+    /**
+     * @param mixed $sortIndex
+     * @param mixed $sortOrder
+     */
+    private static function validateScalarArgumentsForSort(&$sortIndex, &$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);
+    }
+
+    /**
+     * @param mixed $sortVector
+     */
+    private static function validateSortVector($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;
+    }
+
+    /**
+     * @param mixed $sortOrder
+     */
+    private static function validateSortOrder($sortOrder): int
+    {
+        $sortOrder = self::validateInt($sortOrder);
+        if (($sortOrder == self::ORDER_ASCENDING || $sortOrder === self::ORDER_DESCENDING) === false) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $sortOrder;
+    }
+
+    /**
+     * @param array $sortIndex
+     * @param mixed $sortOrder
+     */
+    private static function validateArrayArgumentsForSort(&$sortIndex, &$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, $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;
+        }
+        $sortArguments = self::applyPHP7Patch($sortArray, $sortArguments);
+
+        $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;
+        }
+        $sortArguments = self::applyPHP7Patch($sortArray, $sortArguments);
+
+        $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;
+    }
+
+    /**
+     * Hack to handle PHP 7:
+     * From PHP 8.0.0, If two members compare as equal in a sort, they retain their original order;
+     *      but prior to PHP 8.0.0, their relative order in the sorted array was undefined.
+     * MS Excel replicates the PHP 8.0.0 behaviour, retaining the original order of matching elements.
+     * To replicate that behaviour with PHP 7, we add an extra sort based on the row index.
+     */
+    private static function applyPHP7Patch(array $sortArray, array $sortArguments): array
+    {
+        if (PHP_VERSION_ID < 80000) {
+            $sortArguments[] = range(1, count($sortArray));
+            $sortArguments[] = SORT_ASC;
+        }
+
+        return $sortArguments;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
new file mode 100644
index 000000000..2ba51281e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
@@ -0,0 +1,141 @@
+<?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($lookupVector, $byColumn = false, $exactlyOnce = false)
+    {
+        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);
+    }
+
+    /**
+     * @return mixed
+     */
+    private static function uniqueByRow(array $lookupVector, bool $exactlyOnce)
+    {
+        // 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 {
+                $value = implode(chr(0x00), $value);
+            }
+        );
+
+        $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(chr(0x00), $value);
+            }
+        );
+
+        return (count($result) === 1) ? array_pop($result) : $result;
+    }
+
+    /**
+     * @return mixed
+     */
+    private static function uniqueByColumn(array $lookupVector, bool $exactlyOnce)
+    {
+        $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(
+                function (string $value) {
+                    return 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,
+            function ($value) {
+                return $value === 1;
+            }
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
new file mode 100644
index 000000000..badd10573
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+     *     in the same row based on the index_number.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupArray The range of cells being searched
+     * @param mixed $indexNumber The column number in table_array from which the matching value must be returned.
+     *                                The first column is 1.
+     * @param mixed $notExactMatch determines if you are looking for an exact match based on lookup_value
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExactMatch = true)
+    {
+        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();
+        }
+
+        $f = array_keys($lookupArray);
+        $firstRow = array_pop($f);
+        if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray[$firstRow]))) {
+            return ExcelError::REF();
+        }
+        $columnKeys = array_keys($lookupArray[$firstRow]);
+        $returnColumn = $columnKeys[--$indexNumber];
+        $firstColumn = array_shift($columnKeys) ?? 1;
+
+        if (!$notExactMatch) {
+            /** @var callable */
+            $callable = [self::class, 'vlookupSort'];
+            uasort($lookupArray, $callable);
+        }
+
+        $rowNumber = self::vLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
+
+        if ($rowNumber !== null) {
+            // return the appropriate value
+            return $lookupArray[$rowNumber][$returnColumn];
+        }
+
+        return ExcelError::NA();
+    }
+
+    private static function vlookupSort(array $a, array $b): int
+    {
+        reset($a);
+        $firstColumn = key($a);
+        $aLower = StringHelper::strToLower((string) $a[$firstColumn]);
+        $bLower = StringHelper::strToLower((string) $b[$firstColumn]);
+
+        if ($aLower == $bLower) {
+            return 0;
+        }
+
+        return ($aLower < $bLower) ? -1 : 1;
+    }
+
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function vLookupSearch($lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
+    {
+        $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((string) $rowData[$column]);
+
+            // break if we have passed possible keys
+            if (
+                $notExactMatch &&
+                (($bothNumeric && ($rowData[$column] > $lookupValue)) ||
+                ($bothNotNumeric && ($cellDataLower > $lookupLower)))
+            ) {
+                break;
+            }
+
+            $rowNumber = self::checkMatch(
+                $bothNumeric,
+                $bothNotNumeric,
+                $notExactMatch,
+                $rowKey,
+                $cellDataLower,
+                $lookupLower,
+                $rowNumber
+            );
+        }
+
+        return $rowNumber;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php
index 33bfee195..a92e9c82e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -2,42 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use Matrix\Exception as MatrixException;
-use Matrix\Matrix;
-
+/**
+ * @deprecated 1.18.0
+ */
 class MathTrig
 {
-    //
-    //    Private method to return an array of the factors of the input value
-    //
-    private static function factors($value)
-    {
-        $startVal = floor(sqrt($value));
-
-        $factorArray = [];
-        for ($i = $startVal; $i > 1; --$i) {
-            if (($value % $i) == 0) {
-                $factorArray = array_merge($factorArray, self::factors($value / $i));
-                $factorArray = array_merge($factorArray, self::factors($i));
-                if ($i <= sqrt($value)) {
-                    break;
-                }
-            }
-        }
-        if (!empty($factorArray)) {
-            rsort($factorArray);
-
-            return $factorArray;
-        }
-
-        return [(int) $value];
-    }
-
-    private static function romanCut($num, $n)
-    {
-        return ($num - ($num % $n)) / $n;
-    }
-
     /**
      * ARABIC.
      *
@@ -46,54 +15,17 @@ class MathTrig
      * Excel Function:
      *        ARABIC(text)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\Arabic class instead
+     * @see MathTrig\Arabic::evaluate()
      *
-     * @param string $roman
+     * @param array|string $roman
      *
-     * @return int|string the arabic numberal contrived from the roman numeral
+     * @return array|int|string the arabic numberal contrived from the roman numeral
      */
     public static function ARABIC($roman)
     {
-        // An empty string should return 0
-        $roman = substr(trim(strtoupper((string) Functions::flattenSingleValue($roman))), 0, 255);
-        if ($roman === '') {
-            return 0;
-        }
-
-        // Convert the roman numeral to an arabic number
-        $lookup = [
-            'M' => 1000, 'CM' => 900,
-            'D' => 500, 'CD' => 400,
-            'C' => 100, 'XC' => 90,
-            'L' => 50, 'XL' => 40,
-            'X' => 10, 'IX' => 9,
-            'V' => 5, 'IV' => 4, 'I' => 1,
-        ];
-
-        $negativeNumber = $roman[0] === '-';
-        if ($negativeNumber) {
-            $roman = substr($roman, 1);
-        }
-
-        $arabic = 0;
-        for ($i = 0; $i < strlen($roman); ++$i) {
-            if (!isset($lookup[$roman[$i]])) {
-                return Functions::VALUE(); // Invalid character detected
-            }
-
-            if ($i < (strlen($roman) - 1) && isset($lookup[substr($roman, $i, 2)])) {
-                $arabic += $lookup[substr($roman, $i, 2)]; // Detected a match on the next 2 characters
-                ++$i;
-            } else {
-                $arabic += $lookup[$roman[$i]]; // Detected a match on one character only
-            }
-        }
-
-        if ($negativeNumber) {
-            $arabic *= -1; // The number should be negative
-        }
-
-        return $arabic;
+        return MathTrig\Arabic::evaluate($roman);
     }
 
     /**
@@ -112,34 +44,18 @@ class MathTrig
      * Excel Function:
      *        ATAN2(xCoordinate,yCoordinate)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the atan2 method in the MathTrig\Trig\Tangent class instead
+     * @see MathTrig\Trig\Tangent::atan2()
      *
-     * @param float $xCoordinate the x-coordinate of the point
-     * @param float $yCoordinate the y-coordinate of the point
+     * @param array|float $xCoordinate the x-coordinate of the point
+     * @param array|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
+     * @return array|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)
     {
-        $xCoordinate = Functions::flattenSingleValue($xCoordinate);
-        $yCoordinate = Functions::flattenSingleValue($yCoordinate);
-
-        $xCoordinate = ($xCoordinate !== null) ? $xCoordinate : 0.0;
-        $yCoordinate = ($yCoordinate !== null) ? $yCoordinate : 0.0;
-
-        if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
-            ((is_numeric($yCoordinate))) || (is_bool($yCoordinate))) {
-            $xCoordinate = (float) $xCoordinate;
-            $yCoordinate = (float) $yCoordinate;
-
-            if (($xCoordinate == 0) && ($yCoordinate == 0)) {
-                return Functions::DIV0();
-            }
-
-            return atan2($yCoordinate, $xCoordinate);
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Trig\Tangent::atan2($xCoordinate, $yCoordinate);
     }
 
     /**
@@ -150,39 +66,19 @@ class MathTrig
      * Excel Function:
      *        BASE(Number, Radix [Min_length])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\Base class instead
+     * @see MathTrig\Base::evaluate()
      *
      * @param float $number
      * @param float $radix
      * @param int $minLength
      *
-     * @return string the text representation with the given radix (base)
+     * @return array|string the text representation with the given radix (base)
      */
     public static function BASE($number, $radix, $minLength = null)
     {
-        $number = Functions::flattenSingleValue($number);
-        $radix = Functions::flattenSingleValue($radix);
-        $minLength = Functions::flattenSingleValue($minLength);
-
-        if (is_numeric($number) && is_numeric($radix) && ($minLength === null || is_numeric($minLength))) {
-            // Truncate to an integer
-            $number = (int) $number;
-            $radix = (int) $radix;
-            $minLength = (int) $minLength;
-
-            if ($number < 0 || $number >= 2 ** 53 || $radix < 2 || $radix > 36) {
-                return Functions::NAN(); // Numeric range constraints
-            }
-
-            $outcome = strtoupper((string) base_convert($number, 10, $radix));
-            if ($minLength !== null) {
-                $outcome = str_pad($outcome, $minLength, '0', STR_PAD_LEFT); // String padding
-            }
-
-            return $outcome;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Base::evaluate($number, $radix, $minLength);
     }
 
     /**
@@ -196,34 +92,18 @@ class MathTrig
      * Excel Function:
      *        CEILING(number[,significance])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.17.0
+     *      Use the ceiling() method in the MathTrig\Ceiling class instead
+     * @see MathTrig\Ceiling::ceiling()
      *
      * @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
+     * @return array|float|string Rounded Number, or a string containing an error
      */
     public static function CEILING($number, $significance = null)
     {
-        $number = Functions::flattenSingleValue($number);
-        $significance = Functions::flattenSingleValue($significance);
-
-        if (($significance === null) &&
-            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
-            $significance = $number / abs($number);
-        }
-
-        if ((is_numeric($number)) && (is_numeric($significance))) {
-            if (($number == 0.0) || ($significance == 0.0)) {
-                return 0.0;
-            } elseif (self::SIGN($number) == self::SIGN($significance)) {
-                return ceil($number / $significance) * $significance;
-            }
-
-            return Functions::NAN();
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Ceiling::ceiling($number, $significance);
     }
 
     /**
@@ -235,29 +115,18 @@ class MathTrig
      * Excel Function:
      *        COMBIN(numObjs,numInSet)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the withoutRepetition() method in the MathTrig\Combinations class instead
+     * @see MathTrig\Combinations::withoutRepetition()
      *
-     * @param int $numObjs Number of different objects
-     * @param int $numInSet Number of objects in each combination
+     * @param array|int $numObjs Number of different objects
+     * @param array|int $numInSet Number of objects in each combination
      *
-     * @return 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
      */
     public static function COMBIN($numObjs, $numInSet)
     {
-        $numObjs = Functions::flattenSingleValue($numObjs);
-        $numInSet = Functions::flattenSingleValue($numInSet);
-
-        if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-            if ($numObjs < $numInSet) {
-                return Functions::NAN();
-            } elseif ($numInSet < 0) {
-                return Functions::NAN();
-            }
-
-            return round(self::FACT($numObjs) / self::FACT($numObjs - $numInSet)) / self::FACT($numInSet);
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Combinations::withoutRepetition($numObjs, $numInSet);
     }
 
     /**
@@ -272,29 +141,29 @@ class MathTrig
      * Excel Function:
      *        EVEN(number)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the even() method in the MathTrig\Round class instead
+     * @see MathTrig\Round::even()
      *
-     * @param float $number Number to round
+     * @param array|float $number Number to round
      *
-     * @return int|string Rounded Number, or a string containing an error
+     * @return array|float|int|string Rounded Number, or a string containing an error
      */
     public static function EVEN($number)
     {
-        $number = Functions::flattenSingleValue($number);
+        return MathTrig\Round::even($number);
+    }
 
-        if ($number === null) {
-            return 0;
-        } elseif (is_bool($number)) {
-            $number = (int) $number;
-        }
-
-        if (is_numeric($number)) {
-            $significance = 2 * self::SIGN($number);
-
-            return (int) self::CEILING($number, $significance);
-        }
-
-        return Functions::VALUE();
+    /**
+     * Helper function for Even.
+     *
+     * @deprecated 1.18.0
+     *      Use the evaluate() method in the MathTrig\Helpers class instead
+     * @see MathTrig\Helpers::getEven()
+     */
+    public static function getEven(float $number): int
+    {
+        return (int) MathTrig\Helpers::getEven($number);
     }
 
     /**
@@ -306,35 +175,17 @@ class MathTrig
      * Excel Function:
      *        FACT(factVal)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the fact() method in the MathTrig\Factorial class instead
+     * @see MathTrig\Factorial::fact()
      *
-     * @param float $factVal Factorial Value
+     * @param array|float $factVal Factorial Value
      *
-     * @return int|string Factorial, or a string containing an error
+     * @return array|float|int|string Factorial, or a string containing an error
      */
     public static function FACT($factVal)
     {
-        $factVal = Functions::flattenSingleValue($factVal);
-
-        if (is_numeric($factVal)) {
-            if ($factVal < 0) {
-                return Functions::NAN();
-            }
-            $factLoop = floor($factVal);
-            if ((Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) &&
-                ($factVal > $factLoop)) {
-                return Functions::NAN();
-            }
-
-            $factorial = 1;
-            while ($factLoop > 1) {
-                $factorial *= $factLoop--;
-            }
-
-            return $factorial;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Factorial::fact($factVal);
     }
 
     /**
@@ -345,31 +196,17 @@ class MathTrig
      * Excel Function:
      *        FACTDOUBLE(factVal)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the factDouble() method in the MathTrig\Factorial class instead
+     * @see MathTrig\Factorial::factDouble()
      *
-     * @param float $factVal Factorial Value
+     * @param array|float $factVal Factorial Value
      *
-     * @return int|string Double Factorial, or a string containing an error
+     * @return array|float|int|string Double Factorial, or a string containing an error
      */
     public static function FACTDOUBLE($factVal)
     {
-        $factLoop = Functions::flattenSingleValue($factVal);
-
-        if (is_numeric($factLoop)) {
-            $factLoop = floor($factLoop);
-            if ($factVal < 0) {
-                return Functions::NAN();
-            }
-            $factorial = 1;
-            while ($factLoop > 1) {
-                $factorial *= $factLoop--;
-                --$factLoop;
-            }
-
-            return $factorial;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Factorial::factDouble($factVal);
     }
 
     /**
@@ -380,43 +217,84 @@ class MathTrig
      * Excel Function:
      *        FLOOR(number[,significance])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.17.0
+     *      Use the floor() method in the MathTrig\Floor class instead
+     * @see MathTrig\Floor::floor()
      *
      * @param float $number Number to round
      * @param float $significance Significance
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
      */
     public static function FLOOR($number, $significance = null)
     {
-        $number = Functions::flattenSingleValue($number);
-        $significance = Functions::flattenSingleValue($significance);
-
-        if (($significance === null) &&
-            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
-            $significance = $number / abs($number);
-        }
-
-        if ((is_numeric($number)) && (is_numeric($significance))) {
-            if ($significance == 0.0) {
-                return Functions::DIV0();
-            } elseif ($number == 0.0) {
-                return 0.0;
-            } elseif (self::SIGN($significance) == 1) {
-                return floor($number / $significance) * $significance;
-            } elseif (self::SIGN($number) == -1 && self::SIGN($significance) == -1) {
-                return floor($number / $significance) * $significance;
-            }
-
-            return Functions::NAN();
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Floor::floor($number, $significance);
     }
 
-    private static function evaluateGCD($a, $b)
+    /**
+     * 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
+     *      Use the math() method in the MathTrig\Floor class instead
+     * @see MathTrig\Floor::math()
+     *
+     * @param float $number Number to round
+     * @param float $significance Significance
+     * @param int $mode direction to round negative numbers
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     */
+    public static function FLOORMATH($number, $significance = null, $mode = 0)
     {
-        return $b ? self::evaluateGCD($b, $a % $b) : $a;
+        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
+     *      Use the precise() method in the MathTrig\Floor class instead
+     * @see MathTrig\Floor::precise()
+     *
+     * @param float $number Number to round
+     * @param float $significance Significance
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     */
+    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
+     *      Use the evaluate() method in the MathTrig\IntClass class instead
+     * @see MathTrig\IntClass::evaluate()
+     *
+     * @param array|float $number Number to cast to an integer
+     *
+     * @return array|int|string Integer value, or a string containing an error
+     */
+    public static function INT($number)
+    {
+        return MathTrig\IntClass::evaluate($number);
     }
 
     /**
@@ -429,7 +307,9 @@ class MathTrig
      * Excel Function:
      *        GCD(number1[,number2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the evaluate() method in the MathTrig\Gcd class instead
+     * @see MathTrig\Gcd::evaluate()
      *
      * @param mixed ...$args Data values
      *
@@ -437,52 +317,7 @@ class MathTrig
      */
     public static function GCD(...$args)
     {
-        $args = Functions::flattenArray($args);
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $value) {
-            if (!is_numeric($value)) {
-                return Functions::VALUE();
-            } elseif ($value < 0) {
-                return Functions::NAN();
-            }
-        }
-
-        $gcd = (int) array_pop($args);
-        do {
-            $gcd = self::evaluateGCD($gcd, (int) array_pop($args));
-        } while (!empty($args));
-
-        return $gcd;
-    }
-
-    /**
-     * INT.
-     *
-     * Casts a floating point value to an integer
-     *
-     * Excel Function:
-     *        INT(number)
-     *
-     * @category Mathematical and Trigonometric Functions
-     *
-     * @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)
-    {
-        $number = Functions::flattenSingleValue($number);
-
-        if ($number === null) {
-            return 0;
-        } elseif (is_bool($number)) {
-            return (int) $number;
-        }
-        if (is_numeric($number)) {
-            return (int) floor($number);
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Gcd::evaluate(...$args);
     }
 
     /**
@@ -496,7 +331,9 @@ class MathTrig
      * Excel Function:
      *        LCM(number1[,number2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the evaluate() method in the MathTrig\Lcm class instead
+     * @see MathTrig\Lcm::evaluate()
      *
      * @param mixed ...$args Data values
      *
@@ -504,39 +341,7 @@ class MathTrig
      */
     public static function LCM(...$args)
     {
-        $returnValue = 1;
-        $allPoweredFactors = [];
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $value) {
-            if (!is_numeric($value)) {
-                return Functions::VALUE();
-            }
-            if ($value == 0) {
-                return 0;
-            } elseif ($value < 0) {
-                return Functions::NAN();
-            }
-            $myFactors = self::factors(floor($value));
-            $myCountedFactors = array_count_values($myFactors);
-            $myPoweredFactors = [];
-            foreach ($myCountedFactors as $myCountedFactor => $myCountedPower) {
-                $myPoweredFactors[$myCountedFactor] = pow($myCountedFactor, $myCountedPower);
-            }
-            foreach ($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
-                if (isset($allPoweredFactors[$myPoweredValue])) {
-                    if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
-                        $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-                    }
-                } else {
-                    $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-                }
-            }
-        }
-        foreach ($allPoweredFactors as $allPoweredFactor) {
-            $returnValue *= (int) $allPoweredFactor;
-        }
-
-        return $returnValue;
+        return MathTrig\Lcm::evaluate(...$args);
     }
 
     /**
@@ -547,26 +352,18 @@ class MathTrig
      * Excel Function:
      *        LOG(number[,base])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the withBase() method in the MathTrig\Logarithms class instead
+     * @see MathTrig\Logarithms::withBase()
      *
      * @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
+     * @return array|float|string The result, or a string containing an error
      */
-    public static function logBase($number = null, $base = 10)
+    public static function logBase($number, $base = 10)
     {
-        $number = Functions::flattenSingleValue($number);
-        $base = ($base === null) ? 10 : (float) Functions::flattenSingleValue($base);
-
-        if ((!is_numeric($base)) || (!is_numeric($number))) {
-            return Functions::VALUE();
-        }
-        if (($base <= 0) || ($number <= 0)) {
-            return Functions::NAN();
-        }
-
-        return log($number, $base);
+        return MathTrig\Logarithms::withBase($number, $base);
     }
 
     /**
@@ -577,7 +374,9 @@ class MathTrig
      * Excel Function:
      *        MDETERM(array)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the determinant() method in the MathTrig\MatrixFunctions class instead
+     * @see MathTrig\MatrixFunctions::determinant()
      *
      * @param array $matrixValues A matrix of values
      *
@@ -585,40 +384,7 @@ class MathTrig
      */
     public static function MDETERM($matrixValues)
     {
-        $matrixData = [];
-        if (!is_array($matrixValues)) {
-            $matrixValues = [[$matrixValues]];
-        }
-
-        $row = $maxColumn = 0;
-        foreach ($matrixValues as $matrixRow) {
-            if (!is_array($matrixRow)) {
-                $matrixRow = [$matrixRow];
-            }
-            $column = 0;
-            foreach ($matrixRow as $matrixCell) {
-                if ((is_string($matrixCell)) || ($matrixCell === null)) {
-                    return Functions::VALUE();
-                }
-                $matrixData[$row][$column] = $matrixCell;
-                ++$column;
-            }
-            if ($column > $maxColumn) {
-                $maxColumn = $column;
-            }
-            ++$row;
-        }
-
-        $matrix = new Matrix($matrixData);
-        if (!$matrix->isSquare()) {
-            return Functions::VALUE();
-        }
-
-        try {
-            return $matrix->determinant();
-        } catch (MatrixException $ex) {
-            return Functions::VALUE();
-        }
+        return MathTrig\MatrixFunctions::determinant($matrixValues);
     }
 
     /**
@@ -629,7 +395,9 @@ class MathTrig
      * Excel Function:
      *        MINVERSE(array)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the MathTrig\MatrixFunctions class instead
+     * @see MathTrig\MatrixFunctions::inverse()
      *
      * @param array $matrixValues A matrix of values
      *
@@ -637,49 +405,16 @@ class MathTrig
      */
     public static function MINVERSE($matrixValues)
     {
-        $matrixData = [];
-        if (!is_array($matrixValues)) {
-            $matrixValues = [[$matrixValues]];
-        }
-
-        $row = $maxColumn = 0;
-        foreach ($matrixValues as $matrixRow) {
-            if (!is_array($matrixRow)) {
-                $matrixRow = [$matrixRow];
-            }
-            $column = 0;
-            foreach ($matrixRow as $matrixCell) {
-                if ((is_string($matrixCell)) || ($matrixCell === null)) {
-                    return Functions::VALUE();
-                }
-                $matrixData[$row][$column] = $matrixCell;
-                ++$column;
-            }
-            if ($column > $maxColumn) {
-                $maxColumn = $column;
-            }
-            ++$row;
-        }
-
-        $matrix = new Matrix($matrixData);
-        if (!$matrix->isSquare()) {
-            return Functions::VALUE();
-        }
-
-        if ($matrix->determinant() == 0.0) {
-            return Functions::NAN();
-        }
-
-        try {
-            return $matrix->inverse()->toArray();
-        } catch (MatrixException $ex) {
-            return Functions::VALUE();
-        }
+        return MathTrig\MatrixFunctions::inverse($matrixValues);
     }
 
     /**
      * MMULT.
      *
+     * @deprecated 1.18.0
+     *      Use the multiply() method in the MathTrig\MatrixFunctions class instead
+     * @see MathTrig\MatrixFunctions::multiply()
+     *
      * @param array $matrixData1 A matrix of values
      * @param array $matrixData2 A matrix of values
      *
@@ -687,80 +422,24 @@ class MathTrig
      */
     public static function MMULT($matrixData1, $matrixData2)
     {
-        $matrixAData = $matrixBData = [];
-        if (!is_array($matrixData1)) {
-            $matrixData1 = [[$matrixData1]];
-        }
-        if (!is_array($matrixData2)) {
-            $matrixData2 = [[$matrixData2]];
-        }
-
-        try {
-            $rowA = 0;
-            foreach ($matrixData1 as $matrixRow) {
-                if (!is_array($matrixRow)) {
-                    $matrixRow = [$matrixRow];
-                }
-                $columnA = 0;
-                foreach ($matrixRow as $matrixCell) {
-                    if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
-                        return Functions::VALUE();
-                    }
-                    $matrixAData[$rowA][$columnA] = $matrixCell;
-                    ++$columnA;
-                }
-                ++$rowA;
-            }
-            $matrixA = new Matrix($matrixAData);
-            $rowB = 0;
-            foreach ($matrixData2 as $matrixRow) {
-                if (!is_array($matrixRow)) {
-                    $matrixRow = [$matrixRow];
-                }
-                $columnB = 0;
-                foreach ($matrixRow as $matrixCell) {
-                    if ((!is_numeric($matrixCell)) || ($matrixCell === null)) {
-                        return Functions::VALUE();
-                    }
-                    $matrixBData[$rowB][$columnB] = $matrixCell;
-                    ++$columnB;
-                }
-                ++$rowB;
-            }
-            $matrixB = new Matrix($matrixBData);
-
-            if ($columnA != $rowB) {
-                return Functions::VALUE();
-            }
-
-            return $matrixA->multiply($matrixB)->toArray();
-        } catch (MatrixException $ex) {
-            return Functions::VALUE();
-        }
+        return MathTrig\MatrixFunctions::multiply($matrixData1, $matrixData2);
     }
 
     /**
      * MOD.
      *
+     * @deprecated 1.18.0
+     *      Use the mod() method in the MathTrig\Operations class instead
+     * @see MathTrig\Operations::mod()
+     *
      * @param int $a Dividend
      * @param int $b Divisor
      *
-     * @return int|string Remainder, or a string containing an error
+     * @return array|float|int|string Remainder, or a string containing an error
      */
     public static function MOD($a = 1, $b = 1)
     {
-        $a = (float) Functions::flattenSingleValue($a);
-        $b = (float) Functions::flattenSingleValue($b);
-
-        if ($b == 0.0) {
-            return Functions::DIV0();
-        } elseif (($a < 0.0) && ($b > 0.0)) {
-            return $b - fmod(abs($a), $b);
-        } elseif (($a > 0.0) && ($b < 0.0)) {
-            return $b + fmod($a, abs($b));
-        }
-
-        return fmod($a, $b);
+        return MathTrig\Operations::mod($a, $b);
     }
 
     /**
@@ -768,30 +447,18 @@ class MathTrig
      *
      * Rounds a number to the nearest multiple of a specified value
      *
-     * @param float $number Number to round
-     * @param int $multiple Multiple to which you want to round $number
+     * @deprecated 1.17.0
+     *      Use the multiple() method in the MathTrig\Mround class instead
+     * @see MathTrig\Round::multiple()
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @param float $number Number to round
+     * @param array|int $multiple Multiple to which you want to round $number
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
      */
     public static function MROUND($number, $multiple)
     {
-        $number = Functions::flattenSingleValue($number);
-        $multiple = Functions::flattenSingleValue($multiple);
-
-        if ((is_numeric($number)) && (is_numeric($multiple))) {
-            if ($multiple == 0) {
-                return 0;
-            }
-            if ((self::SIGN($number)) == (self::SIGN($multiple))) {
-                $multiplier = 1 / $multiple;
-
-                return round($number * $multiplier) / $multiplier;
-            }
-
-            return Functions::NAN();
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Round::multiple($number, $multiple);
     }
 
     /**
@@ -799,36 +466,17 @@ class MathTrig
      *
      * Returns the ratio of the factorial of a sum of values to the product of factorials.
      *
-     * @param array of mixed Data Series
+     * @deprecated 1.18.0
+     *      Use the multinomial method in the MathTrig\Factorial class instead
+     * @see MathTrig\Factorial::multinomial()
+     *
+     * @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)
     {
-        $summer = 0;
-        $divisor = 1;
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $arg) {
-            // Is it a numeric value?
-            if (is_numeric($arg)) {
-                if ($arg < 1) {
-                    return Functions::NAN();
-                }
-                $summer += floor($arg);
-                $divisor *= self::FACT($arg);
-            } else {
-                return Functions::VALUE();
-            }
-        }
-
-        // Return
-        if ($summer > 0) {
-            $summer = self::FACT($summer);
-
-            return $summer / $divisor;
-        }
-
-        return 0;
+        return MathTrig\Factorial::multinomial(...$args);
     }
 
     /**
@@ -836,33 +484,17 @@ class MathTrig
      *
      * Returns number rounded up to the nearest odd integer.
      *
-     * @param float $number Number to round
+     * @deprecated 1.18.0
+     *      Use the odd method in the MathTrig\Round class instead
+     * @see MathTrig\Round::odd()
      *
-     * @return int|string Rounded Number, or a string containing an error
+     * @param array|float $number Number to round
+     *
+     * @return array|float|int|string Rounded Number, or a string containing an error
      */
     public static function ODD($number)
     {
-        $number = Functions::flattenSingleValue($number);
-
-        if ($number === null) {
-            return 1;
-        } elseif (is_bool($number)) {
-            return 1;
-        } elseif (is_numeric($number)) {
-            $significance = self::SIGN($number);
-            if ($significance == 0) {
-                return 1;
-            }
-
-            $result = self::CEILING($number, $significance);
-            if ($result == self::EVEN($result)) {
-                $result += $significance;
-            }
-
-            return (int) $result;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Round::odd($number);
     }
 
     /**
@@ -870,27 +502,18 @@ class MathTrig
      *
      * Computes x raised to the power y.
      *
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\Power class instead
+     * @see MathTrig\Operations::power()
+     *
      * @param float $x
      * @param float $y
      *
-     * @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 POWER($x = 0, $y = 2)
     {
-        $x = Functions::flattenSingleValue($x);
-        $y = Functions::flattenSingleValue($y);
-
-        // Validate parameters
-        if ($x == 0.0 && $y == 0.0) {
-            return Functions::NAN();
-        } elseif ($x == 0.0 && $y < 0.0) {
-            return Functions::DIV0();
-        }
-
-        // Return
-        $result = pow($x, $y);
-
-        return (!is_nan($result) && !is_infinite($result)) ? $result : Functions::NAN();
+        return MathTrig\Operations::power($x, $y);
     }
 
     /**
@@ -898,38 +521,20 @@ class MathTrig
      *
      * PRODUCT returns the product of all the values and cells referenced in the argument list.
      *
+     * @deprecated 1.18.0
+     *      Use the product method in the MathTrig\Operations class instead
+     * @see MathTrig\Operations::product()
+     *
      * Excel Function:
      *        PRODUCT(value1[,value2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
-     *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string
      */
     public static function PRODUCT(...$args)
     {
-        // Return value
-        $returnValue = null;
-
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                if ($returnValue === null) {
-                    $returnValue = $arg;
-                } else {
-                    $returnValue *= $arg;
-                }
-            }
-        }
-
-        // Return
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return MathTrig\Operations::product(...$args);
     }
 
     /**
@@ -938,90 +543,57 @@ class MathTrig
      * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
      *        and denominator is the divisor.
      *
+     * @deprecated 1.18.0
+     *      Use the quotient method in the MathTrig\Operations class instead
+     * @see MathTrig\Operations::quotient()
+     *
      * Excel Function:
      *        QUOTIENT(value1[,value2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @param mixed $numerator
+     * @param mixed $denominator
      *
-     * @param mixed ...$args Data values
-     *
-     * @return float
+     * @return array|int|string
      */
-    public static function QUOTIENT(...$args)
+    public static function QUOTIENT($numerator, $denominator)
     {
-        // Return value
-        $returnValue = null;
-
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                if ($returnValue === null) {
-                    $returnValue = ($arg == 0) ? 0 : $arg;
-                } else {
-                    if (($returnValue == 0) || ($arg == 0)) {
-                        $returnValue = 0;
-                    } else {
-                        $returnValue /= $arg;
-                    }
-                }
-            }
-        }
-
-        // Return
-        return (int) $returnValue;
+        return MathTrig\Operations::quotient($numerator, $denominator);
     }
 
     /**
-     * RAND.
+     * RAND/RANDBETWEEN.
+     *
+     * @deprecated 1.18.0
+     *      Use the randBetween or randBetween method in the MathTrig\Random class instead
+     * @see MathTrig\Random::randBetween()
      *
      * @param int $min Minimal value
      * @param int $max Maximal value
      *
-     * @return int Random number
+     * @return array|float|int|string Random number
      */
     public static function RAND($min = 0, $max = 0)
     {
-        $min = Functions::flattenSingleValue($min);
-        $max = Functions::flattenSingleValue($max);
-
-        if ($min == 0 && $max == 0) {
-            return (mt_rand(0, 10000000)) / 10000000;
-        }
-
-        return mt_rand($min, $max);
+        return MathTrig\Random::randBetween($min, $max);
     }
 
+    /**
+     * ROMAN.
+     *
+     * Converts a number to Roman numeral
+     *
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the MathTrig\Roman class instead
+     * @see MathTrig\Roman::evaluate()
+     *
+     * @param mixed $aValue Number to convert
+     * @param mixed $style Number indicating one of five possible forms
+     *
+     * @return array|string Roman numeral, or a string containing an error
+     */
     public static function ROMAN($aValue, $style = 0)
     {
-        $aValue = Functions::flattenSingleValue($aValue);
-        $style = ($style === null) ? 0 : (int) Functions::flattenSingleValue($style);
-        if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
-            return Functions::VALUE();
-        }
-        $aValue = (int) $aValue;
-        if ($aValue == 0) {
-            return '';
-        }
-
-        $mill = ['', 'M', 'MM', 'MMM', 'MMMM', 'MMMMM'];
-        $cent = ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM'];
-        $tens = ['', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'];
-        $ones = ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'];
-
-        $roman = '';
-        while ($aValue > 5999) {
-            $roman .= 'M';
-            $aValue -= 1000;
-        }
-        $m = self::romanCut($aValue, 1000);
-        $aValue %= 1000;
-        $c = self::romanCut($aValue, 100);
-        $aValue %= 100;
-        $t = self::romanCut($aValue, 10);
-        $aValue %= 10;
-
-        return $roman . $mill[$m] . $cent[$c] . $tens[$t] . $ones[$aValue];
+        return MathTrig\Roman::evaluate($aValue, $style);
     }
 
     /**
@@ -1029,26 +601,18 @@ class MathTrig
      *
      * 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
+     * @deprecated 1.17.0
+     *      Use the up() method in the MathTrig\Round class instead
+     * @see MathTrig\Round::up()
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @param array|float $number Number to round
+     * @param array|int $digits Number of digits to which you want to round $number
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
      */
     public static function ROUNDUP($number, $digits)
     {
-        $number = Functions::flattenSingleValue($number);
-        $digits = Functions::flattenSingleValue($digits);
-
-        if ((is_numeric($number)) && (is_numeric($digits))) {
-            $significance = pow(10, (int) $digits);
-            if ($number < 0.0) {
-                return floor($number * $significance) / $significance;
-            }
-
-            return ceil($number * $significance) / $significance;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Round::up($number, $digits);
     }
 
     /**
@@ -1056,26 +620,18 @@ class MathTrig
      *
      * 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
+     * @deprecated 1.17.0
+     *      Use the down() method in the MathTrig\Round class instead
+     * @see MathTrig\Round::down()
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @param array|float $number Number to round
+     * @param array|int $digits Number of digits to which you want to round $number
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
      */
     public static function ROUNDDOWN($number, $digits)
     {
-        $number = Functions::flattenSingleValue($number);
-        $digits = Functions::flattenSingleValue($digits);
-
-        if ((is_numeric($number)) && (is_numeric($digits))) {
-            $significance = pow(10, (int) $digits);
-            if ($number < 0.0) {
-                return ceil($number * $significance) / $significance;
-            }
-
-            return floor($number * $significance) / $significance;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Round::down($number, $digits);
     }
 
     /**
@@ -1083,40 +639,20 @@ class MathTrig
      *
      * Returns the sum of a power series
      *
-     * @param float $x Input value to the power series
-     * @param float $n Initial power to which you want to raise $x
-     * @param float $m Step by which to increase $n for each term in the series
-     * @param array of mixed Data Series
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\SeriesSum class instead
+     * @see MathTrig\SeriesSum::evaluate()
      *
-     * @return float|string The result, or a string containing an error
+     * @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 array|float|string The result, or a string containing an error
      */
-    public static function SERIESSUM(...$args)
+    public static function SERIESSUM($x, $n, $m, ...$args)
     {
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-
-        $x = array_shift($aArgs);
-        $n = array_shift($aArgs);
-        $m = array_shift($aArgs);
-
-        if ((is_numeric($x)) && (is_numeric($n)) && (is_numeric($m))) {
-            // Calculate
-            $i = 0;
-            foreach ($aArgs as $arg) {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $returnValue += $arg * pow($x, $n + ($m * $i++));
-                } else {
-                    return Functions::VALUE();
-                }
-            }
-
-            return $returnValue;
-        }
-
-        return Functions::VALUE();
+        return MathTrig\SeriesSum::evaluate($x, $n, $m, ...$args);
     }
 
     /**
@@ -1125,26 +661,29 @@ class MathTrig
      * 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
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\Sign class instead
+     * @see MathTrig\Sign::evaluate()
      *
-     * @return int|string sign value, or a string containing an error
+     * @param array|float $number Number to round
+     *
+     * @return array|int|string sign value, or a string containing an error
      */
     public static function SIGN($number)
     {
-        $number = Functions::flattenSingleValue($number);
+        return MathTrig\Sign::evaluate($number);
+    }
 
-        if (is_bool($number)) {
-            return (int) $number;
-        }
-        if (is_numeric($number)) {
-            if ($number == 0.0) {
-                return 0;
-            }
-
-            return $number / abs($number);
-        }
-
-        return Functions::VALUE();
+    /**
+     * returnSign = returns 0/-1/+1.
+     *
+     * @deprecated 1.18.0
+     *      Use the returnSign method in the MathTrig\Helpers class instead
+     * @see MathTrig\Helpers::returnSign()
+     */
+    public static function returnSign(float $number): int
+    {
+        return MathTrig\Helpers::returnSign($number);
     }
 
     /**
@@ -1152,57 +691,17 @@ class MathTrig
      *
      * Returns the square root of (number * pi).
      *
-     * @param float $number Number
+     * @deprecated 1.18.0
+     *      Use the pi method in the MathTrig\Sqrt class instead
+     * @see MathTrig\Sqrt::sqrt()
      *
-     * @return float|string Square Root of Number * Pi, or a string containing an error
+     * @param array|float $number Number
+     *
+     * @return array|float|string Square Root of Number * Pi, or a string containing an error
      */
     public static function SQRTPI($number)
     {
-        $number = Functions::flattenSingleValue($number);
-
-        if (is_numeric($number)) {
-            if ($number < 0) {
-                return Functions::NAN();
-            }
-
-            return sqrt($number * M_PI);
-        }
-
-        return Functions::VALUE();
-    }
-
-    protected static function filterHiddenArgs($cellReference, $args)
-    {
-        return array_filter(
-            $args,
-            function ($index) use ($cellReference) {
-                [, $row, $column] = explode('.', $index);
-
-                return $cellReference->getWorksheet()->getRowDimension($row)->getVisible() &&
-                    $cellReference->getWorksheet()->getColumnDimension($column)->getVisible();
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-    }
-
-    protected static function filterFormulaArgs($cellReference, $args)
-    {
-        return array_filter(
-            $args,
-            function ($index) use ($cellReference) {
-                [, $row, $column] = explode('.', $index);
-                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());
-
-                    return !$isFormula || $cellFormula;
-                }
-
-                return true;
-            },
-            ARRAY_FILTER_USE_KEY
-        );
+        return MathTrig\Sqrt::pi($number);
     }
 
     /**
@@ -1210,57 +709,24 @@ class MathTrig
      *
      * Returns a subtotal in a list or database.
      *
-     * @param int the number 1 to 11 that specifies which function to
+     * @deprecated 1.18.0
+     *      Use the evaluate method in the MathTrig\Subtotal class instead
+     * @see MathTrig\Subtotal::evaluate()
+     *
+     * @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 array of mixed Data Series
+     * @param mixed[] $args A mixed data series of values
      *
      * @return float|string
      */
-    public static function SUBTOTAL(...$args)
+    public static function SUBTOTAL($functionType, ...$args)
     {
-        $cellReference = array_pop($args);
-        $aArgs = Functions::flattenArrayIndexed($args);
-        $subtotal = array_shift($aArgs);
-
-        // Calculate
-        if ((is_numeric($subtotal)) && (!is_string($subtotal))) {
-            if ($subtotal > 100) {
-                $aArgs = self::filterHiddenArgs($cellReference, $aArgs);
-                $subtotal -= 100;
-            }
-
-            $aArgs = self::filterFormulaArgs($cellReference, $aArgs);
-            switch ($subtotal) {
-                case 1:
-                    return Statistical::AVERAGE($aArgs);
-                case 2:
-                    return Statistical::COUNT($aArgs);
-                case 3:
-                    return Statistical::COUNTA($aArgs);
-                case 4:
-                    return Statistical::MAX($aArgs);
-                case 5:
-                    return Statistical::MIN($aArgs);
-                case 6:
-                    return self::PRODUCT($aArgs);
-                case 7:
-                    return Statistical::STDEV($aArgs);
-                case 8:
-                    return Statistical::STDEVP($aArgs);
-                case 9:
-                    return self::SUM($aArgs);
-                case 10:
-                    return Statistical::VARFunc($aArgs);
-                case 11:
-                    return Statistical::VARP($aArgs);
-            }
-        }
-
-        return Functions::VALUE();
+        return MathTrig\Subtotal::evaluate($functionType, ...$args);
     }
 
     /**
@@ -1268,134 +734,64 @@ class MathTrig
      *
      * SUM computes the sum of all the values and cells referenced in the argument list.
      *
+     * @deprecated 1.18.0
+     *      Use the sumErroringStrings method in the MathTrig\Sum class instead
+     * @see MathTrig\Sum::sumErroringStrings()
+     *
      * Excel Function:
      *        SUM(value1[,value2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
-     *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string
      */
     public static function SUM(...$args)
     {
-        $returnValue = 0;
-
-        // Loop through the arguments
-        foreach (Functions::flattenArray($args) as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $returnValue += $arg;
-            }
-        }
-
-        return $returnValue;
+        return MathTrig\Sum::sumIgnoringStrings(...$args);
     }
 
     /**
      * SUMIF.
      *
-     * Counts the number of cells that contain numbers within the list of arguments
+     * Totals the values of cells that contain numbers within the list of arguments
      *
      * Excel Function:
-     *        SUMIF(value1[,value2[, ...]],condition)
+     *        SUMIF(range, criteria, [sum_range])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.17.0
+     *      Use the SUMIF() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::SUMIF()
      *
-     * @param mixed $aArgs Data values
-     * @param string $condition the criteria that defines which cells will be summed
-     * @param mixed $sumArgs
+     * @param mixed $range Data values
+     * @param string $criteria the criteria that defines which cells will be summed
+     * @param mixed $sumRange
      *
-     * @return float
+     * @return null|float|string
      */
-    public static function SUMIF($aArgs, $condition, $sumArgs = [])
+    public static function SUMIF($range, $criteria, $sumRange = [])
     {
-        $returnValue = 0;
-
-        $aArgs = Functions::flattenArray($aArgs);
-        $sumArgs = Functions::flattenArray($sumArgs);
-        if (empty($sumArgs)) {
-            $sumArgs = $aArgs;
-        }
-        $condition = Functions::ifCondition($condition);
-        // Loop through arguments
-        foreach ($aArgs as $key => $arg) {
-            if (!is_numeric($arg)) {
-                $arg = str_replace('"', '""', $arg);
-                $arg = Calculation::wrapResult(strtoupper($arg));
-            }
-
-            $testCondition = '=' . $arg . $condition;
-            $sumValue = array_key_exists($key, $sumArgs) ? $sumArgs[$key] : 0;
-
-            if (is_numeric($sumValue) &&
-                Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                // Is it a value within our criteria and only numeric can be added to the result
-                $returnValue += $sumValue;
-            }
-        }
-
-        return $returnValue;
+        return Statistical\Conditional::SUMIF($range, $criteria, $sumRange);
     }
 
     /**
      * SUMIFS.
      *
-     *    Counts the number of cells that contain numbers within the list of arguments
+     *    Totals the values of cells that contain numbers within the list of arguments
      *
      *    Excel Function:
-     *        SUMIFS(value1[,value2[, ...]],condition)
+     *        SUMIFS(sum_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
      *
-     *    @category Mathematical and Trigonometric Functions
+     * @deprecated 1.17.0
+     *      Use the SUMIFS() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::SUMIFS()
      *
      * @param mixed $args Data values
-     * @param string $condition the criteria that defines which cells will be summed
      *
-     * @return float
+     * @return null|float|string
      */
     public static function SUMIFS(...$args)
     {
-        $arrayList = $args;
-
-        // Return value
-        $returnValue = 0;
-
-        $sumArgs = Functions::flattenArray(array_shift($arrayList));
-        $aArgsArray = [];
-        $conditions = [];
-
-        while (count($arrayList) > 0) {
-            $aArgsArray[] = Functions::flattenArray(array_shift($arrayList));
-            $conditions[] = Functions::ifCondition(array_shift($arrayList));
-        }
-
-        // Loop through each sum and see if arguments and conditions are true
-        foreach ($sumArgs as $index => $value) {
-            $valid = true;
-
-            foreach ($conditions as $cidx => $condition) {
-                $arg = $aArgsArray[$cidx][$index];
-
-                // Loop through arguments
-                if (!is_numeric($arg)) {
-                    $arg = Calculation::wrapResult(strtoupper($arg));
-                }
-                $testCondition = '=' . $arg . $condition;
-                if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                    // Is not a value within our criteria
-                    $valid = false;
-
-                    break; // if false found, don't need to check other conditions
-                }
-            }
-
-            if ($valid) {
-                $returnValue += $value;
-            }
-        }
-
-        // Return
-        return $returnValue;
+        return Statistical\Conditional::SUMIFS(...$args);
     }
 
     /**
@@ -1404,7 +800,9 @@ class MathTrig
      * Excel Function:
      *        SUMPRODUCT(value1[,value2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.18.0
+     *      Use the product method in the MathTrig\Sum class instead
+     * @see MathTrig\Sum::product()
      *
      * @param mixed ...$args Data values
      *
@@ -1412,33 +810,7 @@ class MathTrig
      */
     public static function SUMPRODUCT(...$args)
     {
-        $arrayList = $args;
-
-        $wrkArray = Functions::flattenArray(array_shift($arrayList));
-        $wrkCellCount = count($wrkArray);
-
-        for ($i = 0; $i < $wrkCellCount; ++$i) {
-            if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
-                $wrkArray[$i] = 0;
-            }
-        }
-
-        foreach ($arrayList as $matrixData) {
-            $array2 = Functions::flattenArray($matrixData);
-            $count = count($array2);
-            if ($wrkCellCount != $count) {
-                return Functions::VALUE();
-            }
-
-            foreach ($array2 as $i => $val) {
-                if ((!is_numeric($val)) || (is_string($val))) {
-                    $val = 0;
-                }
-                $wrkArray[$i] *= $val;
-            }
-        }
-
-        return array_sum($wrkArray);
+        return MathTrig\Sum::product(...$args);
     }
 
     /**
@@ -1446,103 +818,71 @@ class MathTrig
      *
      * SUMSQ returns the sum of the squares of the arguments
      *
+     * @deprecated 1.18.0
+     *      Use the sumSquare method in the MathTrig\SumSquares class instead
+     * @see MathTrig\SumSquares::sumSquare()
+     *
      * Excel Function:
      *        SUMSQ(value1[,value2[, ...]])
      *
-     * @category Mathematical and Trigonometric Functions
-     *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string
      */
     public static function SUMSQ(...$args)
     {
-        $returnValue = 0;
-
-        // Loop through arguments
-        foreach (Functions::flattenArray($args) as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $returnValue += ($arg * $arg);
-            }
-        }
-
-        return $returnValue;
+        return MathTrig\SumSquares::sumSquare(...$args);
     }
 
     /**
      * SUMX2MY2.
      *
+     * @deprecated 1.18.0
+     *     Use the sumXSquaredMinusYSquared method in the MathTrig\SumSquares class instead
+     * @see MathTrig\SumSquares::sumXSquaredMinusYSquared()
+     *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
      *
-     * @return float
+     * @return float|string
      */
     public static function SUMX2MY2($matrixData1, $matrixData2)
     {
-        $array1 = Functions::flattenArray($matrixData1);
-        $array2 = Functions::flattenArray($matrixData2);
-        $count = min(count($array1), count($array2));
-
-        $result = 0;
-        for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-                $result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
-            }
-        }
-
-        return $result;
+        return MathTrig\SumSquares::sumXSquaredMinusYSquared($matrixData1, $matrixData2);
     }
 
     /**
      * SUMX2PY2.
      *
+     * @deprecated 1.18.0
+     *     Use the sumXSquaredPlusYSquared method in the MathTrig\SumSquares class instead
+     * @see MathTrig\SumSquares::sumXSquaredPlusYSquared()
+     *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
      *
-     * @return float
+     * @return float|string
      */
     public static function SUMX2PY2($matrixData1, $matrixData2)
     {
-        $array1 = Functions::flattenArray($matrixData1);
-        $array2 = Functions::flattenArray($matrixData2);
-        $count = min(count($array1), count($array2));
-
-        $result = 0;
-        for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-                $result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
-            }
-        }
-
-        return $result;
+        return MathTrig\SumSquares::sumXSquaredPlusYSquared($matrixData1, $matrixData2);
     }
 
     /**
      * SUMXMY2.
      *
+     * @deprecated 1.18.0
+     *      Use the sumXMinusYSquared method in the MathTrig\SumSquares class instead
+     * @see MathTrig\SumSquares::sumXMinusYSquared()
+     *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
      *
-     * @return float
+     * @return float|string
      */
     public static function SUMXMY2($matrixData1, $matrixData2)
     {
-        $array1 = Functions::flattenArray($matrixData1);
-        $array2 = Functions::flattenArray($matrixData2);
-        $count = min(count($array1), count($array2));
-
-        $result = 0;
-        for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-                $result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
-            }
-        }
-
-        return $result;
+        return MathTrig\SumSquares::sumXMinusYSquared($matrixData1, $matrixData2);
     }
 
     /**
@@ -1550,30 +890,18 @@ class MathTrig
      *
      * Truncates value to the number of fractional digits by number_digits.
      *
+     * @deprecated 1.17.0
+     *      Use the evaluate() method in the MathTrig\Trunc class instead
+     * @see MathTrig\Trunc::evaluate()
+     *
      * @param float $value
      * @param int $digits
      *
-     * @return float|string Truncated value, or a string containing an error
+     * @return array|float|string Truncated value, or a string containing an error
      */
     public static function TRUNC($value = 0, $digits = 0)
     {
-        $value = Functions::flattenSingleValue($value);
-        $digits = Functions::flattenSingleValue($digits);
-
-        // Validate parameters
-        if ((!is_numeric($value)) || (!is_numeric($digits))) {
-            return Functions::VALUE();
-        }
-        $digits = floor($digits);
-
-        // Truncate
-        $adjust = pow(10, $digits);
-
-        if (($digits > 0) && (rtrim((int) ((abs($value) - abs((int) $value)) * $adjust), '0') < $adjust / 10)) {
-            return $value;
-        }
-
-        return ((int) ($value * $adjust)) / $adjust;
+        return MathTrig\Trunc::evaluate($value, $digits);
     }
 
     /**
@@ -1581,21 +909,17 @@ class MathTrig
      *
      * Returns the secant of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the sec method in the MathTrig\Trig\Secant class instead
+     * @see MathTrig\Trig\Secant::sec()
      *
-     * @return float|string The secant of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The secant of the angle
      */
     public static function SEC($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = cos($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Secant::sec($angle);
     }
 
     /**
@@ -1603,21 +927,17 @@ class MathTrig
      *
      * Returns the hyperbolic secant of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the sech method in the MathTrig\Trig\Secant class instead
+     * @see MathTrig\Trig\Secant::sech()
      *
-     * @return float|string The hyperbolic secant of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The hyperbolic secant of the angle
      */
     public static function SECH($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = cosh($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Secant::sech($angle);
     }
 
     /**
@@ -1625,21 +945,17 @@ class MathTrig
      *
      * Returns the cosecant of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the csc method in the MathTrig\Trig\Cosecant class instead
+     * @see MathTrig\Trig\Cosecant::csc()
      *
-     * @return float|string The cosecant of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The cosecant of the angle
      */
     public static function CSC($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = sin($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Cosecant::csc($angle);
     }
 
     /**
@@ -1647,21 +963,17 @@ class MathTrig
      *
      * Returns the hyperbolic cosecant of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the csch method in the MathTrig\Trig\Cosecant class instead
+     * @see MathTrig\Trig\Cosecant::csch()
      *
-     * @return float|string The hyperbolic cosecant of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The hyperbolic cosecant of the angle
      */
     public static function CSCH($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = sinh($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Cosecant::csch($angle);
     }
 
     /**
@@ -1669,21 +981,17 @@ class MathTrig
      *
      * Returns the cotangent of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the cot method in the MathTrig\Trig\Cotangent class instead
+     * @see MathTrig\Trig\Cotangent::cot()
      *
-     * @return float|string The cotangent of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The cotangent of the angle
      */
     public static function COT($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = tan($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Cotangent::cot($angle);
     }
 
     /**
@@ -1691,21 +999,17 @@ class MathTrig
      *
      * Returns the hyperbolic cotangent of an angle.
      *
-     * @param float $angle Number
+     * @deprecated 1.18.0
+     *      Use the coth method in the MathTrig\Trig\Cotangent class instead
+     * @see MathTrig\Trig\Cotangent::coth()
      *
-     * @return float|string The hyperbolic cotangent of the angle
+     * @param array|float $angle Number
+     *
+     * @return array|float|string The hyperbolic cotangent of the angle
      */
     public static function COTH($angle)
     {
-        $angle = Functions::flattenSingleValue($angle);
-
-        if (!is_numeric($angle)) {
-            return Functions::VALUE();
-        }
-
-        $result = tanh($angle);
-
-        return ($result == 0.0) ? Functions::DIV0() : 1 / $result;
+        return MathTrig\Trig\Cotangent::coth($angle);
     }
 
     /**
@@ -1713,19 +1017,33 @@ class MathTrig
      *
      * Returns the arccotangent of a number.
      *
-     * @param float $number Number
+     * @deprecated 1.18.0
+     *      Use the acot method in the MathTrig\Trig\Cotangent class instead
+     * @see MathTrig\Trig\Cotangent::acot()
      *
-     * @return float|string The arccotangent of the number
+     * @param array|float $number Number
+     *
+     * @return array|float|string The arccotangent of the number
      */
     public static function ACOT($number)
     {
-        $number = Functions::flattenSingleValue($number);
+        return MathTrig\Trig\Cotangent::acot($number);
+    }
 
-        if (!is_numeric($number)) {
-            return Functions::VALUE();
-        }
-
-        return (M_PI / 2) - atan($number);
+    /**
+     * Return NAN or value depending on argument.
+     *
+     * @deprecated 1.18.0
+     *      Use the numberOrNan method in the MathTrig\Helpers class instead
+     * @see MathTrig\Helpers::numberOrNan()
+     *
+     * @param float $result Number
+     *
+     * @return float|string
+     */
+    public static function numberOrNan($result)
+    {
+        return MathTrig\Helpers::numberOrNan($result);
     }
 
     /**
@@ -1733,20 +1051,396 @@ class MathTrig
      *
      * Returns the hyperbolic arccotangent of a number.
      *
-     * @param float $number Number
+     * @deprecated 1.18.0
+     *      Use the acoth method in the MathTrig\Trig\Cotangent class instead
+     * @see MathTrig\Trig\Cotangent::acoth()
      *
-     * @return float|string The hyperbolic arccotangent of the number
+     * @param array|float $number Number
+     *
+     * @return array|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
+     *      Use the round() method in the MathTrig\Round class instead
+     * @see MathTrig\Round::round()
+     *
+     * @param array|mixed $number Should be numeric
+     * @param array|mixed $precision Should be int
+     *
+     * @return array|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
+     *      Use the evaluate method in the MathTrig\Absolute class instead
+     * @see MathTrig\Absolute::evaluate()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|float|int|string Rounded number
+     */
+    public static function builtinABS($number)
+    {
+        return MathTrig\Absolute::evaluate($number);
+    }
+
+    /**
+     * ACOS.
+     *
+     * @deprecated 1.18.0
+     *      Use the acos method in the MathTrig\Trig\Cosine class instead
+     * @see MathTrig\Trig\Cosine::acos()
+     *
+     * Returns the result of builtin function acos after validating args.
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the acosh method in the MathTrig\Trig\Cosine class instead
+     * @see MathTrig\Trig\Cosine::acosh()
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the asin method in the MathTrig\Trig\Sine class instead
+     * @see MathTrig\Trig\Sine::asin()
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the asinh method in the MathTrig\Trig\Sine class instead
+     * @see MathTrig\Trig\Sine::asinh()
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the atan method in the MathTrig\Trig\Tangent class instead
+     * @see MathTrig\Trig\Tangent::atan()
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the atanh method in the MathTrig\Trig\Tangent class instead
+     * @see MathTrig\Trig\Tangent::atanh()
+     *
+     * @param array|float $number Should be numeric
+     *
+     * @return array|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
+     *      Use the cos method in the MathTrig\Trig\Cosine class instead
+     * @see MathTrig\Trig\Cosine::cos()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the cosh method in the MathTrig\Trig\Cosine class instead
+     * @see MathTrig\Trig\Cosine::cosh()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the toDegrees method in the MathTrig\Angle class instead
+     * @see MathTrig\Angle::toDegrees()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the evaluate method in the MathTrig\Exp class instead
+     * @see MathTrig\Exp::evaluate()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the natural method in the MathTrig\Logarithms class instead
+     * @see MathTrig\Logarithms::natural()
+     *
+     * @param mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the natural method in the MathTrig\Logarithms class instead
+     * @see MathTrig\Logarithms::base10()
+     *
+     * @param mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the toRadians method in the MathTrig\Angle class instead
+     * @see MathTrig\Angle::toRadians()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the sin method in the MathTrig\Trig\Sine class instead
+     * @see MathTrig\Trig\Sine::evaluate()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the sinh method in the MathTrig\Trig\Sine class instead
+     * @see MathTrig\Trig\Sine::sinh()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the sqrt method in the MathTrig\Sqrt class instead
+     * @see MathTrig\Sqrt::sqrt()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the tan method in the MathTrig\Trig\Tangent class instead
+     * @see MathTrig\Trig\Tangent::tan()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the tanh method in the MathTrig\Trig\Tangent class instead
+     * @see MathTrig\Trig\Tangent::tanh()
+     *
+     * @param array|mixed $number Should be numeric
+     *
+     * @return array|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
+     *      Use the validateNumericNullBool method in the MathTrig\Helpers class instead
+     * @see MathTrig\Helpers::validateNumericNullBool()
+     *
+     * @param mixed $number
+     */
+    public static function nullFalseTrueToNumber(&$number): void
     {
         $number = Functions::flattenSingleValue($number);
-
-        if (!is_numeric($number)) {
-            return Functions::VALUE();
+        if ($number === null) {
+            $number = 0;
+        } elseif (is_bool($number)) {
+            $number = (int) $number;
         }
-
-        $result = log(($number + 1) / ($number - 1)) / 2;
-
-        return is_nan($result) ? Functions::NAN() : $result;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
new file mode 100644
index 000000000..f21c6b73c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
@@ -0,0 +1,37 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return abs($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
new file mode 100644
index 000000000..cbeec6f40
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
@@ -0,0 +1,63 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return rad2deg($number);
+    }
+
+    /**
+     * RADIANS.
+     *
+     * Returns the result of builtin function deg2rad after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return deg2rad($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
new file mode 100644
index 000000000..ee4885057
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Arabic
+{
+    use ArrayEnabled;
+
+    private const ROMAN_LOOKUP = [
+        'M' => 1000,
+        'D' => 500,
+        'C' => 100,
+        'L' => 50,
+        'X' => 10,
+        'V' => 5,
+        'I' => 1,
+    ];
+
+    /**
+     * 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)
+    {
+        $numeral = array_shift($roman);
+        if (!isset(self::ROMAN_LOOKUP[$numeral])) {
+            throw new Exception('Invalid character detected');
+        }
+
+        $arabic = self::ROMAN_LOOKUP[$numeral];
+        if (count($roman) > 0 && isset(self::ROMAN_LOOKUP[$roman[0]]) && $arabic < self::ROMAN_LOOKUP[$roman[0]]) {
+            $subtract += $arabic;
+        } else {
+            $sum += ($arabic - $subtract);
+            $subtract = 0;
+        }
+
+        if (count($roman) > 0) {
+            self::calculateArabic($roman, $sum, $subtract);
+        }
+
+        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.
+     *
+     * Converts a Roman numeral to an Arabic numeral.
+     *
+     * Excel Function:
+     *        ARABIC(text)
+     *
+     * @param mixed $roman Should be a string, or can be an array of strings
+     *
+     * @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)
+    {
+        if (is_array($roman)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $roman);
+        }
+
+        // An empty string should return 0
+        $roman = substr(trim(strtoupper((string) $roman)), 0, 255);
+        if ($roman === '') {
+            return 0;
+        }
+
+        // Convert the roman numeral to an arabic number
+        $negativeNumber = $roman[0] === '-';
+        if ($negativeNumber) {
+            $roman = substr($roman, 1);
+        }
+
+        try {
+            $arabic = self::calculateArabic(self::strSplit($roman));
+        } catch (Exception $e) {
+            return ExcelError::VALUE(); // Invalid character detected
+        }
+
+        if ($negativeNumber) {
+            $arabic *= -1; // The number should be negative
+        }
+
+        return $arabic;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
new file mode 100644
index 000000000..2fec94732
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Base
+{
+    use ArrayEnabled;
+
+    /**
+     * BASE.
+     *
+     * Converts a number into a text representation with the given radix (base).
+     *
+     * Excel Function:
+     *        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 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)
+    {
+        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();
+        }
+
+        return self::calculate($number, $radix, $minLength);
+    }
+
+    /**
+     * @param mixed $minLength
+     */
+    private static function calculate(float $number, int $radix, $minLength): string
+    {
+        if ($minLength === null || is_numeric($minLength)) {
+            if ($number < 0 || $number >= 2 ** 53 || $radix < 2 || $radix > 36) {
+                return ExcelError::NAN(); // Numeric range constraints
+            }
+
+            $outcome = strtoupper((string) base_convert("$number", 10, $radix));
+            if ($minLength !== null) {
+                $outcome = str_pad($outcome, (int) $minLength, '0', STR_PAD_LEFT); // String padding
+            }
+
+            return $outcome;
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
new file mode 100644
index 000000000..635f1bbbb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
@@ -0,0 +1,167 @@
+<?php
+
+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.
+     *
+     * 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])
+     *
+     * @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 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();
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOk((float) $number, (float) $significance);
+    }
+
+    /**
+     * CEILING.MATH.
+     *
+     * Round a number down to the nearest integer or to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        CEILING.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 array|int $mode direction to round negative numbers
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        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);
+            $mode = Helpers::validateNumericNullSubstitution($mode, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (empty($significance * $number)) {
+            return 0.0;
+        }
+        if (self::ceilingMathTest((float) $significance, (float) $number, (int) $mode)) {
+            return floor($number / $significance) * $significance;
+        }
+
+        return ceil($number / $significance) * $significance;
+    }
+
+    /**
+     * CEILING.PRECISE.
+     *
+     * Rounds number up, away from zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        CEILING.PRECISE(number[,significance])
+     *
+     * @param mixed $number the number 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 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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (!$significance) {
+            return 0.0;
+        }
+        $result = $number / abs($significance);
+
+        return ceil($result) * $significance * (($significance < 0) ? -1 : 1);
+    }
+
+    /**
+     * Let CEILINGMATH complexity pass Scrutinizer.
+     */
+    private static function ceilingMathTest(float $significance, float $number, int $mode): bool
+    {
+        return ((float) $significance < 0) || ((float) $number < 0 && !empty($mode));
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     *
+     * @return float|string
+     */
+    private static function argumentsOk(float $number, float $significance)
+    {
+        if (empty($number * $significance)) {
+            return 0.0;
+        }
+        if (Helpers::returnSign($number) == Helpers::returnSign($significance)) {
+            return ceil($number / $significance) * $significance;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    private static function floorCheck1Arg(): void
+    {
+        $compatibility = Functions::getCompatibilityMode();
+        if ($compatibility === Functions::COMPATIBILITY_EXCEL) {
+            throw new Exception('Excel requires 2 arguments for CEILING');
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
new file mode 100644
index 000000000..f68c402ae
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Combinations
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+     *
+     * @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 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 withoutRepetition($numObjs, $numInSet)
+    {
+        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);
+            Helpers::validateNotNegative($numInSet);
+            Helpers::validateNotNegative($numObjs - $numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return round(Factorial::fact($numObjs) / Factorial::fact($numObjs - $numInSet)) / Factorial::fact($numInSet); // @phpstan-ignore-line
+    }
+
+    /**
+     * 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:
+     *        COMBINA(numObjs,numInSet)
+     *
+     * @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 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)
+    {
+        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);
+            Helpers::validateNotNegative($numInSet);
+            Helpers::validateNotNegative($numObjs);
+            $numObjs = (int) $numObjs;
+            $numInSet = (int) $numInSet;
+            // Microsoft documentation says following is true, but Excel
+            //  does not enforce this restriction.
+            //Helpers::validateNotNegative($numObjs - $numInSet);
+            if ($numObjs === 0) {
+                Helpers::validateNotNegative(-$numInSet);
+
+                return 1;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return round(
+            Factorial::fact($numObjs + $numInSet - 1) / Factorial::fact($numObjs - 1) // @phpstan-ignore-line
+        ) / Factorial::fact($numInSet);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
new file mode 100644
index 000000000..f65c2c18b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
@@ -0,0 +1,37 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return exp($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
new file mode 100644
index 000000000..8059eec8b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
@@ -0,0 +1,126 @@
+<?php
+
+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.
+     *
+     * Returns the factorial of a number.
+     * The factorial of a number is equal to 1*2*3*...* number.
+     *
+     * Excel Function:
+     *        FACT(factVal)
+     *
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
+        try {
+            $factVal = Helpers::validateNumericNullBool($factVal);
+            Helpers::validateNotNegative($factVal);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $factLoop = floor($factVal);
+        if ($factVal > $factLoop) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return Statistical\Distributions\Gamma::gammaValue($factVal + 1);
+            }
+        }
+
+        $factorial = 1;
+        while ($factLoop > 1) {
+            $factorial *= $factLoop--;
+        }
+
+        return $factorial;
+    }
+
+    /**
+     * FACTDOUBLE.
+     *
+     * Returns the double factorial of a number.
+     *
+     * Excel Function:
+     *        FACTDOUBLE(factVal)
+     *
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
+        try {
+            $factVal = Helpers::validateNumericNullSubstitution($factVal, 0);
+            Helpers::validateNotNegative($factVal);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $factLoop = floor($factVal);
+        $factorial = 1;
+        while ($factLoop > 1) {
+            $factorial *= $factLoop;
+            $factLoop -= 2;
+        }
+
+        return $factorial;
+    }
+
+    /**
+     * MULTINOMIAL.
+     *
+     * Returns the ratio of the factorial of a sum of values to the product of factorials.
+     *
+     * @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)
+    {
+        $summer = 0;
+        $divisor = 1;
+
+        try {
+            // Loop through arguments
+            foreach (Functions::flattenArray($args) as $argx) {
+                $arg = Helpers::validateNumericNullSubstitution($argx, null);
+                Helpers::validateNotNegative($arg);
+                $arg = (int) $arg;
+                $summer += $arg;
+                $divisor *= self::fact($arg);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $summer = self::fact($summer);
+
+        return is_numeric($summer) ? ($summer / $divisor) : ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
new file mode 100644
index 000000000..2199dda0c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
@@ -0,0 +1,195 @@
+<?php
+
+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();
+        if ($compatibility === Functions::COMPATIBILITY_EXCEL) {
+            throw new Exception('Excel requires 2 arguments for FLOOR');
+        }
+    }
+
+    /**
+     * FLOOR.
+     *
+     * Rounds number down, toward zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        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 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)
+    {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
+        if ($significance === null) {
+            self::floorCheck1Arg();
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOk((float) $number, (float) $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]])
+     *
+     * @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 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)
+    {
+        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);
+            $mode = Helpers::validateNumericNullSubstitution($mode, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argsOk((float) $number, (float) $significance, (int) $mode);
+    }
+
+    /**
+     * FLOOR.PRECISE.
+     *
+     * Rounds number down, toward zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        FLOOR.PRECISE(number[,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 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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOkPrecise((float) $number, (float) $significance);
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     *
+     * @return float|string
+     */
+    private static function argumentsOkPrecise(float $number, float $significance)
+    {
+        if ($significance == 0.0) {
+            return ExcelError::DIV0();
+        }
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        return floor($number / abs($significance)) * abs($significance);
+    }
+
+    /**
+     * Avoid Scrutinizer complexity problems.
+     *
+     * @return float|string Rounded Number, or a string containing an error
+     */
+    private static function argsOk(float $number, float $significance, int $mode)
+    {
+        if (!$significance) {
+            return ExcelError::DIV0();
+        }
+        if (!$number) {
+            return 0.0;
+        }
+        if (self::floorMathTest($number, $significance, $mode)) {
+            return ceil($number / $significance) * $significance;
+        }
+
+        return floor($number / $significance) * $significance;
+    }
+
+    /**
+     * Let FLOORMATH complexity pass Scrutinizer.
+     */
+    private static function floorMathTest(float $number, float $significance, int $mode): bool
+    {
+        return Helpers::returnSign($significance) == -1 || (Helpers::returnSign($number) == -1 && !empty($mode));
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     *
+     * @return float|string
+     */
+    private static function argumentsOk(float $number, float $significance)
+    {
+        if ($significance == 0.0) {
+            return ExcelError::DIV0();
+        }
+        if ($number == 0.0) {
+            return 0.0;
+        }
+        if (Helpers::returnSign($significance) == 1) {
+            return floor($number / $significance) * $significance;
+        }
+        if (Helpers::returnSign($number) == -1 && Helpers::returnSign($significance) == -1) {
+            return floor($number / $significance) * $significance;
+        }
+
+        return ExcelError::NAN();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
new file mode 100644
index 000000000..f70359988
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Gcd
+{
+    /**
+     * Recursively determine 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[, ...]])
+     *
+     * @param float|int $a
+     * @param float|int $b
+     *
+     * @return float|int
+     */
+    private static function evaluateGCD($a, $b)
+    {
+        return $b ? self::evaluateGCD($b, $a % $b) : $a;
+    }
+
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|int|string Greatest Common Divisor, or a string containing an error
+     */
+    public static function evaluate(...$args)
+    {
+        try {
+            $arrayArgs = [];
+            foreach (Functions::flattenArray($args) as $value1) {
+                if ($value1 !== null) {
+                    $value = Helpers::validateNumericNullSubstitution($value1, 1);
+                    Helpers::validateNotNegative($value);
+                    $arrayArgs[] = (int) $value;
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (count($arrayArgs) <= 0) {
+            return ExcelError::VALUE();
+        }
+        $gcd = (int) array_pop($arrayArgs);
+        do {
+            $gcd = self::evaluateGCD($gcd, (int) array_pop($arrayArgs));
+        } while (!empty($arrayArgs));
+
+        return $gcd;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
new file mode 100644
index 000000000..f34f159b8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @return float|string quotient or DIV0 if denominator is too small
+     */
+    public static function verySmallDenominator(float $numerator, float $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)
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null) {
+            return 0;
+        }
+        if (is_bool($number)) {
+            return (int) $number;
+        }
+        if (is_numeric($number)) {
+            return 0 + $number;
+        }
+
+        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)
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null && $substitute !== null) {
+            return $substitute;
+        }
+        if (is_numeric($number)) {
+            return 0 + $number;
+        }
+
+        throw new Exception(ExcelError::throwError($number));
+    }
+
+    /**
+     * Confirm number >= 0.
+     *
+     * @param float|int $number
+     */
+    public static function validateNotNegative($number, ?string $except = null): void
+    {
+        if ($number >= 0) {
+            return;
+        }
+
+        throw new Exception($except ?? ExcelError::NAN());
+    }
+
+    /**
+     * Confirm number > 0.
+     *
+     * @param float|int $number
+     */
+    public static function validatePositive($number, ?string $except = null): void
+    {
+        if ($number > 0) {
+            return;
+        }
+
+        throw new Exception($except ?? ExcelError::NAN());
+    }
+
+    /**
+     * Confirm number != 0.
+     *
+     * @param float|int $number
+     */
+    public static function validateNotZero($number): void
+    {
+        if ($number) {
+            return;
+        }
+
+        throw new Exception(ExcelError::DIV0());
+    }
+
+    public static function returnSign(float $number): int
+    {
+        return $number ? (($number > 0) ? 1 : -1) : 0;
+    }
+
+    public static function getEven(float $number): float
+    {
+        $significance = 2 * self::returnSign($number);
+
+        return $significance ? (ceil($number / $significance) * $significance) : 0;
+    }
+
+    /**
+     * Return NAN or value depending on argument.
+     *
+     * @param float $result Number
+     *
+     * @return float|string
+     */
+    public static function numberOrNan($result)
+    {
+        return is_nan($result) ? ExcelError::NAN() : $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
new file mode 100644
index 000000000..230f969a2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class IntClass
+{
+    use ArrayEnabled;
+
+    /**
+     * INT.
+     *
+     * Casts a floating point value to an integer
+     *
+     * Excel Function:
+     *        INT(number)
+     *
+     * @param array|float $number Number to cast to an integer, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) floor($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
new file mode 100644
index 000000000..3b23c1da1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Lcm
+{
+    //
+    //    Private method to return an array of the factors of the input value
+    //
+    private static function factors(float $value): array
+    {
+        $startVal = floor(sqrt($value));
+
+        $factorArray = [];
+        for ($i = $startVal; $i > 1; --$i) {
+            if (($value % $i) == 0) {
+                $factorArray = array_merge($factorArray, self::factors($value / $i));
+                $factorArray = array_merge($factorArray, self::factors($i));
+                if ($i <= sqrt($value)) {
+                    break;
+                }
+            }
+        }
+        if (!empty($factorArray)) {
+            rsort($factorArray);
+
+            return $factorArray;
+        }
+
+        return [(int) $value];
+    }
+
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return int|string Lowest Common Multiplier, or a string containing an error
+     */
+    public static function evaluate(...$args)
+    {
+        try {
+            $arrayArgs = [];
+            $anyZeros = 0;
+            $anyNonNulls = 0;
+            foreach (Functions::flattenArray($args) as $value1) {
+                $anyNonNulls += (int) ($value1 !== null);
+                $value = Helpers::validateNumericNullSubstitution($value1, 1);
+                Helpers::validateNotNegative($value);
+                $arrayArgs[] = (int) $value;
+                $anyZeros += (int) !((bool) $value);
+            }
+            self::testNonNulls($anyNonNulls);
+            if ($anyZeros) {
+                return 0;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $returnValue = 1;
+        $allPoweredFactors = [];
+        // Loop through arguments
+        foreach ($arrayArgs as $value) {
+            $myFactors = self::factors(floor($value));
+            $myCountedFactors = array_count_values($myFactors);
+            $myPoweredFactors = [];
+            foreach ($myCountedFactors as $myCountedFactor => $myCountedPower) {
+                $myPoweredFactors[$myCountedFactor] = $myCountedFactor ** $myCountedPower;
+            }
+            self::processPoweredFactors($allPoweredFactors, $myPoweredFactors);
+        }
+        foreach ($allPoweredFactors as $allPoweredFactor) {
+            $returnValue *= (int) $allPoweredFactor;
+        }
+
+        return $returnValue;
+    }
+
+    private static function processPoweredFactors(array &$allPoweredFactors, array &$myPoweredFactors): void
+    {
+        foreach ($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
+            if (isset($allPoweredFactors[$myPoweredValue])) {
+                if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
+                    $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+                }
+            } else {
+                $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+            }
+        }
+    }
+
+    private static function testNonNulls(int $anyNonNulls): void
+    {
+        if (!$anyNonNulls) {
+            throw new Exception(ExcelError::VALUE());
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
new file mode 100644
index 000000000..7b07f09d5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Logarithms
+{
+    use ArrayEnabled;
+
+    /**
+     * LOG_BASE.
+     *
+     * Returns the logarithm of a number to a specified base. The default base is 10.
+     *
+     * Excel Function:
+     *        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 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)
+    {
+        if (is_array($number) || is_array($base)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $base);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+            $base = Helpers::validateNumericNullBool($base);
+            Helpers::validatePositive($base);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log($number, $base);
+    }
+
+    /**
+     * LOG10.
+     *
+     * Returns the result of builtin function log after validating args.
+     *
+     * @param mixed $number Should be numeric
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log10($number);
+    }
+
+    /**
+     * LN.
+     *
+     * Returns the result of builtin function log after validating args.
+     *
+     * @param mixed $number Should be numeric
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
new file mode 100644
index 000000000..5a5125a8c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
@@ -0,0 +1,179 @@
+<?php
+
+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\Information\ExcelError;
+
+class MatrixFunctions
+{
+    /**
+     * Convert parameter to Matrix.
+     *
+     * @param mixed $matrixValues A matrix of values
+     */
+    private static function getMatrix($matrixValues): Matrix
+    {
+        $matrixData = [];
+        if (!is_array($matrixValues)) {
+            $matrixValues = [[$matrixValues]];
+        }
+
+        $row = 0;
+        foreach ($matrixValues as $matrixRow) {
+            if (!is_array($matrixRow)) {
+                $matrixRow = [$matrixRow];
+            }
+            $column = 0;
+            foreach ($matrixRow as $matrixCell) {
+                if ((is_string($matrixCell)) || ($matrixCell === null)) {
+                    throw new Exception(ExcelError::VALUE());
+                }
+                $matrixData[$row][$column] = $matrixCell;
+                ++$column;
+            }
+            ++$row;
+        }
+
+        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($rows = 1, $columns = 1, $start = 1, $step = 1)
+    {
+        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.
+     *
+     * Returns the matrix determinant of an array.
+     *
+     * Excel Function:
+     *        MDETERM(array)
+     *
+     * @param mixed $matrixValues A matrix of values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function determinant($matrixValues)
+    {
+        try {
+            $matrix = self::getMatrix($matrixValues);
+
+            return $matrix->determinant();
+        } catch (MatrixException $ex) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MINVERSE.
+     *
+     * Returns the inverse matrix for the matrix stored in an array.
+     *
+     * Excel Function:
+     *        MINVERSE(array)
+     *
+     * @param mixed $matrixValues A matrix of values
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function inverse($matrixValues)
+    {
+        try {
+            $matrix = self::getMatrix($matrixValues);
+
+            return $matrix->inverse()->toArray();
+        } catch (MatrixDiv0Exception $e) {
+            return ExcelError::NAN();
+        } catch (MatrixException $e) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MMULT.
+     *
+     * @param mixed $matrixData1 A matrix of values
+     * @param mixed $matrixData2 A matrix of values
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function multiply($matrixData1, $matrixData2)
+    {
+        try {
+            $matrixA = self::getMatrix($matrixData1);
+            $matrixB = self::getMatrix($matrixData2);
+
+            return $matrixA->multiply($matrixB)->toArray();
+        } catch (MatrixException $ex) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MUnit.
+     *
+     * @param mixed $dimension Number of rows and columns
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function identity($dimension)
+    {
+        try {
+            $dimension = (int) Helpers::validateNumericNullBool($dimension);
+            Helpers::validatePositive($dimension, ExcelError::VALUE());
+            $matrix = Builder::createIdentityMatrix($dimension, 0)->toArray();
+
+            return $matrix;
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
new file mode 100644
index 000000000..062584510
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
@@ -0,0 +1,162 @@
+<?php
+
+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 array|float|int|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)
+    {
+        if (is_array($dividend) || is_array($divisor)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dividend, $divisor);
+        }
+
+        try {
+            $dividend = Helpers::validateNumericNullBool($dividend);
+            $divisor = Helpers::validateNumericNullBool($divisor);
+            Helpers::validateNotZero($divisor);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($dividend < 0.0) && ($divisor > 0.0)) {
+            return $divisor - fmod(abs($dividend), $divisor);
+        }
+        if (($dividend > 0.0) && ($divisor < 0.0)) {
+            return $divisor + fmod($dividend, abs($divisor));
+        }
+
+        return fmod($dividend, $divisor);
+    }
+
+    /**
+     * POWER.
+     *
+     * Computes x raised to the power y.
+     *
+     * @param array|float|int $x
+     *                      Or can be an array of values
+     * @param array|float|int $y
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($x) || is_array($y)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $y);
+        }
+
+        try {
+            $x = Helpers::validateNumericNullBool($x);
+            $y = Helpers::validateNumericNullBool($y);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if (!$x && !$y) {
+            return ExcelError::NAN();
+        }
+        if (!$x && $y < 0.0) {
+            return ExcelError::DIV0();
+        }
+
+        // Return
+        $result = $x ** $y;
+
+        return Helpers::numberOrNan($result);
+    }
+
+    /**
+     * PRODUCT.
+     *
+     * PRODUCT returns the product of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        PRODUCT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function product(...$args)
+    {
+        $args = array_filter(
+            Functions::flattenArray($args),
+            function ($value) {
+                return $value !== null;
+            }
+        );
+
+        // Return value
+        $returnValue = (count($args) === 0) ? 0.0 : 1.0;
+
+        // Loop through arguments
+        foreach ($args as $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                $returnValue *= $arg;
+            } else {
+                return ExcelError::throwError($arg);
+            }
+        }
+
+        return (float) $returnValue;
+    }
+
+    /**
+     * QUOTIENT.
+     *
+     * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
+     *        and denominator is the divisor.
+     *
+     * Excel Function:
+     *        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 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)
+    {
+        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);
+            Helpers::validateNotZero($denominator);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) ($numerator / $denominator);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
new file mode 100644
index 000000000..22cad2cfd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
@@ -0,0 +1,99 @@
+<?php
+
+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
+     */
+    public static function rand()
+    {
+        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 array|float|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)
+    {
+        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);
+            Helpers::validateNotNegative($max - $min);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        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($rows = 1, $columns = 1, $min = 0, $max = 1, $wholeNumber = false)
+    {
+        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) {
+                    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
new file mode 100644
index 000000000..05415481c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
@@ -0,0 +1,846 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Roman
+{
+    use ArrayEnabled;
+
+    private const VALUES = [
+        45 => ['VL'],
+        46 => ['VLI'],
+        47 => ['VLII'],
+        48 => ['VLIII'],
+        49 => ['VLIV', 'IL'],
+        95 => ['VC'],
+        96 => ['VCI'],
+        97 => ['VCII'],
+        98 => ['VCIII'],
+        99 => ['VCIV', 'IC'],
+        145 => ['CVL'],
+        146 => ['CVLI'],
+        147 => ['CVLII'],
+        148 => ['CVLIII'],
+        149 => ['CVLIV', 'CIL'],
+        195 => ['CVC'],
+        196 => ['CVCI'],
+        197 => ['CVCII'],
+        198 => ['CVCIII'],
+        199 => ['CVCIV', 'CIC'],
+        245 => ['CCVL'],
+        246 => ['CCVLI'],
+        247 => ['CCVLII'],
+        248 => ['CCVLIII'],
+        249 => ['CCVLIV', 'CCIL'],
+        295 => ['CCVC'],
+        296 => ['CCVCI'],
+        297 => ['CCVCII'],
+        298 => ['CCVCIII'],
+        299 => ['CCVCIV', 'CCIC'],
+        345 => ['CCCVL'],
+        346 => ['CCCVLI'],
+        347 => ['CCCVLII'],
+        348 => ['CCCVLIII'],
+        349 => ['CCCVLIV', 'CCCIL'],
+        395 => ['CCCVC'],
+        396 => ['CCCVCI'],
+        397 => ['CCCVCII'],
+        398 => ['CCCVCIII'],
+        399 => ['CCCVCIV', 'CCCIC'],
+        445 => ['CDVL'],
+        446 => ['CDVLI'],
+        447 => ['CDVLII'],
+        448 => ['CDVLIII'],
+        449 => ['CDVLIV', 'CDIL'],
+        450 => ['LD'],
+        451 => ['LDI'],
+        452 => ['LDII'],
+        453 => ['LDIII'],
+        454 => ['LDIV'],
+        455 => ['LDV'],
+        456 => ['LDVI'],
+        457 => ['LDVII'],
+        458 => ['LDVIII'],
+        459 => ['LDIX'],
+        460 => ['LDX'],
+        461 => ['LDXI'],
+        462 => ['LDXII'],
+        463 => ['LDXIII'],
+        464 => ['LDXIV'],
+        465 => ['LDXV'],
+        466 => ['LDXVI'],
+        467 => ['LDXVII'],
+        468 => ['LDXVIII'],
+        469 => ['LDXIX'],
+        470 => ['LDXX'],
+        471 => ['LDXXI'],
+        472 => ['LDXXII'],
+        473 => ['LDXXIII'],
+        474 => ['LDXXIV'],
+        475 => ['LDXXV'],
+        476 => ['LDXXVI'],
+        477 => ['LDXXVII'],
+        478 => ['LDXXVIII'],
+        479 => ['LDXXIX'],
+        480 => ['LDXXX'],
+        481 => ['LDXXXI'],
+        482 => ['LDXXXII'],
+        483 => ['LDXXXIII'],
+        484 => ['LDXXXIV'],
+        485 => ['LDXXXV'],
+        486 => ['LDXXXVI'],
+        487 => ['LDXXXVII'],
+        488 => ['LDXXXVIII'],
+        489 => ['LDXXXIX'],
+        490 => ['LDXL', 'XD'],
+        491 => ['LDXLI', 'XDI'],
+        492 => ['LDXLII', 'XDII'],
+        493 => ['LDXLIII', 'XDIII'],
+        494 => ['LDXLIV', 'XDIV'],
+        495 => ['LDVL', 'XDV', 'VD'],
+        496 => ['LDVLI', 'XDVI', 'VDI'],
+        497 => ['LDVLII', 'XDVII', 'VDII'],
+        498 => ['LDVLIII', 'XDVIII', 'VDIII'],
+        499 => ['LDVLIV', 'XDIX', 'VDIV', 'ID'],
+        545 => ['DVL'],
+        546 => ['DVLI'],
+        547 => ['DVLII'],
+        548 => ['DVLIII'],
+        549 => ['DVLIV', 'DIL'],
+        595 => ['DVC'],
+        596 => ['DVCI'],
+        597 => ['DVCII'],
+        598 => ['DVCIII'],
+        599 => ['DVCIV', 'DIC'],
+        645 => ['DCVL'],
+        646 => ['DCVLI'],
+        647 => ['DCVLII'],
+        648 => ['DCVLIII'],
+        649 => ['DCVLIV', 'DCIL'],
+        695 => ['DCVC'],
+        696 => ['DCVCI'],
+        697 => ['DCVCII'],
+        698 => ['DCVCIII'],
+        699 => ['DCVCIV', 'DCIC'],
+        745 => ['DCCVL'],
+        746 => ['DCCVLI'],
+        747 => ['DCCVLII'],
+        748 => ['DCCVLIII'],
+        749 => ['DCCVLIV', 'DCCIL'],
+        795 => ['DCCVC'],
+        796 => ['DCCVCI'],
+        797 => ['DCCVCII'],
+        798 => ['DCCVCIII'],
+        799 => ['DCCVCIV', 'DCCIC'],
+        845 => ['DCCCVL'],
+        846 => ['DCCCVLI'],
+        847 => ['DCCCVLII'],
+        848 => ['DCCCVLIII'],
+        849 => ['DCCCVLIV', 'DCCCIL'],
+        895 => ['DCCCVC'],
+        896 => ['DCCCVCI'],
+        897 => ['DCCCVCII'],
+        898 => ['DCCCVCIII'],
+        899 => ['DCCCVCIV', 'DCCCIC'],
+        945 => ['CMVL'],
+        946 => ['CMVLI'],
+        947 => ['CMVLII'],
+        948 => ['CMVLIII'],
+        949 => ['CMVLIV', 'CMIL'],
+        950 => ['LM'],
+        951 => ['LMI'],
+        952 => ['LMII'],
+        953 => ['LMIII'],
+        954 => ['LMIV'],
+        955 => ['LMV'],
+        956 => ['LMVI'],
+        957 => ['LMVII'],
+        958 => ['LMVIII'],
+        959 => ['LMIX'],
+        960 => ['LMX'],
+        961 => ['LMXI'],
+        962 => ['LMXII'],
+        963 => ['LMXIII'],
+        964 => ['LMXIV'],
+        965 => ['LMXV'],
+        966 => ['LMXVI'],
+        967 => ['LMXVII'],
+        968 => ['LMXVIII'],
+        969 => ['LMXIX'],
+        970 => ['LMXX'],
+        971 => ['LMXXI'],
+        972 => ['LMXXII'],
+        973 => ['LMXXIII'],
+        974 => ['LMXXIV'],
+        975 => ['LMXXV'],
+        976 => ['LMXXVI'],
+        977 => ['LMXXVII'],
+        978 => ['LMXXVIII'],
+        979 => ['LMXXIX'],
+        980 => ['LMXXX'],
+        981 => ['LMXXXI'],
+        982 => ['LMXXXII'],
+        983 => ['LMXXXIII'],
+        984 => ['LMXXXIV'],
+        985 => ['LMXXXV'],
+        986 => ['LMXXXVI'],
+        987 => ['LMXXXVII'],
+        988 => ['LMXXXVIII'],
+        989 => ['LMXXXIX'],
+        990 => ['LMXL', 'XM'],
+        991 => ['LMXLI', 'XMI'],
+        992 => ['LMXLII', 'XMII'],
+        993 => ['LMXLIII', 'XMIII'],
+        994 => ['LMXLIV', 'XMIV'],
+        995 => ['LMVL', 'XMV', 'VM'],
+        996 => ['LMVLI', 'XMVI', 'VMI'],
+        997 => ['LMVLII', 'XMVII', 'VMII'],
+        998 => ['LMVLIII', 'XMVIII', 'VMIII'],
+        999 => ['LMVLIV', 'XMIX', 'VMIV', 'IM'],
+        1045 => ['MVL'],
+        1046 => ['MVLI'],
+        1047 => ['MVLII'],
+        1048 => ['MVLIII'],
+        1049 => ['MVLIV', 'MIL'],
+        1095 => ['MVC'],
+        1096 => ['MVCI'],
+        1097 => ['MVCII'],
+        1098 => ['MVCIII'],
+        1099 => ['MVCIV', 'MIC'],
+        1145 => ['MCVL'],
+        1146 => ['MCVLI'],
+        1147 => ['MCVLII'],
+        1148 => ['MCVLIII'],
+        1149 => ['MCVLIV', 'MCIL'],
+        1195 => ['MCVC'],
+        1196 => ['MCVCI'],
+        1197 => ['MCVCII'],
+        1198 => ['MCVCIII'],
+        1199 => ['MCVCIV', 'MCIC'],
+        1245 => ['MCCVL'],
+        1246 => ['MCCVLI'],
+        1247 => ['MCCVLII'],
+        1248 => ['MCCVLIII'],
+        1249 => ['MCCVLIV', 'MCCIL'],
+        1295 => ['MCCVC'],
+        1296 => ['MCCVCI'],
+        1297 => ['MCCVCII'],
+        1298 => ['MCCVCIII'],
+        1299 => ['MCCVCIV', 'MCCIC'],
+        1345 => ['MCCCVL'],
+        1346 => ['MCCCVLI'],
+        1347 => ['MCCCVLII'],
+        1348 => ['MCCCVLIII'],
+        1349 => ['MCCCVLIV', 'MCCCIL'],
+        1395 => ['MCCCVC'],
+        1396 => ['MCCCVCI'],
+        1397 => ['MCCCVCII'],
+        1398 => ['MCCCVCIII'],
+        1399 => ['MCCCVCIV', 'MCCCIC'],
+        1445 => ['MCDVL'],
+        1446 => ['MCDVLI'],
+        1447 => ['MCDVLII'],
+        1448 => ['MCDVLIII'],
+        1449 => ['MCDVLIV', 'MCDIL'],
+        1450 => ['MLD'],
+        1451 => ['MLDI'],
+        1452 => ['MLDII'],
+        1453 => ['MLDIII'],
+        1454 => ['MLDIV'],
+        1455 => ['MLDV'],
+        1456 => ['MLDVI'],
+        1457 => ['MLDVII'],
+        1458 => ['MLDVIII'],
+        1459 => ['MLDIX'],
+        1460 => ['MLDX'],
+        1461 => ['MLDXI'],
+        1462 => ['MLDXII'],
+        1463 => ['MLDXIII'],
+        1464 => ['MLDXIV'],
+        1465 => ['MLDXV'],
+        1466 => ['MLDXVI'],
+        1467 => ['MLDXVII'],
+        1468 => ['MLDXVIII'],
+        1469 => ['MLDXIX'],
+        1470 => ['MLDXX'],
+        1471 => ['MLDXXI'],
+        1472 => ['MLDXXII'],
+        1473 => ['MLDXXIII'],
+        1474 => ['MLDXXIV'],
+        1475 => ['MLDXXV'],
+        1476 => ['MLDXXVI'],
+        1477 => ['MLDXXVII'],
+        1478 => ['MLDXXVIII'],
+        1479 => ['MLDXXIX'],
+        1480 => ['MLDXXX'],
+        1481 => ['MLDXXXI'],
+        1482 => ['MLDXXXII'],
+        1483 => ['MLDXXXIII'],
+        1484 => ['MLDXXXIV'],
+        1485 => ['MLDXXXV'],
+        1486 => ['MLDXXXVI'],
+        1487 => ['MLDXXXVII'],
+        1488 => ['MLDXXXVIII'],
+        1489 => ['MLDXXXIX'],
+        1490 => ['MLDXL', 'MXD'],
+        1491 => ['MLDXLI', 'MXDI'],
+        1492 => ['MLDXLII', 'MXDII'],
+        1493 => ['MLDXLIII', 'MXDIII'],
+        1494 => ['MLDXLIV', 'MXDIV'],
+        1495 => ['MLDVL', 'MXDV', 'MVD'],
+        1496 => ['MLDVLI', 'MXDVI', 'MVDI'],
+        1497 => ['MLDVLII', 'MXDVII', 'MVDII'],
+        1498 => ['MLDVLIII', 'MXDVIII', 'MVDIII'],
+        1499 => ['MLDVLIV', 'MXDIX', 'MVDIV', 'MID'],
+        1545 => ['MDVL'],
+        1546 => ['MDVLI'],
+        1547 => ['MDVLII'],
+        1548 => ['MDVLIII'],
+        1549 => ['MDVLIV', 'MDIL'],
+        1595 => ['MDVC'],
+        1596 => ['MDVCI'],
+        1597 => ['MDVCII'],
+        1598 => ['MDVCIII'],
+        1599 => ['MDVCIV', 'MDIC'],
+        1645 => ['MDCVL'],
+        1646 => ['MDCVLI'],
+        1647 => ['MDCVLII'],
+        1648 => ['MDCVLIII'],
+        1649 => ['MDCVLIV', 'MDCIL'],
+        1695 => ['MDCVC'],
+        1696 => ['MDCVCI'],
+        1697 => ['MDCVCII'],
+        1698 => ['MDCVCIII'],
+        1699 => ['MDCVCIV', 'MDCIC'],
+        1745 => ['MDCCVL'],
+        1746 => ['MDCCVLI'],
+        1747 => ['MDCCVLII'],
+        1748 => ['MDCCVLIII'],
+        1749 => ['MDCCVLIV', 'MDCCIL'],
+        1795 => ['MDCCVC'],
+        1796 => ['MDCCVCI'],
+        1797 => ['MDCCVCII'],
+        1798 => ['MDCCVCIII'],
+        1799 => ['MDCCVCIV', 'MDCCIC'],
+        1845 => ['MDCCCVL'],
+        1846 => ['MDCCCVLI'],
+        1847 => ['MDCCCVLII'],
+        1848 => ['MDCCCVLIII'],
+        1849 => ['MDCCCVLIV', 'MDCCCIL'],
+        1895 => ['MDCCCVC'],
+        1896 => ['MDCCCVCI'],
+        1897 => ['MDCCCVCII'],
+        1898 => ['MDCCCVCIII'],
+        1899 => ['MDCCCVCIV', 'MDCCCIC'],
+        1945 => ['MCMVL'],
+        1946 => ['MCMVLI'],
+        1947 => ['MCMVLII'],
+        1948 => ['MCMVLIII'],
+        1949 => ['MCMVLIV', 'MCMIL'],
+        1950 => ['MLM'],
+        1951 => ['MLMI'],
+        1952 => ['MLMII'],
+        1953 => ['MLMIII'],
+        1954 => ['MLMIV'],
+        1955 => ['MLMV'],
+        1956 => ['MLMVI'],
+        1957 => ['MLMVII'],
+        1958 => ['MLMVIII'],
+        1959 => ['MLMIX'],
+        1960 => ['MLMX'],
+        1961 => ['MLMXI'],
+        1962 => ['MLMXII'],
+        1963 => ['MLMXIII'],
+        1964 => ['MLMXIV'],
+        1965 => ['MLMXV'],
+        1966 => ['MLMXVI'],
+        1967 => ['MLMXVII'],
+        1968 => ['MLMXVIII'],
+        1969 => ['MLMXIX'],
+        1970 => ['MLMXX'],
+        1971 => ['MLMXXI'],
+        1972 => ['MLMXXII'],
+        1973 => ['MLMXXIII'],
+        1974 => ['MLMXXIV'],
+        1975 => ['MLMXXV'],
+        1976 => ['MLMXXVI'],
+        1977 => ['MLMXXVII'],
+        1978 => ['MLMXXVIII'],
+        1979 => ['MLMXXIX'],
+        1980 => ['MLMXXX'],
+        1981 => ['MLMXXXI'],
+        1982 => ['MLMXXXII'],
+        1983 => ['MLMXXXIII'],
+        1984 => ['MLMXXXIV'],
+        1985 => ['MLMXXXV'],
+        1986 => ['MLMXXXVI'],
+        1987 => ['MLMXXXVII'],
+        1988 => ['MLMXXXVIII'],
+        1989 => ['MLMXXXIX'],
+        1990 => ['MLMXL', 'MXM'],
+        1991 => ['MLMXLI', 'MXMI'],
+        1992 => ['MLMXLII', 'MXMII'],
+        1993 => ['MLMXLIII', 'MXMIII'],
+        1994 => ['MLMXLIV', 'MXMIV'],
+        1995 => ['MLMVL', 'MXMV', 'MVM'],
+        1996 => ['MLMVLI', 'MXMVI', 'MVMI'],
+        1997 => ['MLMVLII', 'MXMVII', 'MVMII'],
+        1998 => ['MLMVLIII', 'MXMVIII', 'MVMIII'],
+        1999 => ['MLMVLIV', 'MXMIX', 'MVMIV', 'MIM'],
+        2045 => ['MMVL'],
+        2046 => ['MMVLI'],
+        2047 => ['MMVLII'],
+        2048 => ['MMVLIII'],
+        2049 => ['MMVLIV', 'MMIL'],
+        2095 => ['MMVC'],
+        2096 => ['MMVCI'],
+        2097 => ['MMVCII'],
+        2098 => ['MMVCIII'],
+        2099 => ['MMVCIV', 'MMIC'],
+        2145 => ['MMCVL'],
+        2146 => ['MMCVLI'],
+        2147 => ['MMCVLII'],
+        2148 => ['MMCVLIII'],
+        2149 => ['MMCVLIV', 'MMCIL'],
+        2195 => ['MMCVC'],
+        2196 => ['MMCVCI'],
+        2197 => ['MMCVCII'],
+        2198 => ['MMCVCIII'],
+        2199 => ['MMCVCIV', 'MMCIC'],
+        2245 => ['MMCCVL'],
+        2246 => ['MMCCVLI'],
+        2247 => ['MMCCVLII'],
+        2248 => ['MMCCVLIII'],
+        2249 => ['MMCCVLIV', 'MMCCIL'],
+        2295 => ['MMCCVC'],
+        2296 => ['MMCCVCI'],
+        2297 => ['MMCCVCII'],
+        2298 => ['MMCCVCIII'],
+        2299 => ['MMCCVCIV', 'MMCCIC'],
+        2345 => ['MMCCCVL'],
+        2346 => ['MMCCCVLI'],
+        2347 => ['MMCCCVLII'],
+        2348 => ['MMCCCVLIII'],
+        2349 => ['MMCCCVLIV', 'MMCCCIL'],
+        2395 => ['MMCCCVC'],
+        2396 => ['MMCCCVCI'],
+        2397 => ['MMCCCVCII'],
+        2398 => ['MMCCCVCIII'],
+        2399 => ['MMCCCVCIV', 'MMCCCIC'],
+        2445 => ['MMCDVL'],
+        2446 => ['MMCDVLI'],
+        2447 => ['MMCDVLII'],
+        2448 => ['MMCDVLIII'],
+        2449 => ['MMCDVLIV', 'MMCDIL'],
+        2450 => ['MMLD'],
+        2451 => ['MMLDI'],
+        2452 => ['MMLDII'],
+        2453 => ['MMLDIII'],
+        2454 => ['MMLDIV'],
+        2455 => ['MMLDV'],
+        2456 => ['MMLDVI'],
+        2457 => ['MMLDVII'],
+        2458 => ['MMLDVIII'],
+        2459 => ['MMLDIX'],
+        2460 => ['MMLDX'],
+        2461 => ['MMLDXI'],
+        2462 => ['MMLDXII'],
+        2463 => ['MMLDXIII'],
+        2464 => ['MMLDXIV'],
+        2465 => ['MMLDXV'],
+        2466 => ['MMLDXVI'],
+        2467 => ['MMLDXVII'],
+        2468 => ['MMLDXVIII'],
+        2469 => ['MMLDXIX'],
+        2470 => ['MMLDXX'],
+        2471 => ['MMLDXXI'],
+        2472 => ['MMLDXXII'],
+        2473 => ['MMLDXXIII'],
+        2474 => ['MMLDXXIV'],
+        2475 => ['MMLDXXV'],
+        2476 => ['MMLDXXVI'],
+        2477 => ['MMLDXXVII'],
+        2478 => ['MMLDXXVIII'],
+        2479 => ['MMLDXXIX'],
+        2480 => ['MMLDXXX'],
+        2481 => ['MMLDXXXI'],
+        2482 => ['MMLDXXXII'],
+        2483 => ['MMLDXXXIII'],
+        2484 => ['MMLDXXXIV'],
+        2485 => ['MMLDXXXV'],
+        2486 => ['MMLDXXXVI'],
+        2487 => ['MMLDXXXVII'],
+        2488 => ['MMLDXXXVIII'],
+        2489 => ['MMLDXXXIX'],
+        2490 => ['MMLDXL', 'MMXD'],
+        2491 => ['MMLDXLI', 'MMXDI'],
+        2492 => ['MMLDXLII', 'MMXDII'],
+        2493 => ['MMLDXLIII', 'MMXDIII'],
+        2494 => ['MMLDXLIV', 'MMXDIV'],
+        2495 => ['MMLDVL', 'MMXDV', 'MMVD'],
+        2496 => ['MMLDVLI', 'MMXDVI', 'MMVDI'],
+        2497 => ['MMLDVLII', 'MMXDVII', 'MMVDII'],
+        2498 => ['MMLDVLIII', 'MMXDVIII', 'MMVDIII'],
+        2499 => ['MMLDVLIV', 'MMXDIX', 'MMVDIV', 'MMID'],
+        2545 => ['MMDVL'],
+        2546 => ['MMDVLI'],
+        2547 => ['MMDVLII'],
+        2548 => ['MMDVLIII'],
+        2549 => ['MMDVLIV', 'MMDIL'],
+        2595 => ['MMDVC'],
+        2596 => ['MMDVCI'],
+        2597 => ['MMDVCII'],
+        2598 => ['MMDVCIII'],
+        2599 => ['MMDVCIV', 'MMDIC'],
+        2645 => ['MMDCVL'],
+        2646 => ['MMDCVLI'],
+        2647 => ['MMDCVLII'],
+        2648 => ['MMDCVLIII'],
+        2649 => ['MMDCVLIV', 'MMDCIL'],
+        2695 => ['MMDCVC'],
+        2696 => ['MMDCVCI'],
+        2697 => ['MMDCVCII'],
+        2698 => ['MMDCVCIII'],
+        2699 => ['MMDCVCIV', 'MMDCIC'],
+        2745 => ['MMDCCVL'],
+        2746 => ['MMDCCVLI'],
+        2747 => ['MMDCCVLII'],
+        2748 => ['MMDCCVLIII'],
+        2749 => ['MMDCCVLIV', 'MMDCCIL'],
+        2795 => ['MMDCCVC'],
+        2796 => ['MMDCCVCI'],
+        2797 => ['MMDCCVCII'],
+        2798 => ['MMDCCVCIII'],
+        2799 => ['MMDCCVCIV', 'MMDCCIC'],
+        2845 => ['MMDCCCVL'],
+        2846 => ['MMDCCCVLI'],
+        2847 => ['MMDCCCVLII'],
+        2848 => ['MMDCCCVLIII'],
+        2849 => ['MMDCCCVLIV', 'MMDCCCIL'],
+        2895 => ['MMDCCCVC'],
+        2896 => ['MMDCCCVCI'],
+        2897 => ['MMDCCCVCII'],
+        2898 => ['MMDCCCVCIII'],
+        2899 => ['MMDCCCVCIV', 'MMDCCCIC'],
+        2945 => ['MMCMVL'],
+        2946 => ['MMCMVLI'],
+        2947 => ['MMCMVLII'],
+        2948 => ['MMCMVLIII'],
+        2949 => ['MMCMVLIV', 'MMCMIL'],
+        2950 => ['MMLM'],
+        2951 => ['MMLMI'],
+        2952 => ['MMLMII'],
+        2953 => ['MMLMIII'],
+        2954 => ['MMLMIV'],
+        2955 => ['MMLMV'],
+        2956 => ['MMLMVI'],
+        2957 => ['MMLMVII'],
+        2958 => ['MMLMVIII'],
+        2959 => ['MMLMIX'],
+        2960 => ['MMLMX'],
+        2961 => ['MMLMXI'],
+        2962 => ['MMLMXII'],
+        2963 => ['MMLMXIII'],
+        2964 => ['MMLMXIV'],
+        2965 => ['MMLMXV'],
+        2966 => ['MMLMXVI'],
+        2967 => ['MMLMXVII'],
+        2968 => ['MMLMXVIII'],
+        2969 => ['MMLMXIX'],
+        2970 => ['MMLMXX'],
+        2971 => ['MMLMXXI'],
+        2972 => ['MMLMXXII'],
+        2973 => ['MMLMXXIII'],
+        2974 => ['MMLMXXIV'],
+        2975 => ['MMLMXXV'],
+        2976 => ['MMLMXXVI'],
+        2977 => ['MMLMXXVII'],
+        2978 => ['MMLMXXVIII'],
+        2979 => ['MMLMXXIX'],
+        2980 => ['MMLMXXX'],
+        2981 => ['MMLMXXXI'],
+        2982 => ['MMLMXXXII'],
+        2983 => ['MMLMXXXIII'],
+        2984 => ['MMLMXXXIV'],
+        2985 => ['MMLMXXXV'],
+        2986 => ['MMLMXXXVI'],
+        2987 => ['MMLMXXXVII'],
+        2988 => ['MMLMXXXVIII'],
+        2989 => ['MMLMXXXIX'],
+        2990 => ['MMLMXL', 'MMXM'],
+        2991 => ['MMLMXLI', 'MMXMI'],
+        2992 => ['MMLMXLII', 'MMXMII'],
+        2993 => ['MMLMXLIII', 'MMXMIII'],
+        2994 => ['MMLMXLIV', 'MMXMIV'],
+        2995 => ['MMLMVL', 'MMXMV', 'MMVM'],
+        2996 => ['MMLMVLI', 'MMXMVI', 'MMVMI'],
+        2997 => ['MMLMVLII', 'MMXMVII', 'MMVMII'],
+        2998 => ['MMLMVLIII', 'MMXMVIII', 'MMVMIII'],
+        2999 => ['MMLMVLIV', 'MMXMIX', 'MMVMIV', 'MMIM'],
+        3045 => ['MMMVL'],
+        3046 => ['MMMVLI'],
+        3047 => ['MMMVLII'],
+        3048 => ['MMMVLIII'],
+        3049 => ['MMMVLIV', 'MMMIL'],
+        3095 => ['MMMVC'],
+        3096 => ['MMMVCI'],
+        3097 => ['MMMVCII'],
+        3098 => ['MMMVCIII'],
+        3099 => ['MMMVCIV', 'MMMIC'],
+        3145 => ['MMMCVL'],
+        3146 => ['MMMCVLI'],
+        3147 => ['MMMCVLII'],
+        3148 => ['MMMCVLIII'],
+        3149 => ['MMMCVLIV', 'MMMCIL'],
+        3195 => ['MMMCVC'],
+        3196 => ['MMMCVCI'],
+        3197 => ['MMMCVCII'],
+        3198 => ['MMMCVCIII'],
+        3199 => ['MMMCVCIV', 'MMMCIC'],
+        3245 => ['MMMCCVL'],
+        3246 => ['MMMCCVLI'],
+        3247 => ['MMMCCVLII'],
+        3248 => ['MMMCCVLIII'],
+        3249 => ['MMMCCVLIV', 'MMMCCIL'],
+        3295 => ['MMMCCVC'],
+        3296 => ['MMMCCVCI'],
+        3297 => ['MMMCCVCII'],
+        3298 => ['MMMCCVCIII'],
+        3299 => ['MMMCCVCIV', 'MMMCCIC'],
+        3345 => ['MMMCCCVL'],
+        3346 => ['MMMCCCVLI'],
+        3347 => ['MMMCCCVLII'],
+        3348 => ['MMMCCCVLIII'],
+        3349 => ['MMMCCCVLIV', 'MMMCCCIL'],
+        3395 => ['MMMCCCVC'],
+        3396 => ['MMMCCCVCI'],
+        3397 => ['MMMCCCVCII'],
+        3398 => ['MMMCCCVCIII'],
+        3399 => ['MMMCCCVCIV', 'MMMCCCIC'],
+        3445 => ['MMMCDVL'],
+        3446 => ['MMMCDVLI'],
+        3447 => ['MMMCDVLII'],
+        3448 => ['MMMCDVLIII'],
+        3449 => ['MMMCDVLIV', 'MMMCDIL'],
+        3450 => ['MMMLD'],
+        3451 => ['MMMLDI'],
+        3452 => ['MMMLDII'],
+        3453 => ['MMMLDIII'],
+        3454 => ['MMMLDIV'],
+        3455 => ['MMMLDV'],
+        3456 => ['MMMLDVI'],
+        3457 => ['MMMLDVII'],
+        3458 => ['MMMLDVIII'],
+        3459 => ['MMMLDIX'],
+        3460 => ['MMMLDX'],
+        3461 => ['MMMLDXI'],
+        3462 => ['MMMLDXII'],
+        3463 => ['MMMLDXIII'],
+        3464 => ['MMMLDXIV'],
+        3465 => ['MMMLDXV'],
+        3466 => ['MMMLDXVI'],
+        3467 => ['MMMLDXVII'],
+        3468 => ['MMMLDXVIII'],
+        3469 => ['MMMLDXIX'],
+        3470 => ['MMMLDXX'],
+        3471 => ['MMMLDXXI'],
+        3472 => ['MMMLDXXII'],
+        3473 => ['MMMLDXXIII'],
+        3474 => ['MMMLDXXIV'],
+        3475 => ['MMMLDXXV'],
+        3476 => ['MMMLDXXVI'],
+        3477 => ['MMMLDXXVII'],
+        3478 => ['MMMLDXXVIII'],
+        3479 => ['MMMLDXXIX'],
+        3480 => ['MMMLDXXX'],
+        3481 => ['MMMLDXXXI'],
+        3482 => ['MMMLDXXXII'],
+        3483 => ['MMMLDXXXIII'],
+        3484 => ['MMMLDXXXIV'],
+        3485 => ['MMMLDXXXV'],
+        3486 => ['MMMLDXXXVI'],
+        3487 => ['MMMLDXXXVII'],
+        3488 => ['MMMLDXXXVIII'],
+        3489 => ['MMMLDXXXIX'],
+        3490 => ['MMMLDXL', 'MMMXD'],
+        3491 => ['MMMLDXLI', 'MMMXDI'],
+        3492 => ['MMMLDXLII', 'MMMXDII'],
+        3493 => ['MMMLDXLIII', 'MMMXDIII'],
+        3494 => ['MMMLDXLIV', 'MMMXDIV'],
+        3495 => ['MMMLDVL', 'MMMXDV', 'MMMVD'],
+        3496 => ['MMMLDVLI', 'MMMXDVI', 'MMMVDI'],
+        3497 => ['MMMLDVLII', 'MMMXDVII', 'MMMVDII'],
+        3498 => ['MMMLDVLIII', 'MMMXDVIII', 'MMMVDIII'],
+        3499 => ['MMMLDVLIV', 'MMMXDIX', 'MMMVDIV', 'MMMID'],
+        3545 => ['MMMDVL'],
+        3546 => ['MMMDVLI'],
+        3547 => ['MMMDVLII'],
+        3548 => ['MMMDVLIII'],
+        3549 => ['MMMDVLIV', 'MMMDIL'],
+        3595 => ['MMMDVC'],
+        3596 => ['MMMDVCI'],
+        3597 => ['MMMDVCII'],
+        3598 => ['MMMDVCIII'],
+        3599 => ['MMMDVCIV', 'MMMDIC'],
+        3645 => ['MMMDCVL'],
+        3646 => ['MMMDCVLI'],
+        3647 => ['MMMDCVLII'],
+        3648 => ['MMMDCVLIII'],
+        3649 => ['MMMDCVLIV', 'MMMDCIL'],
+        3695 => ['MMMDCVC'],
+        3696 => ['MMMDCVCI'],
+        3697 => ['MMMDCVCII'],
+        3698 => ['MMMDCVCIII'],
+        3699 => ['MMMDCVCIV', 'MMMDCIC'],
+        3745 => ['MMMDCCVL'],
+        3746 => ['MMMDCCVLI'],
+        3747 => ['MMMDCCVLII'],
+        3748 => ['MMMDCCVLIII'],
+        3749 => ['MMMDCCVLIV', 'MMMDCCIL'],
+        3795 => ['MMMDCCVC'],
+        3796 => ['MMMDCCVCI'],
+        3797 => ['MMMDCCVCII'],
+        3798 => ['MMMDCCVCIII'],
+        3799 => ['MMMDCCVCIV', 'MMMDCCIC'],
+        3845 => ['MMMDCCCVL'],
+        3846 => ['MMMDCCCVLI'],
+        3847 => ['MMMDCCCVLII'],
+        3848 => ['MMMDCCCVLIII'],
+        3849 => ['MMMDCCCVLIV', 'MMMDCCCIL'],
+        3895 => ['MMMDCCCVC'],
+        3896 => ['MMMDCCCVCI'],
+        3897 => ['MMMDCCCVCII'],
+        3898 => ['MMMDCCCVCIII'],
+        3899 => ['MMMDCCCVCIV', 'MMMDCCCIC'],
+        3945 => ['MMMCMVL'],
+        3946 => ['MMMCMVLI'],
+        3947 => ['MMMCMVLII'],
+        3948 => ['MMMCMVLIII'],
+        3949 => ['MMMCMVLIV', 'MMMCMIL'],
+        3950 => ['MMMLM'],
+        3951 => ['MMMLMI'],
+        3952 => ['MMMLMII'],
+        3953 => ['MMMLMIII'],
+        3954 => ['MMMLMIV'],
+        3955 => ['MMMLMV'],
+        3956 => ['MMMLMVI'],
+        3957 => ['MMMLMVII'],
+        3958 => ['MMMLMVIII'],
+        3959 => ['MMMLMIX'],
+        3960 => ['MMMLMX'],
+        3961 => ['MMMLMXI'],
+        3962 => ['MMMLMXII'],
+        3963 => ['MMMLMXIII'],
+        3964 => ['MMMLMXIV'],
+        3965 => ['MMMLMXV'],
+        3966 => ['MMMLMXVI'],
+        3967 => ['MMMLMXVII'],
+        3968 => ['MMMLMXVIII'],
+        3969 => ['MMMLMXIX'],
+        3970 => ['MMMLMXX'],
+        3971 => ['MMMLMXXI'],
+        3972 => ['MMMLMXXII'],
+        3973 => ['MMMLMXXIII'],
+        3974 => ['MMMLMXXIV'],
+        3975 => ['MMMLMXXV'],
+        3976 => ['MMMLMXXVI'],
+        3977 => ['MMMLMXXVII'],
+        3978 => ['MMMLMXXVIII'],
+        3979 => ['MMMLMXXIX'],
+        3980 => ['MMMLMXXX'],
+        3981 => ['MMMLMXXXI'],
+        3982 => ['MMMLMXXXII'],
+        3983 => ['MMMLMXXXIII'],
+        3984 => ['MMMLMXXXIV'],
+        3985 => ['MMMLMXXXV'],
+        3986 => ['MMMLMXXXVI'],
+        3987 => ['MMMLMXXXVII'],
+        3988 => ['MMMLMXXXVIII'],
+        3989 => ['MMMLMXXXIX'],
+        3990 => ['MMMLMXL', 'MMMXM'],
+        3991 => ['MMMLMXLI', 'MMMXMI'],
+        3992 => ['MMMLMXLII', 'MMMXMII'],
+        3993 => ['MMMLMXLIII', 'MMMXMIII'],
+        3994 => ['MMMLMXLIV', 'MMMXMIV'],
+        3995 => ['MMMLMVL', 'MMMXMV', 'MMMVM'],
+        3996 => ['MMMLMVLI', 'MMMXMVI', 'MMMVMI'],
+        3997 => ['MMMLMVLII', 'MMMXMVII', 'MMMVMII'],
+        3998 => ['MMMLMVLIII', 'MMMXMVIII', 'MMMVMIII'],
+        3999 => ['MMMLMVLIV', 'MMMXMIX', 'MMMVMIV', 'MMMIM'],
+    ];
+
+    private const THOUSANDS = ['', 'M', 'MM', 'MMM'];
+    private const HUNDREDS = ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM'];
+    private const TENS = ['', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'];
+    private const ONES = ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'];
+    const MAX_ROMAN_VALUE = 3999;
+    const MAX_ROMAN_STYLE = 4;
+
+    private static function valueOk(int $aValue, int $style): string
+    {
+        $origValue = $aValue;
+        $m = \intdiv($aValue, 1000);
+        $aValue %= 1000;
+        $c = \intdiv($aValue, 100);
+        $aValue %= 100;
+        $t = \intdiv($aValue, 10);
+        $aValue %= 10;
+        $result = self::THOUSANDS[$m] . self::HUNDREDS[$c] . self::TENS[$t] . self::ONES[$aValue];
+        if ($style > 0) {
+            if (array_key_exists($origValue, self::VALUES)) {
+                $arr = self::VALUES[$origValue];
+                $idx = min($style, count($arr)) - 1;
+                $result = $arr[$idx];
+            }
+        }
+
+        return $result;
+    }
+
+    private static function styleOk(int $aValue, int $style): string
+    {
+        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) ? ExcelError::VALUE() : self::styleOk($aValue, $style);
+    }
+
+    /**
+     * ROMAN.
+     *
+     * 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 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)
+    {
+        if (is_array($aValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $aValue, $style);
+        }
+
+        try {
+            $aValue = Helpers::validateNumericNullBool($aValue);
+            if (is_bool($style)) {
+                $style = $style ? 0 : 4;
+            }
+            $style = Helpers::validateNumericNullSubstitution($style, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::calculateRoman((int) $aValue, (int) $style);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
new file mode 100644
index 000000000..94b634118
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
@@ -0,0 +1,241 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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, or can be an array of numbers
+     * @param mixed $precision Should be int, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number) || is_array($precision)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $precision);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $precision = Helpers::validateNumericNullBool($precision);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return round($number, (int) $precision);
+    }
+
+    /**
+     * ROUNDUP.
+     *
+     * Rounds a number up to a specified number of decimal places
+     *
+     * @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 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)
+    {
+        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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        $digitsPlus1 = $digits + 1;
+        if ($number < 0.0) {
+            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((float) $result, $digits, PHP_ROUND_HALF_DOWN);
+    }
+
+    /**
+     * ROUNDDOWN.
+     *
+     * Rounds a number down to a specified number of decimal places
+     *
+     * @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 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)
+    {
+        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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        $digitsPlus1 = $digits + 1;
+        if ($number < 0.0) {
+            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);
+        }
+
+        $result = sprintf("%.{$digitsPlus1}f", $number - 0.5 * 0.1 ** $digits);
+
+        return round((float) $result, $digits, PHP_ROUND_HALF_UP);
+    }
+
+    /**
+     * MROUND.
+     *
+     * Rounds a number to the nearest multiple of a specified value
+     *
+     * @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 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 multiple($number, $multiple)
+    {
+        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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0 || $multiple == 0) {
+            return 0;
+        }
+        if ((Helpers::returnSign($number)) == (Helpers::returnSign($multiple))) {
+            $multiplier = 1 / $multiple;
+
+            return round($number * $multiplier) / $multiplier;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * 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)
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::getEven($number);
+    }
+
+    /**
+     * ODD.
+     *
+     * Returns number rounded up to the nearest odd integer.
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     *
+     * @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 odd($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $significance = Helpers::returnSign($number);
+        if ($significance == 0) {
+            return 1;
+        }
+
+        $result = ceil($number / $significance) * $significance;
+        if ($result == Helpers::getEven($result)) {
+            $result += $significance;
+        }
+
+        return $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
new file mode 100644
index 000000000..ecce359fc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
@@ -0,0 +1,53 @@
+<?php
+
+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.
+     *
+     * Returns the sum of a power series
+     *
+     * @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 array|float|string The result, or a string containing an error
+     */
+    public static function evaluate($x, $n, $m, ...$args)
+    {
+        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);
+            $m = Helpers::validateNumericNullSubstitution($m, 0);
+
+            // Loop through arguments
+            $aArgs = Functions::flattenArray($args);
+            $returnValue = 0;
+            $i = 0;
+            foreach ($aArgs as $argx) {
+                if ($argx !== null) {
+                    $arg = Helpers::validateNumericNullSubstitution($argx, 0);
+                    $returnValue += $arg * $x ** ($n + ($m * $i));
+                    ++$i;
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
new file mode 100644
index 000000000..e40e1f6d3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
@@ -0,0 +1,38 @@
+<?php
+
+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 array|float $number Number to round, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::returnSign($number);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
new file mode 100644
index 000000000..bb9f15fda
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
@@ -0,0 +1,64 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(sqrt($number));
+    }
+
+    /**
+     * SQRTPI.
+     *
+     * Returns the square root of (number * pi).
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullSubstitution($number, 0);
+            Helpers::validateNotNegative($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sqrt($number * M_PI);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
new file mode 100644
index 000000000..6d8f4723c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+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
+    {
+        return array_filter(
+            $args,
+            function ($index) use ($cellReference) {
+                $explodeArray = explode('.', $index);
+                $row = $explodeArray[1] ?? '';
+                if (!is_numeric($row)) {
+                    return true;
+                }
+
+                return $cellReference->getWorksheet()->getRowDimension($row)->getVisible();
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    /**
+     * @param mixed $cellReference
+     * @param mixed $args
+     */
+    protected static function filterFormulaArgs($cellReference, $args): array
+    {
+        return array_filter(
+            $args,
+            function ($index) use ($cellReference) {
+                $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() ?? ''
+                    );
+
+                    $retVal = !$isFormula || $cellFormula;
+                }
+
+                return $retVal;
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    private const CALL_FUNCTIONS = [
+        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
+    ];
+
+    /**
+     * SUBTOTAL.
+     *
+     * Returns a subtotal in a list or database.
+     *
+     * @param mixed $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
+     * @param mixed[] $args A mixed data series of values
+     *
+     * @return float|string
+     */
+    public static function evaluate($functionType, ...$args)
+    {
+        $cellReference = array_pop($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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Calculate
+        if ($subtotal > 100) {
+            $aArgs = self::filterHiddenArgs($cellReference, $aArgs);
+            $subtotal -= 100;
+        }
+
+        $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 ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
new file mode 100644
index 000000000..56b0861c6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\Value;
+
+class Sum
+{
+    /**
+     * SUM, ignoring non-numeric non-error strings. This is eventually used by SUMIF.
+     *
+     * SUM computes the sum of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        SUM(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function sumIgnoringStrings(...$args)
+    {
+        $returnValue = 0;
+
+        // Loop through the arguments
+        foreach (Functions::flattenArray($args) as $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                $returnValue += $arg;
+            } elseif (ErrorValue::isError($arg)) {
+                return $arg;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * SUM, returning error for non-numeric strings. This is used by Excel SUM function.
+     *
+     * SUM computes the sum of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        SUM(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function sumErroringStrings(...$args)
+    {
+        $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;
+                }
+                $returnValue += $arg;
+            } elseif (is_bool($arg)) {
+                $returnValue += (int) $arg;
+            } elseif (ErrorValue::isError($arg)) {
+                return $arg;
+            } elseif ($arg !== null && !Functions::isCellValue($k)) {
+                // ignore non-numerics from cell, but fail as literals (except null)
+                return ExcelError::VALUE();
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * SUMPRODUCT.
+     *
+     * Excel Function:
+     *        SUMPRODUCT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function product(...$args)
+    {
+        $arrayList = $args;
+
+        $wrkArray = Functions::flattenArray(array_shift($arrayList));
+        $wrkCellCount = count($wrkArray);
+
+        for ($i = 0; $i < $wrkCellCount; ++$i) {
+            if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
+                $wrkArray[$i] = 0;
+            }
+        }
+
+        foreach ($arrayList as $matrixData) {
+            $array2 = Functions::flattenArray($matrixData);
+            $count = count($array2);
+            if ($wrkCellCount != $count) {
+                return ExcelError::VALUE();
+            }
+
+            foreach ($array2 as $i => $val) {
+                if ((!is_numeric($val)) || (is_string($val))) {
+                    $val = 0;
+                }
+                $wrkArray[$i] *= $val;
+            }
+        }
+
+        return array_sum($wrkArray);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
new file mode 100644
index 000000000..34b397cde
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class SumSquares
+{
+    /**
+     * SUMSQ.
+     *
+     * SUMSQ returns the sum of the squares of the arguments
+     *
+     * Excel Function:
+     *        SUMSQ(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function sumSquare(...$args)
+    {
+        try {
+            $returnValue = 0;
+
+            // Loop through arguments
+            foreach (Functions::flattenArray($args) as $arg) {
+                $arg1 = Helpers::validateNumericNullSubstitution($arg, 0);
+                $returnValue += ($arg1 * $arg1);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $returnValue;
+    }
+
+    private static function getCount(array $array1, array $array2): int
+    {
+        $count = count($array1);
+        if ($count !== count($array2)) {
+            throw new Exception(ExcelError::NA());
+        }
+
+        return $count;
+    }
+
+    /**
+     * These functions accept only numeric arguments, not even strings which are numeric.
+     *
+     * @param mixed $item
+     */
+    private static function numericNotString($item): bool
+    {
+        return is_numeric($item) && !is_string($item);
+    }
+
+    /**
+     * SUMX2MY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     *
+     * @return float|string
+     */
+    public static function sumXSquaredMinusYSquared($matrixData1, $matrixData2)
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+
+    /**
+     * SUMX2PY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     *
+     * @return float|string
+     */
+    public static function sumXSquaredPlusYSquared($matrixData1, $matrixData2)
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+
+    /**
+     * SUMXMY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     *
+     * @return float|string
+     */
+    public static function sumXMinusYSquared($matrixData1, $matrixData2)
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
new file mode 100644
index 000000000..845b6c146
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
@@ -0,0 +1,64 @@
+<?php
+
+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 array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, sin($angle));
+    }
+
+    /**
+     * CSCH.
+     *
+     * Returns the hyperbolic cosecant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, sinh($angle));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
new file mode 100644
index 000000000..c06f04dfc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
@@ -0,0 +1,116 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return cos($number);
+    }
+
+    /**
+     * COSH.
+     *
+     * Returns the result of builtin function cosh after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return cosh($number);
+    }
+
+    /**
+     * ACOS.
+     *
+     * Returns the arccosine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(acos($number));
+    }
+
+    /**
+     * ACOSH.
+     *
+     * Returns the arc inverse hyperbolic cosine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(acosh($number));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
new file mode 100644
index 000000000..eeedef9bf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
@@ -0,0 +1,118 @@
+<?php
+
+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 array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(cos($angle), sin($angle));
+    }
+
+    /**
+     * COTH.
+     *
+     * Returns the hyperbolic cotangent of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, tanh($angle));
+    }
+
+    /**
+     * ACOT.
+     *
+     * Returns the arccotangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (M_PI / 2) - atan($number);
+    }
+
+    /**
+     * ACOTH.
+     *
+     * Returns the hyperbolic arccotangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        $result = ($number === 1) ? NAN : (log(($number + 1) / ($number - 1)) / 2);
+
+        return Helpers::numberOrNan($result);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
new file mode 100644
index 000000000..2d26e5ddf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
@@ -0,0 +1,64 @@
+<?php
+
+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 array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, cos($angle));
+    }
+
+    /**
+     * SECH.
+     *
+     * Returns the hyperbolic secant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, cosh($angle));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
new file mode 100644
index 000000000..6af568ce2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
@@ -0,0 +1,116 @@
+<?php
+
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sin($angle);
+    }
+
+    /**
+     * SINH.
+     *
+     * Returns the result of builtin function sinh after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sinh($angle);
+    }
+
+    /**
+     * ASIN.
+     *
+     * Returns the arcsine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(asin($number));
+    }
+
+    /**
+     * ASINH.
+     *
+     * Returns the inverse hyperbolic sine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(asinh($number));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
new file mode 100644
index 000000000..9e7702102
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(sin($angle), cos($angle));
+    }
+
+    /**
+     * TANH.
+     *
+     * Returns the result of builtin function sinh after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @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)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return tanh($angle);
+    }
+
+    /**
+     * ATAN.
+     *
+     * Returns the arctangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(atan($number));
+    }
+
+    /**
+     * ATANH.
+     *
+     * Returns the inverse hyperbolic tangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @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) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(atanh($number));
+    }
+
+    /**
+     * 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)
+     *
+     * @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 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)
+    {
+        if (is_array($xCoordinate) || is_array($yCoordinate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $xCoordinate, $yCoordinate);
+        }
+
+        try {
+            $xCoordinate = Helpers::validateNumericNullBool($xCoordinate);
+            $yCoordinate = Helpers::validateNumericNullBool($yCoordinate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($xCoordinate == 0) && ($yCoordinate == 0)) {
+            return ExcelError::DIV0();
+        }
+
+        return atan2($yCoordinate, $xCoordinate);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
new file mode 100644
index 000000000..ee60105bb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
@@ -0,0 +1,61 @@
+<?php
+
+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.
+     *
+     * @param array|float $value
+     *                      Or can be an array of values
+     * @param array|int $digits
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        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);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($value == 0) {
+            return $value;
+        }
+
+        if ($value >= 0) {
+            $minusSign = '';
+        } else {
+            $minusSign = '-';
+            $value = -$value;
+        }
+
+        $digits = (int) floor($digits);
+        if ($digits < 0) {
+            $power = (int) (10 ** -$digits);
+            $result = intdiv((int) floor($value), $power) * $power;
+            return ($minusSign === '') ? $result : -$result;
+        }
+        $digitsPlus1 = $digits + 1;
+        $result = substr($minusSign . sprintf("%.{$digitsPlus1}f", $value), 0, -1);
+
+        return (float) $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php
index b1c7fb020..6310ef37c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -2,560 +2,27 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use PhpOffice\PhpSpreadsheet\Shared\Trend\Trend;
+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 XMININ = 2.23e-308;
     const EPS = 2.22e-16;
     const MAX_VALUE = 1.2e308;
-    const MAX_ITERATIONS = 256;
     const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
 
-    private static function checkTrendArrays(&$array1, &$array2)
-    {
-        if (!is_array($array1)) {
-            $array1 = [$array1];
-        }
-        if (!is_array($array2)) {
-            $array2 = [$array2];
-        }
-
-        $array1 = Functions::flattenArray($array1);
-        $array2 = Functions::flattenArray($array2);
-        foreach ($array1 as $key => $value) {
-            if ((is_bool($value)) || (is_string($value)) || ($value === null)) {
-                unset($array1[$key], $array2[$key]);
-            }
-        }
-        foreach ($array2 as $key => $value) {
-            if ((is_bool($value)) || (is_string($value)) || ($value === null)) {
-                unset($array1[$key], $array2[$key]);
-            }
-        }
-        $array1 = array_merge($array1);
-        $array2 = array_merge($array2);
-
-        return true;
-    }
-
-    /**
-     * Incomplete beta function.
-     *
-     * @author Jaco van Kooten
-     * @author Paul Meagher
-     *
-     * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
-     *
-     * @param mixed $x require 0<=x<=1
-     * @param mixed $p require p>0
-     * @param mixed $q require q>0
-     *
-     * @return float 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
-     */
-    private static function incompleteBeta($x, $p, $q)
-    {
-        if ($x <= 0.0) {
-            return 0.0;
-        } elseif ($x >= 1.0) {
-            return 1.0;
-        } elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
-            return 0.0;
-        }
-        $beta_gam = exp((0 - self::logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
-        if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
-            return $beta_gam * self::betaFraction($x, $p, $q) / $p;
-        }
-
-        return 1.0 - ($beta_gam * self::betaFraction(1 - $x, $q, $p) / $q);
-    }
-
-    // Function cache for logBeta function
-    private static $logBetaCacheP = 0.0;
-
-    private static $logBetaCacheQ = 0.0;
-
-    private static $logBetaCacheResult = 0.0;
-
-    /**
-     * The natural logarithm of the beta function.
-     *
-     * @param mixed $p require p>0
-     * @param mixed $q require q>0
-     *
-     * @return float 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-     *
-     * @author Jaco van Kooten
-     */
-    private static function logBeta($p, $q)
-    {
-        if ($p != self::$logBetaCacheP || $q != self::$logBetaCacheQ) {
-            self::$logBetaCacheP = $p;
-            self::$logBetaCacheQ = $q;
-            if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
-                self::$logBetaCacheResult = 0.0;
-            } else {
-                self::$logBetaCacheResult = self::logGamma($p) + self::logGamma($q) - self::logGamma($p + $q);
-            }
-        }
-
-        return self::$logBetaCacheResult;
-    }
-
-    /**
-     * Evaluates of continued fraction part of incomplete beta function.
-     * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
-     *
-     * @author Jaco van Kooten
-     *
-     * @param mixed $x
-     * @param mixed $p
-     * @param mixed $q
-     *
-     * @return float
-     */
-    private static function betaFraction($x, $p, $q)
-    {
-        $c = 1.0;
-        $sum_pq = $p + $q;
-        $p_plus = $p + 1.0;
-        $p_minus = $p - 1.0;
-        $h = 1.0 - $sum_pq * $x / $p_plus;
-        if (abs($h) < self::XMININ) {
-            $h = self::XMININ;
-        }
-        $h = 1.0 / $h;
-        $frac = $h;
-        $m = 1;
-        $delta = 0.0;
-        while ($m <= self::MAX_ITERATIONS && abs($delta - 1.0) > Functions::PRECISION) {
-            $m2 = 2 * $m;
-            // even index for d
-            $d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
-            $h = 1.0 + $d * $h;
-            if (abs($h) < self::XMININ) {
-                $h = self::XMININ;
-            }
-            $h = 1.0 / $h;
-            $c = 1.0 + $d / $c;
-            if (abs($c) < self::XMININ) {
-                $c = self::XMININ;
-            }
-            $frac *= $h * $c;
-            // odd index for d
-            $d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
-            $h = 1.0 + $d * $h;
-            if (abs($h) < self::XMININ) {
-                $h = self::XMININ;
-            }
-            $h = 1.0 / $h;
-            $c = 1.0 + $d / $c;
-            if (abs($c) < self::XMININ) {
-                $c = self::XMININ;
-            }
-            $delta = $h * $c;
-            $frac *= $delta;
-            ++$m;
-        }
-
-        return $frac;
-    }
-
-    /**
-     * 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
-     */
-
-    // Function cache for logGamma
-    private static $logGammaCacheResult = 0.0;
-
-    private static $logGammaCacheX = 0.0;
-
-    private static function logGamma($x)
-    {
-        // Log Gamma related constants
-        static $lg_d1 = -0.5772156649015328605195174;
-        static $lg_d2 = 0.4227843350984671393993777;
-        static $lg_d4 = 1.791759469228055000094023;
-
-        static $lg_p1 = [
-            4.945235359296727046734888,
-            201.8112620856775083915565,
-            2290.838373831346393026739,
-            11319.67205903380828685045,
-            28557.24635671635335736389,
-            38484.96228443793359990269,
-            26377.48787624195437963534,
-            7225.813979700288197698961,
-        ];
-        static $lg_p2 = [
-            4.974607845568932035012064,
-            542.4138599891070494101986,
-            15506.93864978364947665077,
-            184793.2904445632425417223,
-            1088204.76946882876749847,
-            3338152.967987029735917223,
-            5106661.678927352456275255,
-            3074109.054850539556250927,
-        ];
-        static $lg_p4 = [
-            14745.02166059939948905062,
-            2426813.369486704502836312,
-            121475557.4045093227939592,
-            2663432449.630976949898078,
-            29403789566.34553899906876,
-            170266573776.5398868392998,
-            492612579337.743088758812,
-            560625185622.3951465078242,
-        ];
-        static $lg_q1 = [
-            67.48212550303777196073036,
-            1113.332393857199323513008,
-            7738.757056935398733233834,
-            27639.87074403340708898585,
-            54993.10206226157329794414,
-            61611.22180066002127833352,
-            36351.27591501940507276287,
-            8785.536302431013170870835,
-        ];
-        static $lg_q2 = [
-            183.0328399370592604055942,
-            7765.049321445005871323047,
-            133190.3827966074194402448,
-            1136705.821321969608938755,
-            5267964.117437946917577538,
-            13467014.54311101692290052,
-            17827365.30353274213975932,
-            9533095.591844353613395747,
-        ];
-        static $lg_q4 = [
-            2690.530175870899333379843,
-            639388.5654300092398984238,
-            41355999.30241388052042842,
-            1120872109.61614794137657,
-            14886137286.78813811542398,
-            101680358627.2438228077304,
-            341747634550.7377132798597,
-            446315818741.9713286462081,
-        ];
-        static $lg_c = [
-            -0.001910444077728,
-            8.4171387781295e-4,
-            -5.952379913043012e-4,
-            7.93650793500350248e-4,
-            -0.002777777777777681622553,
-            0.08333333333333333331554247,
-            0.0057083835261,
-        ];
-
-        // Rough estimate of the fourth root of logGamma_xBig
-        static $lg_frtbig = 2.25e76;
-        static $pnt68 = 0.6796875;
-
-        if ($x == self::$logGammaCacheX) {
-            return self::$logGammaCacheResult;
-        }
-        $y = $x;
-        if ($y > 0.0 && $y <= self::LOG_GAMMA_X_MAX_VALUE) {
-            if ($y <= self::EPS) {
-                $res = -log($y);
-            } elseif ($y <= 1.5) {
-                // ---------------------
-                //    EPS .LT. X .LE. 1.5
-                // ---------------------
-                if ($y < $pnt68) {
-                    $corr = -log($y);
-                    $xm1 = $y;
-                } else {
-                    $corr = 0.0;
-                    $xm1 = $y - 1.0;
-                }
-                if ($y <= 0.5 || $y >= $pnt68) {
-                    $xden = 1.0;
-                    $xnum = 0.0;
-                    for ($i = 0; $i < 8; ++$i) {
-                        $xnum = $xnum * $xm1 + $lg_p1[$i];
-                        $xden = $xden * $xm1 + $lg_q1[$i];
-                    }
-                    $res = $corr + $xm1 * ($lg_d1 + $xm1 * ($xnum / $xden));
-                } else {
-                    $xm2 = $y - 1.0;
-                    $xden = 1.0;
-                    $xnum = 0.0;
-                    for ($i = 0; $i < 8; ++$i) {
-                        $xnum = $xnum * $xm2 + $lg_p2[$i];
-                        $xden = $xden * $xm2 + $lg_q2[$i];
-                    }
-                    $res = $corr + $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-                }
-            } elseif ($y <= 4.0) {
-                // ---------------------
-                //    1.5 .LT. X .LE. 4.0
-                // ---------------------
-                $xm2 = $y - 2.0;
-                $xden = 1.0;
-                $xnum = 0.0;
-                for ($i = 0; $i < 8; ++$i) {
-                    $xnum = $xnum * $xm2 + $lg_p2[$i];
-                    $xden = $xden * $xm2 + $lg_q2[$i];
-                }
-                $res = $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-            } elseif ($y <= 12.0) {
-                // ----------------------
-                //    4.0 .LT. X .LE. 12.0
-                // ----------------------
-                $xm4 = $y - 4.0;
-                $xden = -1.0;
-                $xnum = 0.0;
-                for ($i = 0; $i < 8; ++$i) {
-                    $xnum = $xnum * $xm4 + $lg_p4[$i];
-                    $xden = $xden * $xm4 + $lg_q4[$i];
-                }
-                $res = $lg_d4 + $xm4 * ($xnum / $xden);
-            } else {
-                // ---------------------------------
-                //    Evaluate for argument .GE. 12.0
-                // ---------------------------------
-                $res = 0.0;
-                if ($y <= $lg_frtbig) {
-                    $res = $lg_c[6];
-                    $ysq = $y * $y;
-                    for ($i = 0; $i < 6; ++$i) {
-                        $res = $res / $ysq + $lg_c[$i];
-                    }
-                    $res /= $y;
-                    $corr = log($y);
-                    $res = $res + log(self::SQRT2PI) - 0.5 * $corr;
-                    $res += $y * ($corr - 1.0);
-                }
-            }
-        } else {
-            // --------------------------
-            //    Return for bad arguments
-            // --------------------------
-            $res = self::MAX_VALUE;
-        }
-        // ------------------------------
-        //    Final adjustments and return
-        // ------------------------------
-        self::$logGammaCacheX = $x;
-        self::$logGammaCacheResult = $res;
-
-        return $res;
-    }
-
-    //
-    //    Private implementation of the incomplete Gamma function
-    //
-    private static function incompleteGamma($a, $x)
-    {
-        static $max = 32;
-        $summer = 0;
-        for ($n = 0; $n <= $max; ++$n) {
-            $divisor = $a;
-            for ($i = 1; $i <= $n; ++$i) {
-                $divisor *= ($a + $i);
-            }
-            $summer += (pow($x, $n) / $divisor);
-        }
-
-        return pow($x, $a) * exp(0 - $x) * $summer;
-    }
-
-    //
-    //    Private implementation of the Gamma function
-    //
-    private static function gamma($data)
-    {
-        if ($data == 0.0) {
-            return 0;
-        }
-
-        static $p0 = 1.000000000190015;
-        static $p = [
-            1 => 76.18009172947146,
-            2 => -86.50532032941677,
-            3 => 24.01409824083091,
-            4 => -1.231739572450155,
-            5 => 1.208650973866179e-3,
-            6 => -5.395239384953e-6,
-        ];
-
-        $y = $x = $data;
-        $tmp = $x + 5.5;
-        $tmp -= ($x + 0.5) * log($tmp);
-
-        $summer = $p0;
-        for ($j = 1; $j <= 6; ++$j) {
-            $summer += ($p[$j] / ++$y);
-        }
-
-        return exp(0 - $tmp + log(self::SQRT2PI * $summer / $x));
-    }
-
-    /*
-     *                                inverse_ncdf.php
-     *                            -------------------
-     *    begin                : Friday, January 16, 2004
-     *    copyright            : (C) 2004 Michael Nickerson
-     *    email                : nickersonm@yahoo.com
-     *
-     */
-    private static function inverseNcdf($p)
-    {
-        //    Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
-        //    PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-        //    a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
-        //    I have not checked the accuracy of this implementation. Be aware that PHP
-        //    will truncate the coeficcients to 14 digits.
-
-        //    You have permission to use and distribute this function freely for
-        //    whatever purpose you want, but please show common courtesy and give credit
-        //    where credit is due.
-
-        //    Input paramater is $p - probability - where 0 < p < 1.
-
-        //    Coefficients in rational approximations
-        static $a = [
-            1 => -3.969683028665376e+01,
-            2 => 2.209460984245205e+02,
-            3 => -2.759285104469687e+02,
-            4 => 1.383577518672690e+02,
-            5 => -3.066479806614716e+01,
-            6 => 2.506628277459239e+00,
-        ];
-
-        static $b = [
-            1 => -5.447609879822406e+01,
-            2 => 1.615858368580409e+02,
-            3 => -1.556989798598866e+02,
-            4 => 6.680131188771972e+01,
-            5 => -1.328068155288572e+01,
-        ];
-
-        static $c = [
-            1 => -7.784894002430293e-03,
-            2 => -3.223964580411365e-01,
-            3 => -2.400758277161838e+00,
-            4 => -2.549732539343734e+00,
-            5 => 4.374664141464968e+00,
-            6 => 2.938163982698783e+00,
-        ];
-
-        static $d = [
-            1 => 7.784695709041462e-03,
-            2 => 3.224671290700398e-01,
-            3 => 2.445134137142996e+00,
-            4 => 3.754408661907416e+00,
-        ];
-
-        //    Define lower and upper region break-points.
-        $p_low = 0.02425; //Use lower region approx. below this
-        $p_high = 1 - $p_low; //Use upper region approx. above this
-
-        if (0 < $p && $p < $p_low) {
-            //    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);
-        } elseif ($p_low <= $p && $p <= $p_high) {
-            //    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);
-        } 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);
-        }
-        //    If 0 < p < 1, return a null value
-        return Functions::NULL();
-    }
-
-    /**
-     * 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
-     */
-    private static function testAcceptedBoolean($arg, $k)
-    {
-        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
-     */
-    private static function isAcceptedCountable($arg, $k)
-    {
-        if (((is_numeric($arg)) && (!is_string($arg))) ||
-                ((is_numeric($arg)) && (!Functions::isCellValue($k)) &&
-                    (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC))) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * AVEDEV.
      *
@@ -565,7 +32,9 @@ class Statistical
      * Excel Function:
      *        AVEDEV(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the averageDeviations() method in the Statistical\Averages class instead
+     * @see Statistical\Averages::averageDeviations()
      *
      * @param mixed ...$args Data values
      *
@@ -573,39 +42,7 @@ class Statistical
      */
     public static function AVEDEV(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        // Return value
-        $returnValue = 0;
-
-        $aMean = self::AVERAGE(...$args);
-        if ($aMean === Functions::DIV0()) {
-            return Functions::NAN();
-        } elseif ($aMean === Functions::VALUE()) {
-            return Functions::VALUE();
-        }
-
-        $aCount = 0;
-        foreach ($aArgs as $k => $arg) {
-            $arg = self::testAcceptedBoolean($arg, $k);
-            // 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 ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
-                return Functions::VALUE();
-            }
-            if (self::isAcceptedCountable($arg, $k)) {
-                $returnValue += abs($arg - $aMean);
-                ++$aCount;
-            }
-        }
-
-        // Return
-        if ($aCount === 0) {
-            return Functions::DIV0();
-        }
-
-        return $returnValue / $aCount;
+        return Averages::averageDeviations(...$args);
     }
 
     /**
@@ -616,7 +53,9 @@ class Statistical
      * Excel Function:
      *        AVERAGE(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the average() method in the Statistical\Averages class instead
+     * @see Statistical\Averages::average()
      *
      * @param mixed ...$args Data values
      *
@@ -624,29 +63,7 @@ class Statistical
      */
     public static function AVERAGE(...$args)
     {
-        $returnValue = $aCount = 0;
-
-        // Loop through arguments
-        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
-            $arg = self::testAcceptedBoolean($arg, $k);
-            // 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 ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
-                return Functions::VALUE();
-            }
-            if (self::isAcceptedCountable($arg, $k)) {
-                $returnValue += $arg;
-                ++$aCount;
-            }
-        }
-
-        // Return
-        if ($aCount > 0) {
-            return $returnValue / $aCount;
-        }
-
-        return Functions::DIV0();
+        return Averages::average(...$args);
     }
 
     /**
@@ -657,7 +74,9 @@ class Statistical
      * Excel Function:
      *        AVERAGEA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the averageA() method in the Statistical\Averages class instead
+     * @see Statistical\Averages::averageA()
      *
      * @param mixed ...$args Data values
      *
@@ -665,31 +84,7 @@ class Statistical
      */
     public static function AVERAGEA(...$args)
     {
-        $returnValue = null;
-
-        $aCount = 0;
-        // Loop through arguments
-        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
-            if ((is_bool($arg)) &&
-                (!Functions::isMatrixValue($k))) {
-            } 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;
-                }
-            }
-        }
-
-        if ($aCount > 0) {
-            return $returnValue / $aCount;
-        }
-
-        return Functions::DIV0();
+        return Averages::averageA(...$args);
     }
 
     /**
@@ -700,49 +95,19 @@ class Statistical
      * Excel Function:
      *        AVERAGEIF(value1[,value2[, ...]],condition)
      *
-     * @category Mathematical and Trigonometric Functions
+     * @deprecated 1.17.0
+     *      Use the AVERAGEIF() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::AVERAGEIF()
      *
-     * @param mixed $aArgs Data values
+     * @param mixed $range Data values
      * @param string $condition the criteria that defines which cells will be checked
-     * @param mixed[] $averageArgs Data values
+     * @param mixed[] $averageRange Data values
      *
-     * @return float|string
+     * @return null|float|string
      */
-    public static function AVERAGEIF($aArgs, $condition, $averageArgs = [])
+    public static function AVERAGEIF($range, $condition, $averageRange = [])
     {
-        $returnValue = 0;
-
-        $aArgs = Functions::flattenArray($aArgs);
-        $averageArgs = Functions::flattenArray($averageArgs);
-        if (empty($averageArgs)) {
-            $averageArgs = $aArgs;
-        }
-        $condition = Functions::ifCondition($condition);
-        $conditionIsNumeric = strpos($condition, '"') === false;
-
-        // Loop through arguments
-        $aCount = 0;
-        foreach ($aArgs as $key => $arg) {
-            if (!is_numeric($arg)) {
-                if ($conditionIsNumeric) {
-                    continue;
-                }
-                $arg = Calculation::wrapResult(strtoupper($arg));
-            } elseif (!$conditionIsNumeric) {
-                continue;
-            }
-            $testCondition = '=' . $arg . $condition;
-            if (Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                $returnValue += $averageArgs[$key];
-                ++$aCount;
-            }
-        }
-
-        if ($aCount > 0) {
-            return $returnValue / $aCount;
-        }
-
-        return Functions::DIV0();
+        return Conditional::AVERAGEIF($range, $condition, $averageRange);
     }
 
     /**
@@ -750,44 +115,31 @@ class Statistical
      *
      * Returns the beta distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Beta class instead
+     * @see Statistical\Distributions\Beta::distribution()
+     *
      * @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
+     * @return array|float|string
      */
     public static function BETADIST($value, $alpha, $beta, $rMin = 0, $rMax = 1)
     {
-        $value = Functions::flattenSingleValue($value);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-        $rMin = Functions::flattenSingleValue($rMin);
-        $rMax = Functions::flattenSingleValue($rMax);
-
-        if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-            if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
-                return Functions::NAN();
-            }
-            if ($rMin > $rMax) {
-                $tmp = $rMin;
-                $rMin = $rMax;
-                $rMax = $tmp;
-            }
-            $value -= $rMin;
-            $value /= ($rMax - $rMin);
-
-            return self::incompleteBeta($value, $alpha, $beta);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Beta::distribution($value, $alpha, $beta, $rMin, $rMax);
     }
 
     /**
      * BETAINV.
      *
-     * Returns the inverse of the beta distribution.
+     * Returns the inverse of the Beta distribution.
+     *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\Beta class instead
+     * @see Statistical\Distributions\Beta::inverse()
      *
      * @param float $probability Probability at which you want to evaluate the distribution
      * @param float $alpha Parameter to the distribution
@@ -795,48 +147,11 @@ class Statistical
      * @param float $rMin Minimum value
      * @param float $rMax Maximum value
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function BETAINV($probability, $alpha, $beta, $rMin = 0, $rMax = 1)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-        $rMin = Functions::flattenSingleValue($rMin);
-        $rMax = Functions::flattenSingleValue($rMax);
-
-        if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-            if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0) || ($probability > 1)) {
-                return Functions::NAN();
-            }
-            if ($rMin > $rMax) {
-                $tmp = $rMin;
-                $rMin = $rMax;
-                $rMax = $tmp;
-            }
-            $a = 0;
-            $b = 2;
-
-            $i = 0;
-            while ((($b - $a) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
-                $guess = ($a + $b) / 2;
-                $result = self::BETADIST($guess, $alpha, $beta);
-                if (($result == $probability) || ($result == 0)) {
-                    $b = $a;
-                } elseif ($result > $probability) {
-                    $b = $guess;
-                } else {
-                    $a = $guess;
-                }
-            }
-            if ($i == self::MAX_ITERATIONS) {
-                return Functions::NA();
-            }
-
-            return round($rMin + $guess * ($rMax - $rMin), 12);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Beta::inverse($probability, $alpha, $beta, $rMin, $rMax);
     }
 
     /**
@@ -848,43 +163,20 @@ class Statistical
      *        experiment. For example, BINOMDIST can calculate the probability that two of the next three
      *        babies born are male.
      *
-     * @param float $value Number of successes in trials
-     * @param float $trials Number of trials
-     * @param float $probability Probability of success on each trial
-     * @param bool $cumulative
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Binomial class instead
+     * @see Statistical\Distributions\Binomial::distribution()
      *
-     * @return float|string
+     * @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 array|float|string
      */
     public static function BINOMDIST($value, $trials, $probability, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $trials = Functions::flattenSingleValue($trials);
-        $probability = Functions::flattenSingleValue($probability);
-
-        if ((is_numeric($value)) && (is_numeric($trials)) && (is_numeric($probability))) {
-            $value = floor($value);
-            $trials = floor($trials);
-            if (($value < 0) || ($value > $trials)) {
-                return Functions::NAN();
-            }
-            if (($probability < 0) || ($probability > 1)) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    $summer = 0;
-                    for ($i = 0; $i <= $value; ++$i) {
-                        $summer += MathTrig::COMBIN($trials, $i) * pow($probability, $i) * pow(1 - $probability, $trials - $i);
-                    }
-
-                    return $summer;
-                }
-
-                return MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value);
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Binomial::distribution($value, $trials, $probability, $cumulative);
     }
 
     /**
@@ -892,33 +184,18 @@ class Statistical
      *
      * Returns the one-tailed probability of the chi-squared distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the distributionRightTail() method in the Statistical\Distributions\ChiSquared class instead
+     * @see Statistical\Distributions\ChiSquared::distributionRightTail()
+     *
      * @param float $value Value for the function
      * @param float $degrees degrees of freedom
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function CHIDIST($value, $degrees)
     {
-        $value = Functions::flattenSingleValue($value);
-        $degrees = Functions::flattenSingleValue($degrees);
-
-        if ((is_numeric($value)) && (is_numeric($degrees))) {
-            $degrees = floor($degrees);
-            if ($degrees < 1) {
-                return Functions::NAN();
-            }
-            if ($value < 0) {
-                if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                    return 1;
-                }
-
-                return Functions::NAN();
-            }
-
-            return 1 - (self::incompleteGamma($degrees / 2, $value / 2) / self::gamma($degrees / 2));
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\ChiSquared::distributionRightTail($value, $degrees);
     }
 
     /**
@@ -926,59 +203,18 @@ class Statistical
      *
      * Returns the one-tailed probability of the chi-squared distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the inverseRightTail() method in the Statistical\Distributions\ChiSquared class instead
+     * @see Statistical\Distributions\ChiSquared::inverseRightTail()
+     *
      * @param float $probability Probability for the function
      * @param float $degrees degrees of freedom
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function CHIINV($probability, $degrees)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $degrees = Functions::flattenSingleValue($degrees);
-
-        if ((is_numeric($probability)) && (is_numeric($degrees))) {
-            $degrees = floor($degrees);
-
-            $xLo = 100;
-            $xHi = 0;
-
-            $x = $xNew = 1;
-            $dx = 1;
-            $i = 0;
-
-            while ((abs($dx) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
-                // Apply Newton-Raphson step
-                $result = 1 - (self::incompleteGamma($degrees / 2, $x / 2) / self::gamma($degrees / 2));
-                $error = $result - $probability;
-                if ($error == 0.0) {
-                    $dx = 0;
-                } elseif ($error < 0.0) {
-                    $xLo = $x;
-                } else {
-                    $xHi = $x;
-                }
-                // Avoid division by zero
-                if ($result != 0.0) {
-                    $dx = $error / $result;
-                    $xNew = $x - $dx;
-                }
-                // If the NR fails to converge (which for example may be the
-                // case if the initial guess is too rough) we apply a bisection
-                // step to determine a more narrow interval around the root.
-                if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-                    $xNew = ($xLo + $xHi) / 2;
-                    $dx = $xNew - $x;
-                }
-                $x = $xNew;
-            }
-            if ($i == self::MAX_ITERATIONS) {
-                return Functions::NA();
-            }
-
-            return round($x, 12);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\ChiSquared::inverseRightTail($probability, $degrees);
     }
 
     /**
@@ -986,31 +222,19 @@ class Statistical
      *
      * Returns the confidence interval for a population mean
      *
+     * @deprecated 1.18.0
+     *      Use the CONFIDENCE() method in the Statistical\Confidence class instead
+     * @see Statistical\Confidence::CONFIDENCE()
+     *
      * @param float $alpha
      * @param float $stdDev Standard Deviation
      * @param float $size
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function CONFIDENCE($alpha, $stdDev, $size)
     {
-        $alpha = Functions::flattenSingleValue($alpha);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-        $size = Functions::flattenSingleValue($size);
-
-        if ((is_numeric($alpha)) && (is_numeric($stdDev)) && (is_numeric($size))) {
-            $size = floor($size);
-            if (($alpha <= 0) || ($alpha >= 1)) {
-                return Functions::NAN();
-            }
-            if (($stdDev <= 0) || ($size < 1)) {
-                return Functions::NAN();
-            }
-
-            return self::NORMSINV(1 - $alpha / 2) * $stdDev / sqrt($size);
-        }
-
-        return Functions::VALUE();
+        return Confidence::CONFIDENCE($alpha, $stdDev, $size);
     }
 
     /**
@@ -1018,6 +242,10 @@ class Statistical
      *
      * Returns covariance, the average of the products of deviations for each data point pair.
      *
+     * @deprecated 1.18.0
+     *      Use the CORREL() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::CORREL()
+     *
      * @param mixed $yValues array of mixed Data Series Y
      * @param null|mixed $xValues array of mixed Data Series X
      *
@@ -1025,24 +253,7 @@ class Statistical
      */
     public static function CORREL($yValues, $xValues = null)
     {
-        if (($xValues === null) || (!is_array($yValues)) || (!is_array($xValues))) {
-            return Functions::VALUE();
-        }
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getCorrelation();
+        return Trends::CORREL($xValues, $yValues);
     }
 
     /**
@@ -1053,7 +264,9 @@ class Statistical
      * Excel Function:
      *        COUNT(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the COUNT() method in the Statistical\Counts class instead
+     * @see Statistical\Counts::COUNT()
      *
      * @param mixed ...$args Data values
      *
@@ -1061,21 +274,7 @@ class Statistical
      */
     public static function COUNT(...$args)
     {
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed($args);
-        foreach ($aArgs as $k => $arg) {
-            $arg = self::testAcceptedBoolean($arg, $k);
-            // 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)) {
-                ++$returnValue;
-            }
-        }
-
-        return $returnValue;
+        return Counts::COUNT(...$args);
     }
 
     /**
@@ -1086,7 +285,9 @@ class Statistical
      * Excel Function:
      *        COUNTA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the COUNTA() method in the Statistical\Counts class instead
+     * @see Statistical\Counts::COUNTA()
      *
      * @param mixed ...$args Data values
      *
@@ -1094,18 +295,7 @@ class Statistical
      */
     public static function COUNTA(...$args)
     {
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed($args);
-        foreach ($aArgs as $k => $arg) {
-            // Nulls are counted if literals, but not if cell values
-            if ($arg !== null || (!Functions::isCellValue($k))) {
-                ++$returnValue;
-            }
-        }
-
-        return $returnValue;
+        return Counts::COUNTA(...$args);
     }
 
     /**
@@ -1116,26 +306,17 @@ class Statistical
      * Excel Function:
      *        COUNTBLANK(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the COUNTBLANK() method in the Statistical\Counts class instead
+     * @see Statistical\Counts::COUNTBLANK()
      *
-     * @param mixed ...$args Data values
+     * @param mixed $range Data values
      *
      * @return int
      */
-    public static function COUNTBLANK(...$args)
+    public static function COUNTBLANK($range)
     {
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a blank cell?
-            if (($arg === null) || ((is_string($arg)) && ($arg == ''))) {
-                ++$returnValue;
-            }
-        }
-
-        return $returnValue;
+        return Counts::COUNTBLANK($range);
     }
 
     /**
@@ -1144,40 +325,20 @@ class Statistical
      * Counts the number of cells that contain numbers within the list of arguments
      *
      * Excel Function:
-     *        COUNTIF(value1[,value2[, ...]],condition)
+     *        COUNTIF(range,condition)
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the COUNTIF() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::COUNTIF()
      *
-     * @param mixed $aArgs Data values
+     * @param mixed $range Data values
      * @param string $condition the criteria that defines which cells will be counted
      *
-     * @return int
+     * @return int|string
      */
-    public static function COUNTIF($aArgs, $condition)
+    public static function COUNTIF($range, $condition)
     {
-        $returnValue = 0;
-
-        $aArgs = Functions::flattenArray($aArgs);
-        $condition = Functions::ifCondition($condition);
-        $conditionIsNumeric = strpos($condition, '"') === false;
-        // Loop through arguments
-        foreach ($aArgs as $arg) {
-            if (!is_numeric($arg)) {
-                if ($conditionIsNumeric) {
-                    continue;
-                }
-                $arg = Calculation::wrapResult(strtoupper($arg));
-            } elseif (!$conditionIsNumeric) {
-                continue;
-            }
-            $testCondition = '=' . $arg . $condition;
-            if (Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                // Is it a value within our criteria
-                ++$returnValue;
-            }
-        }
-
-        return $returnValue;
+        return Conditional::COUNTIF($range, $condition);
     }
 
     /**
@@ -1188,68 +349,17 @@ class Statistical
      * Excel Function:
      *        COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the COUNTIFS() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::COUNTIFS()
      *
-     * @param mixed $args Criterias
+     * @param mixed $args Pairs of Ranges and Criteria
      *
-     * @return int
+     * @return int|string
      */
     public static function COUNTIFS(...$args)
     {
-        $arrayList = $args;
-
-        // Return value
-        $returnValue = 0;
-
-        if (empty($arrayList)) {
-            return $returnValue;
-        }
-
-        $aArgsArray = [];
-        $conditions = [];
-
-        while (count($arrayList) > 0) {
-            $aArgsArray[] = Functions::flattenArray(array_shift($arrayList));
-            $conditions[] = Functions::ifCondition(array_shift($arrayList));
-        }
-
-        // Loop through each arg and see if arguments and conditions are true
-        foreach (array_keys($aArgsArray[0]) as $index) {
-            $valid = true;
-
-            foreach ($conditions as $cidx => $condition) {
-                $conditionIsNumeric = strpos($condition, '"') === false;
-                $arg = $aArgsArray[$cidx][$index];
-
-                // Loop through arguments
-                if (!is_numeric($arg)) {
-                    if ($conditionIsNumeric) {
-                        $valid = false;
-
-                        break; // if false found, don't need to check other conditions
-                    }
-                    $arg = Calculation::wrapResult(strtoupper($arg));
-                } elseif (!$conditionIsNumeric) {
-                    $valid = false;
-
-                    break; // if false found, don't need to check other conditions
-                }
-                $testCondition = '=' . $arg . $condition;
-                if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                    // Is not a value within our criteria
-                    $valid = false;
-
-                    break; // if false found, don't need to check other conditions
-                }
-            }
-
-            if ($valid) {
-                ++$returnValue;
-            }
-        }
-
-        // Return
-        return $returnValue;
+        return Conditional::COUNTIFS(...$args);
     }
 
     /**
@@ -1257,6 +367,10 @@ class Statistical
      *
      * Returns covariance, the average of the products of deviations for each data point pair.
      *
+     * @deprecated 1.18.0
+     *      Use the COVAR() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::COVAR()
+     *
      * @param mixed $yValues array of mixed Data Series Y
      * @param mixed $xValues array of mixed Data Series X
      *
@@ -1264,21 +378,7 @@ class Statistical
      */
     public static function COVAR($yValues, $xValues)
     {
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getCovariance();
+        return Trends::COVAR($yValues, $xValues);
     }
 
     /**
@@ -1289,123 +389,19 @@ class Statistical
      *
      * See https://support.microsoft.com/en-us/help/828117/ for details of the algorithm used
      *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\Binomial class instead
+     * @see Statistical\Distributions\Binomial::inverse()
+     *
      * @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
-     *
-     * @todo    Warning. This implementation differs from the algorithm detailed on the MS
-     *            web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
-     *            This eliminates a potential endless loop error, but may have an adverse affect on the
-     *            accuracy of the function (although all my tests have so far returned correct results).
+     * @return array|int|string
      */
     public static function CRITBINOM($trials, $probability, $alpha)
     {
-        $trials = floor(Functions::flattenSingleValue($trials));
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
-
-        if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
-            $trials = (int) $trials;
-            if ($trials < 0) {
-                return Functions::NAN();
-            } elseif (($probability < 0.0) || ($probability > 1.0)) {
-                return Functions::NAN();
-            } elseif (($alpha < 0.0) || ($alpha > 1.0)) {
-                return Functions::NAN();
-            }
-
-            if ($alpha <= 0.5) {
-                $t = sqrt(log(1 / ($alpha * $alpha)));
-                $trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
-            } else {
-                $t = sqrt(log(1 / pow(1 - $alpha, 2)));
-                $trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
-            }
-
-            $Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
-            if ($Guess < 0) {
-                $Guess = 0;
-            } elseif ($Guess > $trials) {
-                $Guess = $trials;
-            }
-
-            $TotalUnscaledProbability = $UnscaledPGuess = $UnscaledCumPGuess = 0.0;
-            $EssentiallyZero = 10e-12;
-
-            $m = floor($trials * $probability);
-            ++$TotalUnscaledProbability;
-            if ($m == $Guess) {
-                ++$UnscaledPGuess;
-            }
-            if ($m <= $Guess) {
-                ++$UnscaledCumPGuess;
-            }
-
-            $PreviousValue = 1;
-            $Done = false;
-            $k = $m + 1;
-            while ((!$Done) && ($k <= $trials)) {
-                $CurrentValue = $PreviousValue * ($trials - $k + 1) * $probability / ($k * (1 - $probability));
-                $TotalUnscaledProbability += $CurrentValue;
-                if ($k == $Guess) {
-                    $UnscaledPGuess += $CurrentValue;
-                }
-                if ($k <= $Guess) {
-                    $UnscaledCumPGuess += $CurrentValue;
-                }
-                if ($CurrentValue <= $EssentiallyZero) {
-                    $Done = true;
-                }
-                $PreviousValue = $CurrentValue;
-                ++$k;
-            }
-
-            $PreviousValue = 1;
-            $Done = false;
-            $k = $m - 1;
-            while ((!$Done) && ($k >= 0)) {
-                $CurrentValue = $PreviousValue * $k + 1 * (1 - $probability) / (($trials - $k) * $probability);
-                $TotalUnscaledProbability += $CurrentValue;
-                if ($k == $Guess) {
-                    $UnscaledPGuess += $CurrentValue;
-                }
-                if ($k <= $Guess) {
-                    $UnscaledCumPGuess += $CurrentValue;
-                }
-                if ($CurrentValue <= $EssentiallyZero) {
-                    $Done = true;
-                }
-                $PreviousValue = $CurrentValue;
-                --$k;
-            }
-
-            $PGuess = $UnscaledPGuess / $TotalUnscaledProbability;
-            $CumPGuess = $UnscaledCumPGuess / $TotalUnscaledProbability;
-
-            $CumPGuessMinus1 = $CumPGuess - 1;
-
-            while (true) {
-                if (($CumPGuessMinus1 < $alpha) && ($CumPGuess >= $alpha)) {
-                    return $Guess;
-                } elseif (($CumPGuessMinus1 < $alpha) && ($CumPGuess < $alpha)) {
-                    $PGuessPlus1 = $PGuess * ($trials - $Guess) * $probability / $Guess / (1 - $probability);
-                    $CumPGuessMinus1 = $CumPGuess;
-                    $CumPGuess = $CumPGuess + $PGuessPlus1;
-                    $PGuess = $PGuessPlus1;
-                    ++$Guess;
-                } elseif (($CumPGuessMinus1 >= $alpha) && ($CumPGuess >= $alpha)) {
-                    $PGuessMinus1 = $PGuess * $Guess * (1 - $probability) / ($trials - $Guess + 1) / $probability;
-                    $CumPGuess = $CumPGuessMinus1;
-                    $CumPGuessMinus1 = $CumPGuessMinus1 - $PGuess;
-                    $PGuess = $PGuessMinus1;
-                    --$Guess;
-                }
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Binomial::inverse($trials, $probability, $alpha);
     }
 
     /**
@@ -1416,7 +412,9 @@ class Statistical
      * Excel Function:
      *        DEVSQ(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the sumSquares() method in the Statistical\Deviations class instead
+     * @see Statistical\Deviations::sumSquares()
      *
      * @param mixed ...$args Data values
      *
@@ -1424,40 +422,7 @@ class Statistical
      */
     public static function DEVSQ(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        // Return value
-        $returnValue = null;
-
-        $aMean = self::AVERAGE($aArgs);
-        if ($aMean != Functions::DIV0()) {
-            $aCount = -1;
-            foreach ($aArgs as $k => $arg) {
-                // Is it a numeric value?
-                if ((is_bool($arg)) &&
-                    ((!Functions::isCellValue($k)) ||
-                    (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
-                    $arg = (int) $arg;
-                }
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    if ($returnValue === null) {
-                        $returnValue = pow(($arg - $aMean), 2);
-                    } else {
-                        $returnValue += pow(($arg - $aMean), 2);
-                    }
-                    ++$aCount;
-                }
-            }
-
-            // Return
-            if ($returnValue === null) {
-                return Functions::NAN();
-            }
-
-            return $returnValue;
-        }
-
-        return self::NA();
+        return Statistical\Deviations::sumSquares(...$args);
     }
 
     /**
@@ -1467,32 +432,44 @@ class Statistical
      *        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
+     *      Use the distribution() method in the Statistical\Distributions\Exponential class instead
+     * @see Statistical\Distributions\Exponential::distribution()
+     *
      * @param float $value Value of the function
      * @param float $lambda The parameter value
      * @param bool $cumulative
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function EXPONDIST($value, $lambda, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $lambda = Functions::flattenSingleValue($lambda);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        return Statistical\Distributions\Exponential::distribution($value, $lambda, $cumulative);
+    }
 
-        if ((is_numeric($value)) && (is_numeric($lambda))) {
-            if (($value < 0) || ($lambda < 0)) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    return 1 - exp(0 - $value * $lambda);
-                }
-
-                return $lambda * exp(0 - $value * $lambda);
-            }
-        }
-
-        return Functions::VALUE();
+    /**
+     * 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
+     *      Use the distribution() method in the Statistical\Distributions\F class instead
+     * @see Statistical\Distributions\F::distribution()
+     *
+     * @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 array|float|string
+     */
+    public static function FDIST2($value, $u, $v, $cumulative)
+    {
+        return Statistical\Distributions\F::distribution($value, $u, $v, $cumulative);
     }
 
     /**
@@ -1502,23 +479,17 @@ class Statistical
      *        is normally distributed rather than skewed. Use this function to perform hypothesis
      *        testing on the correlation coefficient.
      *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Fisher class instead
+     * @see Statistical\Distributions\Fisher::distribution()
+     *
      * @param float $value
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function FISHER($value)
     {
-        $value = Functions::flattenSingleValue($value);
-
-        if (is_numeric($value)) {
-            if (($value <= -1) || ($value >= 1)) {
-                return Functions::NAN();
-            }
-
-            return 0.5 * log((1 + $value) / (1 - $value));
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Fisher::distribution($value);
     }
 
     /**
@@ -1528,19 +499,17 @@ class Statistical
      *        analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
      *        FISHERINV(y) = x.
      *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\Fisher class instead
+     * @see Statistical\Distributions\Fisher::inverse()
+     *
      * @param float $value
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function FISHERINV($value)
     {
-        $value = Functions::flattenSingleValue($value);
-
-        if (is_numeric($value)) {
-            return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Fisher::inverse($value);
     }
 
     /**
@@ -1548,32 +517,37 @@ class Statistical
      *
      * 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
+     *      Use the FORECAST() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::FORECAST()
+     *
      * @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
+     * @return array|bool|float|string
      */
     public static function FORECAST($xValue, $yValues, $xValues)
     {
-        $xValue = Functions::flattenSingleValue($xValue);
-        if (!is_numeric($xValue)) {
-            return Functions::VALUE();
-        } elseif (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
+        return Trends::FORECAST($xValue, $yValues, $xValues);
+    }
 
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getValueOfYForX($xValue);
+    /**
+     * GAMMA.
+     *
+     * Returns the gamma function value.
+     *
+     * @deprecated 1.18.0
+     *      Use the gamma() method in the Statistical\Distributions\Gamma class instead
+     * @see Statistical\Distributions\Gamma::gamma()
+     *
+     * @param float $value
+     *
+     * @return array|float|string The result, or a string containing an error
+     */
+    public static function GAMMAFunction($value)
+    {
+        return Statistical\Distributions\Gamma::gamma($value);
     }
 
     /**
@@ -1581,96 +555,40 @@ class Statistical
      *
      * Returns the gamma distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Gamma class instead
+     * @see Statistical\Distributions\Gamma::distribution()
+     *
      * @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
+     * @return array|float|string
      */
     public static function GAMMADIST($value, $a, $b, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $a = Functions::flattenSingleValue($a);
-        $b = Functions::flattenSingleValue($b);
-
-        if ((is_numeric($value)) && (is_numeric($a)) && (is_numeric($b))) {
-            if (($value < 0) || ($a <= 0) || ($b <= 0)) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    return self::incompleteGamma($a, $value / $b) / self::gamma($a);
-                }
-
-                return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a - 1) * exp(0 - ($value / $b));
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Gamma::distribution($value, $a, $b, $cumulative);
     }
 
     /**
      * GAMMAINV.
      *
-     * Returns the inverse of the beta distribution.
+     * Returns the inverse of the Gamma distribution.
+     *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\Gamma class instead
+     * @see Statistical\Distributions\Gamma::inverse()
      *
      * @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
+     * @return array|float|string
      */
     public static function GAMMAINV($probability, $alpha, $beta)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-
-        if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-            if (($alpha <= 0) || ($beta <= 0) || ($probability < 0) || ($probability > 1)) {
-                return Functions::NAN();
-            }
-
-            $xLo = 0;
-            $xHi = $alpha * $beta * 5;
-
-            $x = $xNew = 1;
-            $error = $pdf = 0;
-            $dx = 1024;
-            $i = 0;
-
-            while ((abs($dx) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
-                // Apply Newton-Raphson step
-                $error = self::GAMMADIST($x, $alpha, $beta, true) - $probability;
-                if ($error < 0.0) {
-                    $xLo = $x;
-                } else {
-                    $xHi = $x;
-                }
-                $pdf = self::GAMMADIST($x, $alpha, $beta, false);
-                // Avoid division by zero
-                if ($pdf != 0.0) {
-                    $dx = $error / $pdf;
-                    $xNew = $x - $dx;
-                }
-                // If the NR fails to converge (which for example may be the
-                // case if the initial guess is too rough) we apply a bisection
-                // step to determine a more narrow interval around the root.
-                if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
-                    $xNew = ($xLo + $xHi) / 2;
-                    $dx = $xNew - $x;
-                }
-                $x = $xNew;
-            }
-            if ($i == self::MAX_ITERATIONS) {
-                return Functions::NA();
-            }
-
-            return $x;
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Gamma::inverse($probability, $alpha, $beta);
     }
 
     /**
@@ -1678,23 +596,36 @@ class Statistical
      *
      * Returns the natural logarithm of the gamma function.
      *
+     * @deprecated 1.18.0
+     *      Use the ln() method in the Statistical\Distributions\Gamma class instead
+     * @see Statistical\Distributions\Gamma::ln()
+     *
      * @param float $value
      *
-     * @return float|string
+     * @return array|float|string
      */
     public static function GAMMALN($value)
     {
-        $value = Functions::flattenSingleValue($value);
+        return Statistical\Distributions\Gamma::ln($value);
+    }
 
-        if (is_numeric($value)) {
-            if ($value <= 0) {
-                return Functions::NAN();
-            }
-
-            return log(self::gamma($value));
-        }
-
-        return Functions::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
+     *      Use the gauss() method in the Statistical\Distributions\StandardNormal class instead
+     * @see Statistical\Distributions\StandardNormal::gauss()
+     *
+     * @param float $value
+     *
+     * @return array|float|string The result, or a string containing an error
+     */
+    public static function GAUSS($value)
+    {
+        return Statistical\Distributions\StandardNormal::gauss($value);
     }
 
     /**
@@ -1707,7 +638,9 @@ class Statistical
      * Excel Function:
      *        GEOMEAN(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the geometric() method in the Statistical\Averages\Mean class instead
+     * @see Statistical\Averages\Mean::geometric()
      *
      * @param mixed ...$args Data values
      *
@@ -1715,17 +648,7 @@ class Statistical
      */
     public static function GEOMEAN(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        $aMean = MathTrig::PRODUCT($aArgs);
-        if (is_numeric($aMean) && ($aMean > 0)) {
-            $aCount = self::COUNT($aArgs);
-            if (self::MIN($aArgs) > 0) {
-                return pow($aMean, (1 / $aCount));
-            }
-        }
-
-        return Functions::NAN();
+        return Statistical\Averages\Mean::geometric(...$args);
     }
 
     /**
@@ -1733,31 +656,20 @@ class Statistical
      *
      * Returns values along a predicted exponential Trend
      *
+     * @deprecated 1.18.0
+     *      Use the GROWTH() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::GROWTH()
+     *
      * @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 array of float
+     * @return float[]
      */
     public static function GROWTH($yValues, $xValues = [], $newValues = [], $const = true)
     {
-        $yValues = Functions::flattenArray($yValues);
-        $xValues = Functions::flattenArray($xValues);
-        $newValues = Functions::flattenArray($newValues);
-        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
-
-        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
-        if (empty($newValues)) {
-            $newValues = $bestFitExponential->getXValues();
-        }
-
-        $returnArray = [];
-        foreach ($newValues as $xValue) {
-            $returnArray[0][] = $bestFitExponential->getValueOfYForX($xValue);
-        }
-
-        return $returnArray;
+        return Trends::GROWTH($yValues, $xValues, $newValues, $const);
     }
 
     /**
@@ -1769,7 +681,9 @@ class Statistical
      * Excel Function:
      *        HARMEAN(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the harmonic() method in the Statistical\Averages\Mean class instead
+     * @see Statistical\Averages\Mean::harmonic()
      *
      * @param mixed ...$args Data values
      *
@@ -1777,32 +691,7 @@ class Statistical
      */
     public static function HARMEAN(...$args)
     {
-        // Return value
-        $returnValue = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        if (self::MIN($aArgs) < 0) {
-            return Functions::NAN();
-        }
-        $aCount = 0;
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                if ($arg <= 0) {
-                    return Functions::NAN();
-                }
-                $returnValue += (1 / $arg);
-                ++$aCount;
-            }
-        }
-
-        // Return
-        if ($aCount > 0) {
-            return 1 / ($returnValue / $aCount);
-        }
-
-        return Functions::NA();
+        return Statistical\Averages\Mean::harmonic(...$args);
     }
 
     /**
@@ -1811,37 +700,25 @@ class Statistical
      * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
      * sample successes, given the sample size, population successes, and population size.
      *
-     * @param float $sampleSuccesses Number of successes in the sample
-     * @param float $sampleNumber Size of the sample
-     * @param float $populationSuccesses Number of successes in the population
-     * @param float $populationNumber Population size
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\HyperGeometric class instead
+     * @see Statistical\Distributions\HyperGeometric::distribution()
      *
-     * @return float|string
+     * @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 array|float|string
      */
     public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber)
     {
-        $sampleSuccesses = floor(Functions::flattenSingleValue($sampleSuccesses));
-        $sampleNumber = floor(Functions::flattenSingleValue($sampleNumber));
-        $populationSuccesses = floor(Functions::flattenSingleValue($populationSuccesses));
-        $populationNumber = floor(Functions::flattenSingleValue($populationNumber));
-
-        if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
-            if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
-                return Functions::NAN();
-            }
-            if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
-                return Functions::NAN();
-            }
-            if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
-                return Functions::NAN();
-            }
-
-            return MathTrig::COMBIN($populationSuccesses, $sampleSuccesses) *
-                   MathTrig::COMBIN($populationNumber - $populationSuccesses, $sampleNumber - $sampleSuccesses) /
-                   MathTrig::COMBIN($populationNumber, $sampleNumber);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\HyperGeometric::distribution(
+            $sampleSuccesses,
+            $sampleNumber,
+            $populationSuccesses,
+            $populationNumber
+        );
     }
 
     /**
@@ -1849,6 +726,10 @@ class Statistical
      *
      * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
      *
+     * @deprecated 1.18.0
+     *      Use the INTERCEPT() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::INTERCEPT()
+     *
      * @param mixed[] $yValues Data Series Y
      * @param mixed[] $xValues Data Series X
      *
@@ -1856,21 +737,7 @@ class Statistical
      */
     public static function INTERCEPT($yValues, $xValues)
     {
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getIntersect();
+        return Trends::INTERCEPT($yValues, $xValues);
     }
 
     /**
@@ -1881,38 +748,17 @@ class Statistical
      * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
      * relatively flat distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the kurtosis() method in the Statistical\Deviations class instead
+     * @see Statistical\Deviations::kurtosis()
+     *
      * @param array ...$args Data Series
      *
      * @return float|string
      */
     public static function KURT(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-        $mean = self::AVERAGE($aArgs);
-        $stdDev = self::STDEV($aArgs);
-
-        if ($stdDev > 0) {
-            $count = $summer = 0;
-            // Loop through arguments
-            foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
-                } else {
-                    // Is it a numeric value?
-                    if ((is_numeric($arg)) && (!is_string($arg))) {
-                        $summer += pow((($arg - $mean) / $stdDev), 4);
-                        ++$count;
-                    }
-                }
-            }
-
-            // Return
-            if ($count > 3) {
-                return $summer * ($count * ($count + 1) / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * pow($count - 1, 2) / (($count - 2) * ($count - 3)));
-            }
-        }
-
-        return Functions::DIV0();
+        return Statistical\Deviations::kurtosis(...$args);
     }
 
     /**
@@ -1924,39 +770,17 @@ class Statistical
      * Excel Function:
      *        LARGE(value1[,value2[, ...]],entry)
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the large() method in the Statistical\Size class instead
+     * @see Statistical\Size::large()
      *
      * @param mixed $args Data values
-     * @param int $entry Position (ordered from the largest) in the array or range of data to return
      *
      * @return float|string The result, or a string containing an error
      */
     public static function LARGE(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $entry = floor(array_pop($aArgs));
-
-        if ((is_numeric($entry)) && (!is_string($entry))) {
-            $mArgs = [];
-            foreach ($aArgs as $arg) {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $mArgs[] = $arg;
-                }
-            }
-            $count = self::COUNT($mArgs);
-            $entry = floor(--$entry);
-            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-                return Functions::NAN();
-            }
-            rsort($mArgs);
-
-            return $mArgs[$entry];
-        }
-
-        return Functions::VALUE();
+        return Statistical\Size::large(...$args);
     }
 
     /**
@@ -1965,6 +789,10 @@ class Statistical
      * 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
+     *      Use the LINEST() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::LINEST()
+     *
      * @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
@@ -1974,48 +802,7 @@ class Statistical
      */
     public static function LINEST($yValues, $xValues = null, $const = true, $stats = false)
     {
-        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
-        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
-        if ($xValues === null) {
-            $xValues = range(1, count(Functions::flattenArray($yValues)));
-        }
-
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return 0;
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
-        if ($stats) {
-            return [
-                [
-                    $bestFitLinear->getSlope(),
-                    $bestFitLinear->getSlopeSE(),
-                    $bestFitLinear->getGoodnessOfFit(),
-                    $bestFitLinear->getF(),
-                    $bestFitLinear->getSSRegression(),
-                ],
-                [
-                    $bestFitLinear->getIntersect(),
-                    $bestFitLinear->getIntersectSE(),
-                    $bestFitLinear->getStdevOfResiduals(),
-                    $bestFitLinear->getDFResiduals(),
-                    $bestFitLinear->getSSResiduals(),
-                ],
-            ];
-        }
-
-        return [
-                $bestFitLinear->getSlope(),
-                $bestFitLinear->getIntersect(),
-            ];
+        return Trends::LINEST($yValues, $xValues, $const, $stats);
     }
 
     /**
@@ -2024,6 +811,10 @@ class Statistical
      * 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
+     *      Use the LOGEST() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::LOGEST()
+     *
      * @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
@@ -2033,54 +824,7 @@ class Statistical
      */
     public static function LOGEST($yValues, $xValues = null, $const = true, $stats = false)
     {
-        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
-        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
-        if ($xValues === null) {
-            $xValues = range(1, count(Functions::flattenArray($yValues)));
-        }
-
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        foreach ($yValues as $value) {
-            if ($value <= 0.0) {
-                return Functions::NAN();
-            }
-        }
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return 1;
-        }
-
-        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
-        if ($stats) {
-            return [
-                [
-                    $bestFitExponential->getSlope(),
-                    $bestFitExponential->getSlopeSE(),
-                    $bestFitExponential->getGoodnessOfFit(),
-                    $bestFitExponential->getF(),
-                    $bestFitExponential->getSSRegression(),
-                ],
-                [
-                    $bestFitExponential->getIntersect(),
-                    $bestFitExponential->getIntersectSE(),
-                    $bestFitExponential->getStdevOfResiduals(),
-                    $bestFitExponential->getDFResiduals(),
-                    $bestFitExponential->getSSResiduals(),
-                ],
-            ];
-        }
-
-        return [
-                $bestFitExponential->getSlope(),
-                $bestFitExponential->getIntersect(),
-            ];
+        return Trends::LOGEST($yValues, $xValues, $const, $stats);
     }
 
     /**
@@ -2088,31 +832,23 @@ class Statistical
      *
      * Returns the inverse of the normal cumulative distribution
      *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\LogNormal class instead
+     * @see Statistical\Distributions\LogNormal::inverse()
+     *
      * @param float $probability
      * @param float $mean
      * @param float $stdDev
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
      *
-     * @todo    Try implementing P J Acklam's refinement algorithm for greater
+     * @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)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-
-        if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-            if (($probability < 0) || ($probability > 1) || ($stdDev <= 0)) {
-                return Functions::NAN();
-            }
-
-            return exp($mean + $stdDev * self::NORMSINV($probability));
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\LogNormal::inverse($probability, $mean, $stdDev);
     }
 
     /**
@@ -2121,27 +857,41 @@ class Statistical
      * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
      * with parameters mean and standard_dev.
      *
+     * @deprecated 1.18.0
+     *      Use the cumulative() method in the Statistical\Distributions\LogNormal class instead
+     * @see Statistical\Distributions\LogNormal::cumulative()
+     *
      * @param float $value
      * @param float $mean
      * @param float $stdDev
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
      */
     public static function LOGNORMDIST($value, $mean, $stdDev)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        return Statistical\Distributions\LogNormal::cumulative($value, $mean, $stdDev);
+    }
 
-        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-            if (($value <= 0) || ($stdDev <= 0)) {
-                return Functions::NAN();
-            }
-
-            return self::NORMSDIST((log($value) - $mean) / $stdDev);
-        }
-
-        return Functions::VALUE();
+    /**
+     * LOGNORM.DIST.
+     *
+     * Returns the lognormal distribution of x, where ln(x) is normally distributed
+     * with parameters mean and standard_dev.
+     *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\LogNormal class instead
+     * @see Statistical\Distributions\LogNormal::distribution()
+     *
+     * @param float $value
+     * @param float $mean
+     * @param float $stdDev
+     * @param bool $cumulative
+     *
+     * @return array|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);
     }
 
     /**
@@ -2151,9 +901,11 @@ class Statistical
      *        with negative numbers considered smaller than positive numbers.
      *
      * Excel Function:
-     *        MAX(value1[,value2[, ...]])
+     *        max(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the MAX() method in the Statistical\Maximum class instead
+     * @see Statistical\Maximum::max()
      *
      * @param mixed ...$args Data values
      *
@@ -2161,24 +913,7 @@ class Statistical
      */
     public static function MAX(...$args)
     {
-        $returnValue = null;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                if (($returnValue === null) || ($arg > $returnValue)) {
-                    $returnValue = $arg;
-                }
-            }
-        }
-
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return Maximum::max(...$args);
     }
 
     /**
@@ -2187,9 +922,11 @@ class Statistical
      * Returns the greatest value in a list of arguments, including numbers, text, and logical values
      *
      * Excel Function:
-     *        MAXA(value1[,value2[, ...]])
+     *        maxA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the MAXA() method in the Statistical\Maximum class instead
+     * @see Statistical\Maximum::maxA()
      *
      * @param mixed ...$args Data values
      *
@@ -2197,29 +934,7 @@ class Statistical
      */
     public static function MAXA(...$args)
     {
-        $returnValue = null;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-                if (is_bool($arg)) {
-                    $arg = (int) $arg;
-                } elseif (is_string($arg)) {
-                    $arg = 0;
-                }
-                if (($returnValue === null) || ($arg > $returnValue)) {
-                    $returnValue = $arg;
-                }
-            }
-        }
-
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return Maximum::maxA(...$args);
     }
 
     /**
@@ -2230,55 +945,17 @@ class Statistical
      * Excel Function:
      *        MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the MAXIFS() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::MAXIFS()
      *
      * @param mixed $args Data range and criterias
      *
-     * @return float
+     * @return null|float|string
      */
     public static function MAXIFS(...$args)
     {
-        $arrayList = $args;
-
-        // Return value
-        $returnValue = null;
-
-        $maxArgs = Functions::flattenArray(array_shift($arrayList));
-        $aArgsArray = [];
-        $conditions = [];
-
-        while (count($arrayList) > 0) {
-            $aArgsArray[] = Functions::flattenArray(array_shift($arrayList));
-            $conditions[] = Functions::ifCondition(array_shift($arrayList));
-        }
-
-        // Loop through each arg and see if arguments and conditions are true
-        foreach ($maxArgs as $index => $value) {
-            $valid = true;
-
-            foreach ($conditions as $cidx => $condition) {
-                $arg = $aArgsArray[$cidx][$index];
-
-                // Loop through arguments
-                if (!is_numeric($arg)) {
-                    $arg = Calculation::wrapResult(strtoupper($arg));
-                }
-                $testCondition = '=' . $arg . $condition;
-                if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                    // Is not a value within our criteria
-                    $valid = false;
-
-                    break; // if false found, don't need to check other conditions
-                }
-            }
-
-            if ($valid) {
-                $returnValue = $returnValue === null ? $value : max($value, $returnValue);
-            }
-        }
-
-        // Return
-        return $returnValue;
+        return Conditional::MAXIFS(...$args);
     }
 
     /**
@@ -2289,7 +966,9 @@ class Statistical
      * Excel Function:
      *        MEDIAN(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the median() method in the Statistical\Averages class instead
+     * @see Statistical\Averages::median()
      *
      * @param mixed ...$args Data values
      *
@@ -2297,31 +976,7 @@ class Statistical
      */
     public static function MEDIAN(...$args)
     {
-        $returnValue = Functions::NAN();
-
-        $mArgs = [];
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $mArgs[] = $arg;
-            }
-        }
-
-        $mValueCount = count($mArgs);
-        if ($mValueCount > 0) {
-            sort($mArgs, SORT_NUMERIC);
-            $mValueCount = $mValueCount / 2;
-            if ($mValueCount == floor($mValueCount)) {
-                $returnValue = ($mArgs[$mValueCount--] + $mArgs[$mValueCount]) / 2;
-            } else {
-                $mValueCount = floor($mValueCount);
-                $returnValue = $mArgs[$mValueCount];
-            }
-        }
-
-        return $returnValue;
+        return Statistical\Averages::median(...$args);
     }
 
     /**
@@ -2333,7 +988,9 @@ class Statistical
      * Excel Function:
      *        MIN(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the min() method in the Statistical\Minimum class instead
+     * @see Statistical\Minimum::min()
      *
      * @param mixed ...$args Data values
      *
@@ -2341,24 +998,7 @@ class Statistical
      */
     public static function MIN(...$args)
     {
-        $returnValue = null;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                if (($returnValue === null) || ($arg < $returnValue)) {
-                    $returnValue = $arg;
-                }
-            }
-        }
-
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return Minimum::min(...$args);
     }
 
     /**
@@ -2369,7 +1009,9 @@ class Statistical
      * Excel Function:
      *        MINA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the minA() method in the Statistical\Minimum class instead
+     * @see Statistical\Minimum::minA()
      *
      * @param mixed ...$args Data values
      *
@@ -2377,29 +1019,7 @@ class Statistical
      */
     public static function MINA(...$args)
     {
-        $returnValue = null;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-                if (is_bool($arg)) {
-                    $arg = (int) $arg;
-                } elseif (is_string($arg)) {
-                    $arg = 0;
-                }
-                if (($returnValue === null) || ($arg < $returnValue)) {
-                    $returnValue = $arg;
-                }
-            }
-        }
-
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return Minimum::minA(...$args);
     }
 
     /**
@@ -2410,93 +1030,17 @@ class Statistical
      * Excel Function:
      *        MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the MINIFS() method in the Statistical\Conditional class instead
+     * @see Statistical\Conditional::MINIFS()
      *
      * @param mixed $args Data range and criterias
      *
-     * @return float
+     * @return null|float|string
      */
     public static function MINIFS(...$args)
     {
-        $arrayList = $args;
-
-        // Return value
-        $returnValue = null;
-
-        $minArgs = Functions::flattenArray(array_shift($arrayList));
-        $aArgsArray = [];
-        $conditions = [];
-
-        while (count($arrayList) > 0) {
-            $aArgsArray[] = Functions::flattenArray(array_shift($arrayList));
-            $conditions[] = Functions::ifCondition(array_shift($arrayList));
-        }
-
-        // Loop through each arg and see if arguments and conditions are true
-        foreach ($minArgs as $index => $value) {
-            $valid = true;
-
-            foreach ($conditions as $cidx => $condition) {
-                $arg = $aArgsArray[$cidx][$index];
-
-                // Loop through arguments
-                if (!is_numeric($arg)) {
-                    $arg = Calculation::wrapResult(strtoupper($arg));
-                }
-                $testCondition = '=' . $arg . $condition;
-                if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-                    // Is not a value within our criteria
-                    $valid = false;
-
-                    break; // if false found, don't need to check other conditions
-                }
-            }
-
-            if ($valid) {
-                $returnValue = $returnValue === null ? $value : min($value, $returnValue);
-            }
-        }
-
-        // Return
-        return $returnValue;
-    }
-
-    //
-    //    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)
-    {
-        $frequencyArray = [];
-        foreach ($data as $datum) {
-            $found = false;
-            foreach ($frequencyArray as $key => $value) {
-                if ((string) $value['value'] == (string) $datum) {
-                    ++$frequencyArray[$key]['frequency'];
-                    $found = true;
-
-                    break;
-                }
-            }
-            if (!$found) {
-                $frequencyArray[] = [
-                    'value' => $datum,
-                    'frequency' => 1,
-                ];
-            }
-        }
-
-        foreach ($frequencyArray as $key => $value) {
-            $frequencyList[$key] = $value['frequency'];
-            $valueList[$key] = $value['value'];
-        }
-        array_multisort($frequencyList, SORT_DESC, $valueList, SORT_ASC, SORT_NUMERIC, $frequencyArray);
-
-        if ($frequencyArray[0]['frequency'] == 1) {
-            return Functions::NA();
-        }
-
-        return $frequencyArray[0]['value'];
+        return Conditional::MINIFS(...$args);
     }
 
     /**
@@ -2507,7 +1051,9 @@ class Statistical
      * Excel Function:
      *        MODE(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the mode() method in the Statistical\Averages class instead
+     * @see Statistical\Averages::mode()
      *
      * @param mixed ...$args Data values
      *
@@ -2515,24 +1061,7 @@ class Statistical
      */
     public static function MODE(...$args)
     {
-        $returnValue = Functions::NA();
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-
-        $mArgs = [];
-        foreach ($aArgs as $arg) {
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $mArgs[] = $arg;
-            }
-        }
-
-        if (!empty($mArgs)) {
-            return self::modeCalc($mArgs);
-        }
-
-        return $returnValue;
+        return Statistical\Averages::mode(...$args);
     }
 
     /**
@@ -2544,34 +1073,19 @@ class Statistical
      *        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.
      *
-     * @param float $failures Number of Failures
-     * @param float $successes Threshold number of Successes
-     * @param float $probability Probability of success on each trial
+     * @deprecated 1.18.0
+     *      Use the negative() method in the Statistical\Distributions\Binomial class instead
+     * @see Statistical\Distributions\Binomial::negative()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $failures Number of Failures
+     * @param mixed $successes Threshold number of Successes
+     * @param mixed $probability Probability of success on each trial
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function NEGBINOMDIST($failures, $successes, $probability)
     {
-        $failures = floor(Functions::flattenSingleValue($failures));
-        $successes = floor(Functions::flattenSingleValue($successes));
-        $probability = Functions::flattenSingleValue($probability);
-
-        if ((is_numeric($failures)) && (is_numeric($successes)) && (is_numeric($probability))) {
-            if (($failures < 0) || ($successes < 1)) {
-                return Functions::NAN();
-            } elseif (($probability < 0) || ($probability > 1)) {
-                return Functions::NAN();
-            }
-            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
-                if (($failures + $successes - 1) <= 0) {
-                    return Functions::NAN();
-                }
-            }
-
-            return (MathTrig::COMBIN($failures + $successes - 1, $successes - 1)) * (pow($probability, $successes)) * (pow(1 - $probability, $failures));
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Binomial::negative($failures, $successes, $probability);
     }
 
     /**
@@ -2581,33 +1095,20 @@ class Statistical
      * function has a very wide range of applications in statistics, including hypothesis
      * testing.
      *
-     * @param float $value
-     * @param float $mean Mean Value
-     * @param float $stdDev Standard Deviation
-     * @param bool $cumulative
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Normal class instead
+     * @see Statistical\Distributions\Normal::distribution()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $value
+     * @param mixed $mean Mean Value
+     * @param mixed $stdDev Standard Deviation
+     * @param mixed $cumulative
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function NORMDIST($value, $mean, $stdDev, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-
-        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-            if ($stdDev < 0) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    return 0.5 * (1 + Engineering::erfVal(($value - $mean) / ($stdDev * sqrt(2))));
-                }
-
-                return (1 / (self::SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean, 2) / (2 * ($stdDev * $stdDev))));
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Normal::distribution($value, $mean, $stdDev, $cumulative);
     }
 
     /**
@@ -2615,30 +1116,19 @@ class Statistical
      *
      * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
      *
-     * @param float $probability
-     * @param float $mean Mean Value
-     * @param float $stdDev Standard Deviation
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\Normal class instead
+     * @see Statistical\Distributions\Normal::inverse()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $probability
+     * @param mixed $mean Mean Value
+     * @param mixed $stdDev Standard Deviation
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function NORMINV($probability, $mean, $stdDev)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-
-        if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-            if (($probability < 0) || ($probability > 1)) {
-                return Functions::NAN();
-            }
-            if ($stdDev < 0) {
-                return Functions::NAN();
-            }
-
-            return (self::inverseNcdf($probability) * $stdDev) + $mean;
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Normal::inverse($probability, $mean, $stdDev);
     }
 
     /**
@@ -2648,15 +1138,38 @@ class Statistical
      * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
      * table of standard normal curve areas.
      *
-     * @param float $value
+     * @deprecated 1.18.0
+     *      Use the cumulative() method in the Statistical\Distributions\StandardNormal class instead
+     * @see Statistical\Distributions\StandardNormal::cumulative()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $value
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function NORMSDIST($value)
     {
-        $value = Functions::flattenSingleValue($value);
+        return Statistical\Distributions\StandardNormal::cumulative($value);
+    }
 
-        return self::NORMDIST($value, 0, 1, true);
+    /**
+     * 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
+     *      Use the distribution() method in the Statistical\Distributions\StandardNormal class instead
+     * @see Statistical\Distributions\StandardNormal::distribution()
+     *
+     * @param mixed $value
+     * @param mixed $cumulative
+     *
+     * @return array|float|string The result, or a string containing an error
+     */
+    public static function NORMSDIST2($value, $cumulative)
+    {
+        return Statistical\Distributions\StandardNormal::distribution($value, $cumulative);
     }
 
     /**
@@ -2664,13 +1177,17 @@ class Statistical
      *
      * Returns the inverse of the standard normal cumulative distribution
      *
-     * @param float $value
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\StandardNormal class instead
+     * @see Statistical\Distributions\StandardNormal::inverse()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $value
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function NORMSINV($value)
     {
-        return self::NORMINV($value, 0, 1);
+        return Statistical\Distributions\StandardNormal::inverse($value);
     }
 
     /**
@@ -2681,95 +1198,40 @@ class Statistical
      * Excel Function:
      *        PERCENTILE(value1[,value2[, ...]],entry)
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     * Use the PERCENTILE() method in the Statistical\Percentiles class instead
+     * @see Statistical\Percentiles::PERCENTILE()
      *
      * @param mixed $args Data values
-     * @param float $entry Percentile value in the range 0..1, inclusive.
      *
      * @return float|string The result, or a string containing an error
      */
     public static function PERCENTILE(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $entry = array_pop($aArgs);
-
-        if ((is_numeric($entry)) && (!is_string($entry))) {
-            if (($entry < 0) || ($entry > 1)) {
-                return Functions::NAN();
-            }
-            $mArgs = [];
-            foreach ($aArgs as $arg) {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $mArgs[] = $arg;
-                }
-            }
-            $mValueCount = count($mArgs);
-            if ($mValueCount > 0) {
-                sort($mArgs);
-                $count = self::COUNT($mArgs);
-                $index = $entry * ($count - 1);
-                $iBase = floor($index);
-                if ($index == $iBase) {
-                    return $mArgs[$index];
-                }
-                $iNext = $iBase + 1;
-                $iProportion = $index - $iBase;
-
-                return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
-            }
-        }
-
-        return Functions::VALUE();
+        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
      *
-     * @param float[] $valueSet An array of, or a reference to, a list of numbers
-     * @param int $value the number whose rank you want to find
-     * @param int $significance the number of significant digits for the returned percentage value
+     * @deprecated 1.18.0
+     * Use the PERCENTRANK() method in the Statistical\Percentiles class instead
+     * @see Statistical\Percentiles::PERCENTRANK()
      *
-     * @return float
+     * @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)
     {
-        $valueSet = Functions::flattenArray($valueSet);
-        $value = Functions::flattenSingleValue($value);
-        $significance = ($significance === null) ? 3 : (int) Functions::flattenSingleValue($significance);
-
-        foreach ($valueSet as $key => $valueEntry) {
-            if (!is_numeric($valueEntry)) {
-                unset($valueSet[$key]);
-            }
-        }
-        sort($valueSet, SORT_NUMERIC);
-        $valueCount = count($valueSet);
-        if ($valueCount == 0) {
-            return Functions::NAN();
-        }
-
-        $valueAdjustor = $valueCount - 1;
-        if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
-            return Functions::NA();
-        }
-
-        $pos = array_search($value, $valueSet);
-        if ($pos === false) {
-            $pos = 0;
-            $testValue = $valueSet[0];
-            while ($testValue < $value) {
-                $testValue = $valueSet[++$pos];
-            }
-            --$pos;
-            $pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
-        }
-
-        return round($pos / $valueAdjustor, $significance);
+        return Statistical\Percentiles::PERCENTRANK($valueSet, $value, $significance);
     }
 
     /**
@@ -2781,26 +1243,18 @@ class Statistical
      *        combinations, for which the internal order is not significant. Use this function
      *        for lottery-style probability calculations.
      *
+     * @deprecated 1.17.0
+     * Use the PERMUT() method in the Statistical\Permutations class instead
+     * @see Statistical\Permutations::PERMUT()
+     *
      * @param int $numObjs Number of different objects
      * @param int $numInSet Number of objects in each permutation
      *
-     * @return 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
      */
     public static function PERMUT($numObjs, $numInSet)
     {
-        $numObjs = Functions::flattenSingleValue($numObjs);
-        $numInSet = Functions::flattenSingleValue($numInSet);
-
-        if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-            $numInSet = floor($numInSet);
-            if ($numObjs < $numInSet) {
-                return Functions::NAN();
-            }
-
-            return round(MathTrig::FACT($numObjs) / MathTrig::FACT($numObjs - $numInSet));
-        }
-
-        return Functions::VALUE();
+        return Permutations::PERMUT($numObjs, $numInSet);
     }
 
     /**
@@ -2810,37 +1264,19 @@ class Statistical
      * is predicting the number of events over a specific time, such as the number of
      * cars arriving at a toll plaza in 1 minute.
      *
-     * @param float $value
-     * @param float $mean Mean Value
-     * @param bool $cumulative
+     * @deprecated 1.18.0
+     * Use the distribution() method in the Statistical\Distributions\Poisson class instead
+     * @see Statistical\Distributions\Poisson::distribution()
      *
-     * @return float|string The result, or a string containing an error
+     * @param mixed $value
+     * @param mixed $mean Mean Value
+     * @param mixed $cumulative
+     *
+     * @return array|float|string The result, or a string containing an error
      */
     public static function POISSON($value, $mean, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-
-        if ((is_numeric($value)) && (is_numeric($mean))) {
-            if (($value < 0) || ($mean <= 0)) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    $summer = 0;
-                    $floor = floor($value);
-                    for ($i = 0; $i <= $floor; ++$i) {
-                        $summer += pow($mean, $i) / MathTrig::FACT($i);
-                    }
-
-                    return exp(0 - $mean) * $summer;
-                }
-
-                return (exp(0 - $mean) * pow($mean, $value)) / MathTrig::FACT($value);
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Poisson::distribution($value, $mean, $cumulative);
     }
 
     /**
@@ -2851,30 +1287,17 @@ class Statistical
      * Excel Function:
      *        QUARTILE(value1[,value2[, ...]],entry)
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     * Use the QUARTILE() method in the Statistical\Percentiles class instead
+     * @see Statistical\Percentiles::QUARTILE()
      *
      * @param mixed $args Data values
-     * @param int $entry Quartile value in the range 1..3, inclusive.
      *
      * @return float|string The result, or a string containing an error
      */
     public static function QUARTILE(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $entry = floor(array_pop($aArgs));
-
-        if ((is_numeric($entry)) && (!is_string($entry))) {
-            $entry /= 4;
-            if (($entry < 0) || ($entry > 1)) {
-                return Functions::NAN();
-            }
-
-            return self::PERCENTILE($aArgs, $entry);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Percentiles::QUARTILE(...$args);
     }
 
     /**
@@ -2882,35 +1305,19 @@ class Statistical
      *
      * Returns the rank of a number in a list of numbers.
      *
-     * @param int $value the number whose rank you want to find
-     * @param float[] $valueSet An array of, or a reference to, a list of numbers
-     * @param int $order Order to sort the values in the value set
+     * @deprecated 1.18.0
+     * Use the RANK() method in the Statistical\Percentiles class instead
+     * @see Statistical\Percentiles::RANK()
+     *
+     * @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)
     {
-        $value = Functions::flattenSingleValue($value);
-        $valueSet = Functions::flattenArray($valueSet);
-        $order = ($order === null) ? 0 : (int) Functions::flattenSingleValue($order);
-
-        foreach ($valueSet as $key => $valueEntry) {
-            if (!is_numeric($valueEntry)) {
-                unset($valueSet[$key]);
-            }
-        }
-
-        if ($order == 0) {
-            rsort($valueSet, SORT_NUMERIC);
-        } else {
-            sort($valueSet, SORT_NUMERIC);
-        }
-        $pos = array_search($value, $valueSet);
-        if ($pos === false) {
-            return Functions::NA();
-        }
-
-        return ++$pos;
+        return Statistical\Percentiles::RANK($value, $valueSet, $order);
     }
 
     /**
@@ -2918,6 +1325,10 @@ class Statistical
      *
      * 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
+     *      Use the RSQ() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::RSQ()
+     *
      * @param mixed[] $yValues Data Series Y
      * @param mixed[] $xValues Data Series X
      *
@@ -2925,21 +1336,7 @@ class Statistical
      */
     public static function RSQ($yValues, $xValues)
     {
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getGoodnessOfFit();
+        return Trends::RSQ($yValues, $xValues);
     }
 
     /**
@@ -2950,35 +1347,17 @@ class Statistical
      * 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
+     *      Use the skew() method in the Statistical\Deviations class instead
+     * @see Statistical\Deviations::skew()
+     *
      * @param array ...$args Data Series
      *
      * @return float|string The result, or a string containing an error
      */
     public static function SKEW(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-        $mean = self::AVERAGE($aArgs);
-        $stdDev = self::STDEV($aArgs);
-
-        $count = $summer = 0;
-        // Loop through arguments
-        foreach ($aArgs as $k => $arg) {
-            if ((is_bool($arg)) &&
-                (!Functions::isMatrixValue($k))) {
-            } else {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $summer += pow((($arg - $mean) / $stdDev), 3);
-                    ++$count;
-                }
-            }
-        }
-
-        if ($count > 2) {
-            return $summer * ($count / (($count - 1) * ($count - 2)));
-        }
-
-        return Functions::DIV0();
+        return Statistical\Deviations::skew(...$args);
     }
 
     /**
@@ -2986,6 +1365,10 @@ class Statistical
      *
      * Returns the slope of the linear regression line through data points in known_y's and known_x's.
      *
+     * @deprecated 1.18.0
+     *      Use the SLOPE() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::SLOPE()
+     *
      * @param mixed[] $yValues Data Series Y
      * @param mixed[] $xValues Data Series X
      *
@@ -2993,21 +1376,7 @@ class Statistical
      */
     public static function SLOPE($yValues, $xValues)
     {
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getSlope();
+        return Trends::SLOPE($yValues, $xValues);
     }
 
     /**
@@ -3019,39 +1388,17 @@ class Statistical
      * Excel Function:
      *        SMALL(value1[,value2[, ...]],entry)
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the small() method in the Statistical\Size class instead
+     * @see Statistical\Size::small()
      *
      * @param mixed $args Data values
-     * @param int $entry Position (ordered from the smallest) in the array or range of data to return
      *
      * @return float|string The result, or a string containing an error
      */
     public static function SMALL(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $entry = array_pop($aArgs);
-
-        if ((is_numeric($entry)) && (!is_string($entry))) {
-            $mArgs = [];
-            foreach ($aArgs as $arg) {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $mArgs[] = $arg;
-                }
-            }
-            $count = self::COUNT($mArgs);
-            $entry = floor(--$entry);
-            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-                return Functions::NAN();
-            }
-            sort($mArgs);
-
-            return $mArgs[$entry];
-        }
-
-        return Functions::VALUE();
+        return Statistical\Size::small(...$args);
     }
 
     /**
@@ -3059,27 +1406,19 @@ class Statistical
      *
      * Returns a normalized value from a distribution characterized by mean and standard_dev.
      *
+     * @deprecated 1.18.0
+     *      Use the execute() method in the Statistical\Standardize class instead
+     * @see Statistical\Standardize::execute()
+     *
      * @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
+     * @return array|float|string Standardized value, or a string containing an error
      */
     public static function STANDARDIZE($value, $mean, $stdDev)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-
-        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-            if ($stdDev <= 0) {
-                return Functions::NAN();
-            }
-
-            return ($value - $mean) / $stdDev;
-        }
-
-        return Functions::VALUE();
+        return Statistical\Standardize::execute($value, $mean, $stdDev);
     }
 
     /**
@@ -3091,7 +1430,9 @@ class Statistical
      * Excel Function:
      *        STDEV(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the STDEV() method in the Statistical\StandardDeviations class instead
+     * @see Statistical\StandardDeviations::STDEV()
      *
      * @param mixed ...$args Data values
      *
@@ -3099,37 +1440,7 @@ class Statistical
      */
     public static function STDEV(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        // Return value
-        $returnValue = null;
-
-        $aMean = self::AVERAGE($aArgs);
-        if ($aMean !== null) {
-            $aCount = -1;
-            foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
-                    $arg = (int) $arg;
-                }
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    if ($returnValue === null) {
-                        $returnValue = pow(($arg - $aMean), 2);
-                    } else {
-                        $returnValue += pow(($arg - $aMean), 2);
-                    }
-                    ++$aCount;
-                }
-            }
-
-            // Return
-            if (($aCount > 0) && ($returnValue >= 0)) {
-                return sqrt($returnValue / $aCount);
-            }
-        }
-
-        return Functions::DIV0();
+        return StandardDeviations::STDEV(...$args);
     }
 
     /**
@@ -3140,7 +1451,9 @@ class Statistical
      * Excel Function:
      *        STDEVA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the STDEVA() method in the Statistical\StandardDeviations class instead
+     * @see Statistical\StandardDeviations::STDEVA()
      *
      * @param mixed ...$args Data values
      *
@@ -3148,40 +1461,7 @@ class Statistical
      */
     public static function STDEVA(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        $returnValue = null;
-
-        $aMean = self::AVERAGEA($aArgs);
-        if ($aMean !== null) {
-            $aCount = -1;
-            foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
-                } else {
-                    // Is it a numeric value?
-                    if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-                        if (is_bool($arg)) {
-                            $arg = (int) $arg;
-                        } elseif (is_string($arg)) {
-                            $arg = 0;
-                        }
-                        if ($returnValue === null) {
-                            $returnValue = pow(($arg - $aMean), 2);
-                        } else {
-                            $returnValue += pow(($arg - $aMean), 2);
-                        }
-                        ++$aCount;
-                    }
-                }
-            }
-
-            if (($aCount > 0) && ($returnValue >= 0)) {
-                return sqrt($returnValue / $aCount);
-            }
-        }
-
-        return Functions::DIV0();
+        return StandardDeviations::STDEVA(...$args);
     }
 
     /**
@@ -3192,7 +1472,9 @@ class Statistical
      * Excel Function:
      *        STDEVP(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the STDEVP() method in the Statistical\StandardDeviations class instead
+     * @see Statistical\StandardDeviations::STDEVP()
      *
      * @param mixed ...$args Data values
      *
@@ -3200,35 +1482,7 @@ class Statistical
      */
     public static function STDEVP(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        $returnValue = null;
-
-        $aMean = self::AVERAGE($aArgs);
-        if ($aMean !== null) {
-            $aCount = 0;
-            foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
-                    $arg = (int) $arg;
-                }
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    if ($returnValue === null) {
-                        $returnValue = pow(($arg - $aMean), 2);
-                    } else {
-                        $returnValue += pow(($arg - $aMean), 2);
-                    }
-                    ++$aCount;
-                }
-            }
-
-            if (($aCount > 0) && ($returnValue >= 0)) {
-                return sqrt($returnValue / $aCount);
-            }
-        }
-
-        return Functions::DIV0();
+        return StandardDeviations::STDEVP(...$args);
     }
 
     /**
@@ -3239,7 +1493,9 @@ class Statistical
      * Excel Function:
      *        STDEVPA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the STDEVPA() method in the Statistical\StandardDeviations class instead
+     * @see Statistical\StandardDeviations::STDEVPA()
      *
      * @param mixed ...$args Data values
      *
@@ -3247,45 +1503,16 @@ class Statistical
      */
     public static function STDEVPA(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed($args);
-
-        $returnValue = null;
-
-        $aMean = self::AVERAGEA($aArgs);
-        if ($aMean !== null) {
-            $aCount = 0;
-            foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
-                } else {
-                    // Is it a numeric value?
-                    if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-                        if (is_bool($arg)) {
-                            $arg = (int) $arg;
-                        } elseif (is_string($arg)) {
-                            $arg = 0;
-                        }
-                        if ($returnValue === null) {
-                            $returnValue = pow(($arg - $aMean), 2);
-                        } else {
-                            $returnValue += pow(($arg - $aMean), 2);
-                        }
-                        ++$aCount;
-                    }
-                }
-            }
-
-            if (($aCount > 0) && ($returnValue >= 0)) {
-                return sqrt($returnValue / $aCount);
-            }
-        }
-
-        return Functions::DIV0();
+        return StandardDeviations::STDEVPA(...$args);
     }
 
     /**
      * STEYX.
      *
+     * @deprecated 1.18.0
+     *      Use the STEYX() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::STEYX()
+     *
      * Returns the standard error of the predicted y-value for each x in the regression.
      *
      * @param mixed[] $yValues Data Series Y
@@ -3295,21 +1522,7 @@ class Statistical
      */
     public static function STEYX($yValues, $xValues)
     {
-        if (!self::checkTrendArrays($yValues, $xValues)) {
-            return Functions::VALUE();
-        }
-        $yValueCount = count($yValues);
-        $xValueCount = count($xValues);
-
-        if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-            return Functions::NA();
-        } elseif ($yValueCount == 1) {
-            return Functions::DIV0();
-        }
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
-
-        return $bestFitLinear->getStdevOfResiduals();
+        return Trends::STEYX($yValues, $xValues);
     }
 
     /**
@@ -3317,122 +1530,38 @@ class Statistical
      *
      * Returns the probability of Student's T distribution.
      *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\StudentT class instead
+     * @see Statistical\Distributions\StudentT::distribution()
+     *
      * @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
+     * @return array|float|string The result, or a string containing an error
      */
     public static function TDIST($value, $degrees, $tails)
     {
-        $value = Functions::flattenSingleValue($value);
-        $degrees = floor(Functions::flattenSingleValue($degrees));
-        $tails = floor(Functions::flattenSingleValue($tails));
-
-        if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
-            if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
-                return Functions::NAN();
-            }
-            //    tdist, which finds the probability that corresponds to a given value
-            //    of t with k degrees of freedom. This algorithm is translated from a
-            //    pascal function on p81 of "Statistical Computing in Pascal" by D
-            //    Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
-            //    London). The above Pascal algorithm is itself a translation of the
-            //    fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
-            //    Laboratory as reported in (among other places) "Applied Statistics
-            //    Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
-            //    Horwood Ltd.; W. Sussex, England).
-            $tterm = $degrees;
-            $ttheta = atan2($value, sqrt($tterm));
-            $tc = cos($ttheta);
-            $ts = sin($ttheta);
-            $tsum = 0;
-
-            if (($degrees % 2) == 1) {
-                $ti = 3;
-                $tterm = $tc;
-            } else {
-                $ti = 2;
-                $tterm = 1;
-            }
-
-            $tsum = $tterm;
-            while ($ti < $degrees) {
-                $tterm *= $tc * $tc * ($ti - 1) / $ti;
-                $tsum += $tterm;
-                $ti += 2;
-            }
-            $tsum *= $ts;
-            if (($degrees % 2) == 1) {
-                $tsum = Functions::M_2DIVPI * ($tsum + $ttheta);
-            }
-            $tValue = 0.5 * (1 + $tsum);
-            if ($tails == 1) {
-                return 1 - abs($tValue);
-            }
-
-            return 1 - abs((1 - $tValue) - $tValue);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\StudentT::distribution($value, $degrees, $tails);
     }
 
     /**
      * TINV.
      *
-     * Returns the one-tailed probability of the chi-squared distribution.
+     * Returns the one-tailed probability of the Student-T distribution.
+     *
+     * @deprecated 1.18.0
+     *      Use the inverse() method in the Statistical\Distributions\StudentT class instead
+     * @see Statistical\Distributions\StudentT::inverse()
      *
      * @param float $probability Probability for the function
      * @param float $degrees degrees of freedom
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
      */
     public static function TINV($probability, $degrees)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $degrees = floor(Functions::flattenSingleValue($degrees));
-
-        if ((is_numeric($probability)) && (is_numeric($degrees))) {
-            $xLo = 100;
-            $xHi = 0;
-
-            $x = $xNew = 1;
-            $dx = 1;
-            $i = 0;
-
-            while ((abs($dx) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
-                // Apply Newton-Raphson step
-                $result = self::TDIST($x, $degrees, 2);
-                $error = $result - $probability;
-                if ($error == 0.0) {
-                    $dx = 0;
-                } elseif ($error < 0.0) {
-                    $xLo = $x;
-                } else {
-                    $xHi = $x;
-                }
-                // Avoid division by zero
-                if ($result != 0.0) {
-                    $dx = $error / $result;
-                    $xNew = $x - $dx;
-                }
-                // If the NR fails to converge (which for example may be the
-                // case if the initial guess is too rough) we apply a bisection
-                // step to determine a more narrow interval around the root.
-                if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-                    $xNew = ($xLo + $xHi) / 2;
-                    $dx = $xNew - $x;
-                }
-                $x = $xNew;
-            }
-            if ($i == self::MAX_ITERATIONS) {
-                return Functions::NA();
-            }
-
-            return round($x, 12);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\StudentT::inverse($probability, $degrees);
     }
 
     /**
@@ -3440,31 +1569,20 @@ class Statistical
      *
      * Returns values along a linear Trend
      *
+     * @deprecated 1.18.0
+     *      Use the TREND() method in the Statistical\Trends class instead
+     * @see Statistical\Trends::TREND()
+     *
      * @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 array of float
+     * @return float[]
      */
     public static function TREND($yValues, $xValues = [], $newValues = [], $const = true)
     {
-        $yValues = Functions::flattenArray($yValues);
-        $xValues = Functions::flattenArray($xValues);
-        $newValues = Functions::flattenArray($newValues);
-        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
-
-        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
-        if (empty($newValues)) {
-            $newValues = $bestFitLinear->getXValues();
-        }
-
-        $returnArray = [];
-        foreach ($newValues as $xValue) {
-            $returnArray[0][] = $bestFitLinear->getValueOfYForX($xValue);
-        }
-
-        return $returnArray;
+        return Trends::TREND($yValues, $xValues, $newValues, $const);
     }
 
     /**
@@ -3477,42 +1595,17 @@ class Statistical
      * Excel Function:
      *        TRIMEAN(value1[,value2[, ...]], $discard)
      *
-     * @category Statistical Functions
+     * @deprecated 1.18.0
+     *      Use the trim() method in the Statistical\Averages\Mean class instead
+     * @see Statistical\Averages\Mean::trim()
      *
      * @param mixed $args Data values
-     * @param float $discard Percentage to discard
      *
      * @return float|string
      */
     public static function TRIMMEAN(...$args)
     {
-        $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $percent = array_pop($aArgs);
-
-        if ((is_numeric($percent)) && (!is_string($percent))) {
-            if (($percent < 0) || ($percent > 1)) {
-                return Functions::NAN();
-            }
-            $mArgs = [];
-            foreach ($aArgs as $arg) {
-                // Is it a numeric value?
-                if ((is_numeric($arg)) && (!is_string($arg))) {
-                    $mArgs[] = $arg;
-                }
-            }
-            $discard = floor(self::COUNT($mArgs) * $percent / 2);
-            sort($mArgs);
-            for ($i = 0; $i < $discard; ++$i) {
-                array_pop($mArgs);
-                array_shift($mArgs);
-            }
-
-            return self::AVERAGE($mArgs);
-        }
-
-        return Functions::VALUE();
+        return Statistical\Averages\Mean::trim(...$args);
     }
 
     /**
@@ -3523,40 +1616,17 @@ class Statistical
      * Excel Function:
      *        VAR(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the VAR() method in the Statistical\Variances class instead
+     * @see Statistical\Variances::VAR()
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARFunc(...$args)
     {
-        $returnValue = Functions::DIV0();
-
-        $summerA = $summerB = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        $aCount = 0;
-        foreach ($aArgs as $arg) {
-            if (is_bool($arg)) {
-                $arg = (int) $arg;
-            }
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $summerA += ($arg * $arg);
-                $summerB += $arg;
-                ++$aCount;
-            }
-        }
-
-        if ($aCount > 1) {
-            $summerA *= $aCount;
-            $summerB *= $summerB;
-            $returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-        }
-
-        return $returnValue;
+        return Variances::VAR(...$args);
     }
 
     /**
@@ -3567,49 +1637,17 @@ class Statistical
      * Excel Function:
      *        VARA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the VARA() method in the Statistical\Variances class instead
+     * @see Statistical\Variances::VARA()
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARA(...$args)
     {
-        $returnValue = Functions::DIV0();
-
-        $summerA = $summerB = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed($args);
-        $aCount = 0;
-        foreach ($aArgs as $k => $arg) {
-            if ((is_string($arg)) &&
-                (Functions::isValue($k))) {
-                return Functions::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_bool($arg)) {
-                        $arg = (int) $arg;
-                    } elseif (is_string($arg)) {
-                        $arg = 0;
-                    }
-                    $summerA += ($arg * $arg);
-                    $summerB += $arg;
-                    ++$aCount;
-                }
-            }
-        }
-
-        if ($aCount > 1) {
-            $summerA *= $aCount;
-            $summerB *= $summerB;
-            $returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-        }
-
-        return $returnValue;
+        return Variances::VARA(...$args);
     }
 
     /**
@@ -3620,41 +1658,17 @@ class Statistical
      * Excel Function:
      *        VARP(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the VARP() method in the Statistical\Variances class instead
+     * @see Statistical\Variances::VARP()
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARP(...$args)
     {
-        // Return value
-        $returnValue = Functions::DIV0();
-
-        $summerA = $summerB = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        $aCount = 0;
-        foreach ($aArgs as $arg) {
-            if (is_bool($arg)) {
-                $arg = (int) $arg;
-            }
-            // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
-                $summerA += ($arg * $arg);
-                $summerB += $arg;
-                ++$aCount;
-            }
-        }
-
-        if ($aCount > 0) {
-            $summerA *= $aCount;
-            $summerB *= $summerB;
-            $returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-        }
-
-        return $returnValue;
+        return Variances::VARP(...$args);
     }
 
     /**
@@ -3665,49 +1679,17 @@ class Statistical
      * Excel Function:
      *        VARPA(value1[,value2[, ...]])
      *
-     * @category Statistical Functions
+     * @deprecated 1.17.0
+     *      Use the VARPA() method in the Statistical\Variances class instead
+     * @see Statistical\Variances::VARPA()
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARPA(...$args)
     {
-        $returnValue = Functions::DIV0();
-
-        $summerA = $summerB = 0;
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed($args);
-        $aCount = 0;
-        foreach ($aArgs as $k => $arg) {
-            if ((is_string($arg)) &&
-                (Functions::isValue($k))) {
-                return Functions::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_bool($arg)) {
-                        $arg = (int) $arg;
-                    } elseif (is_string($arg)) {
-                        $arg = 0;
-                    }
-                    $summerA += ($arg * $arg);
-                    $summerB += $arg;
-                    ++$aCount;
-                }
-            }
-        }
-
-        if ($aCount > 0) {
-            $summerA *= $aCount;
-            $summerB *= $summerB;
-            $returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-        }
-
-        return $returnValue;
+        return Variances::VARPA(...$args);
     }
 
     /**
@@ -3716,58 +1698,42 @@ class Statistical
      * Returns the Weibull distribution. Use this distribution in reliability
      * analysis, such as calculating a device's mean time to failure.
      *
+     * @deprecated 1.18.0
+     *      Use the distribution() method in the Statistical\Distributions\Weibull class instead
+     * @see Statistical\Distributions\Weibull::distribution()
+     *
      * @param float $value
      * @param float $alpha Alpha Parameter
      * @param float $beta Beta Parameter
      * @param bool $cumulative
      *
-     * @return float
+     * @return array|float|string (string if result is an error)
      */
     public static function WEIBULL($value, $alpha, $beta, $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-
-        if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-            if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
-                return Functions::NAN();
-            }
-            if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-                if ($cumulative) {
-                    return 1 - exp(0 - pow($value / $beta, $alpha));
-                }
-
-                return ($alpha / pow($beta, $alpha)) * pow($value, $alpha - 1) * exp(0 - pow($value / $beta, $alpha));
-            }
-        }
-
-        return Functions::VALUE();
+        return Statistical\Distributions\Weibull::distribution($value, $alpha, $beta, $cumulative);
     }
 
     /**
      * ZTEST.
      *
-     * Returns the Weibull distribution. Use this distribution in reliability
-     * analysis, such as calculating a device's mean time to failure.
+     * Returns the one-tailed P-value of a z-test.
      *
-     * @param float $dataSet
+     * 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
+     *      Use the zTest() method in the Statistical\Distributions\StandardNormal class instead
+     * @see Statistical\Distributions\StandardNormal::zTest()
+     *
+     * @param mixed $dataSet
      * @param float $m0 Alpha Parameter
      * @param float $sigma Beta Parameter
      *
-     * @return float|string
+     * @return array|float|string (string if result is an error)
      */
     public static function ZTEST($dataSet, $m0, $sigma = null)
     {
-        $dataSet = Functions::flattenArrayIndexed($dataSet);
-        $m0 = Functions::flattenSingleValue($m0);
-        $sigma = Functions::flattenSingleValue($sigma);
-
-        if ($sigma === null) {
-            $sigma = self::STDEV($dataSet);
-        }
-        $n = count($dataSet);
-
-        return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0) / ($sigma / sqrt($n)));
+        return Statistical\Distributions\StandardNormal::zTest($dataSet, $m0, $sigma);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
new file mode 100644
index 000000000..10933f488
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+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)
+    {
+        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, bool $countNull = false)
+    {
+        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;
+        }
+
+        return false;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
new file mode 100644
index 000000000..edb29847c
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Averages extends AggregateBase
+{
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function averageDeviations(...$args)
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+
+        // Return value
+        $returnValue = 0.0;
+
+        $aMean = self::average(...$args);
+        if ($aMean === ExcelError::DIV0()) {
+            return ExcelError::NAN();
+        } elseif ($aMean === ExcelError::VALUE()) {
+            return ExcelError::VALUE();
+        }
+
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // 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 ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
+                return ExcelError::VALUE();
+            }
+            if (self::isAcceptedCountable($arg, $k)) {
+                $returnValue += abs($arg - $aMean);
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount === 0) {
+            return ExcelError::DIV0();
+        }
+
+        return $returnValue / $aCount;
+    }
+
+    /**
+     * AVERAGE.
+     *
+     * Returns the average (arithmetic mean) of the arguments
+     *
+     * Excel Function:
+     *        AVERAGE(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function average(...$args)
+    {
+        $returnValue = $aCount = 0;
+
+        // Loop through arguments
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // 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 ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
+                return ExcelError::VALUE();
+            }
+            if (self::isAcceptedCountable($arg, $k)) {
+                $returnValue += $arg;
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * AVERAGEA.
+     *
+     * Returns the average of its arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        AVERAGEA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function averageA(...$args)
+    {
+        $returnValue = null;
+
+        $aCount = 0;
+        // Loop through arguments
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
+            if (is_numeric($arg)) {
+                // do nothing
+            } elseif (is_bool($arg)) {
+                $arg = (int) $arg;
+            } elseif (!Functions::isMatrixValue($k)) {
+                $arg = 0;
+            } else {
+                return ExcelError::VALUE();
+            }
+            $returnValue += $arg;
+            ++$aCount;
+        }
+
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function median(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $returnValue = ExcelError::NAN();
+
+        $aArgs = self::filterArguments($aArgs);
+        $valueCount = count($aArgs);
+        if ($valueCount > 0) {
+            sort($aArgs, SORT_NUMERIC);
+            $valueCount = $valueCount / 2;
+            if ($valueCount == floor($valueCount)) {
+                $returnValue = ($aArgs[$valueCount--] + $aArgs[$valueCount]) / 2;
+            } else {
+                $valueCount = floor($valueCount);
+                $returnValue = $aArgs[$valueCount];
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MODE.
+     *
+     * Returns the most frequently occurring, or repetitive, value in an array or range of data
+     *
+     * Excel Function:
+     *        MODE(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function mode(...$args)
+    {
+        $returnValue = ExcelError::NA();
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aArgs = self::filterArguments($aArgs);
+
+        if (!empty($aArgs)) {
+            return self::modeCalc($aArgs);
+        }
+
+        return $returnValue;
+    }
+
+    protected static function filterArguments(array $args): array
+    {
+        return array_filter(
+            $args,
+            function ($value) {
+                // Is it a numeric 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.
+     *
+     * @return float|string
+     */
+    private static function modeCalc(array $data)
+    {
+        $frequencyArray = [];
+        $index = 0;
+        $maxfreq = 0;
+        $maxfreqkey = '';
+        $maxfreqdatum = '';
+        foreach ($data as $datum) {
+            $found = false;
+            ++$index;
+            foreach ($frequencyArray as $key => $value) {
+                if ((string) $value['value'] == (string) $datum) {
+                    ++$frequencyArray[$key]['frequency'];
+                    $freq = $frequencyArray[$key]['frequency'];
+                    if ($freq > $maxfreq) {
+                        $maxfreq = $freq;
+                        $maxfreqkey = $key;
+                        $maxfreqdatum = $datum;
+                    } elseif ($freq == $maxfreq) {
+                        if ($frequencyArray[$key]['index'] < $frequencyArray[$maxfreqkey]['index']) {
+                            $maxfreqkey = $key;
+                            $maxfreqdatum = $datum;
+                        }
+                    }
+                    $found = true;
+
+                    break;
+                }
+            }
+
+            if ($found === false) {
+                $frequencyArray[] = [
+                    'value' => $datum,
+                    'frequency' => 1,
+                    'index' => $index,
+                ];
+            }
+        }
+
+        if ($maxfreq <= 1) {
+            return ExcelError::NA();
+        }
+
+        return $maxfreqdatum;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
new file mode 100644
index 000000000..001c91eb3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
@@ -0,0 +1,132 @@
+<?php
+
+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;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
+
+class Mean
+{
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function geometric(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $aMean = MathTrig\Operations::product($aArgs);
+        if (is_numeric($aMean) && ($aMean > 0)) {
+            $aCount = Counts::COUNT($aArgs);
+            if (Minimum::min($aArgs) > 0) {
+                return $aMean ** (1 / $aCount);
+            }
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function harmonic(...$args)
+    {
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        if (Minimum::min($aArgs) < 0) {
+            return ExcelError::NAN();
+        }
+
+        $returnValue = 0;
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if ($arg <= 0) {
+                    return ExcelError::NAN();
+                }
+                $returnValue += (1 / $arg);
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return 1 / ($returnValue / $aCount);
+        }
+
+        return ExcelError::NA();
+    }
+
+    /**
+     * 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)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string
+     */
+    public static function trim(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $percent = array_pop($aArgs);
+
+        if ((is_numeric($percent)) && (!is_string($percent))) {
+            if (($percent < 0) || ($percent > 1)) {
+                return ExcelError::NAN();
+            }
+
+            $mArgs = [];
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+
+            $discard = floor(Counts::COUNT($mArgs) * $percent / 2);
+            sort($mArgs);
+
+            for ($i = 0; $i < $discard; ++$i) {
+                array_pop($mArgs);
+                array_shift($mArgs);
+            }
+
+            return Averages::average($mArgs);
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
new file mode 100644
index 000000000..105db9631
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
@@ -0,0 +1,316 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DAverage;
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DCount;
+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
+{
+    private const CONDITION_COLUMN_NAME = 'CONDITION';
+    private const VALUE_COLUMN_NAME = 'VALUE';
+    private const CONDITIONAL_COLUMN_NAME = 'CONDITIONAL %d';
+
+    /**
+     * AVERAGEIF.
+     *
+     * Returns the average value from a range of cells that contain numbers within the list of arguments
+     *
+     * 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
+     */
+    public static function AVERAGEIF($range, $condition, $averageRange = [])
+    {
+        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]];
+
+        return DAverage::evaluate($database, self::VALUE_COLUMN_NAME, $condition);
+    }
+
+    /**
+     * AVERAGEIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        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)
+    {
+        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);
+
+        return DAverage::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+    }
+
+    /**
+     * COUNTIF.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTIF(range,condition)
+     *
+     * @param mixed[] $range Data values
+     * @param string $condition the criteria that defines which cells will be counted
+     *
+     * @return int|string
+     */
+    public static function COUNTIF($range, $condition)
+    {
+        // 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 !== '';
+            }
+        );
+
+        $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, false);
+    }
+
+    /**
+     * COUNTIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     *
+     * @return int|string
+     */
+    public static function COUNTIFS(...$args)
+    {
+        if (empty($args)) {
+            return 0;
+        } elseif (count($args) === 2) {
+            return self::COUNTIF(...$args);
+        }
+
+        $database = self::buildDatabase(...$args);
+        $conditions = self::buildConditionSet(...$args);
+
+        return DCount::evaluate($database, null, $conditions, false);
+    }
+
+    /**
+     * MAXIFS.
+     *
+     * Returns 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]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     *
+     * @return null|float|string
+     */
+    public static function MAXIFS(...$args)
+    {
+        if (empty($args)) {
+            return 0.0;
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DMax::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
+    }
+
+    /**
+     * 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]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     *
+     * @return null|float|string
+     */
+    public static function MINIFS(...$args)
+    {
+        if (empty($args)) {
+            return 0.0;
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DMin::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
+    }
+
+    /**
+     * SUMIF.
+     *
+     * Totals the values of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        SUMIF(range, criteria, [sum_range])
+     *
+     * @param mixed $range Data values
+     * @param mixed $sumRange
+     * @param mixed $condition
+     *
+     * @return null|float|string
+     */
+    public static function SUMIF($range, $condition, $sumRange = [])
+    {
+        $database = self::databaseFromRangeAndValue($range, $sumRange);
+        $condition = [[self::CONDITION_COLUMN_NAME, self::VALUE_COLUMN_NAME], [$condition, null]];
+
+        return DSum::evaluate($database, self::VALUE_COLUMN_NAME, $condition);
+    }
+
+    /**
+     * SUMIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        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)
+    {
+        if (empty($args)) {
+            return 0.0;
+        } elseif (count($args) === 3) {
+            return self::SUMIF($args[1], $args[2], $args[0]);
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DSum::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+    }
+
+    /** @param array $args */
+    private static function buildConditionSet(...$args): array
+    {
+        $conditions = self::buildConditions(1, ...$args);
+
+        // Scrutinizer thinks first parameter of array_map can't be null. It is wrong.
+        return array_map(/** @scrutinizer ignore-type */ 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];
+                },
+                $conditions[0]
+            );
+        }
+
+        return array_map(/** @scrutinizer ignore-type */ null, ...$conditions);
+    }
+
+    /** @param array $args */
+    private static function buildConditions(int $startOffset, ...$args): array
+    {
+        $conditions = [];
+
+        $pairCount = 1;
+        $argumentCount = count($args);
+        for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
+            $conditions[] = array_merge([sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)], [$args[$argument]]);
+            ++$pairCount;
+        }
+
+        return $conditions;
+    }
+
+    /** @param array $args */
+    private static function buildDatabase(...$args): array
+    {
+        $database = [];
+
+        return self::buildDataSet(0, $database, ...$args);
+    }
+
+    /** @param array $args */
+    private static function buildDatabaseWithValueRange(...$args): array
+    {
+        $database = [];
+        $database[] = array_merge(
+            [self::VALUE_COLUMN_NAME],
+            Functions::flattenArray($args[0])
+        );
+
+        return self::buildDataSet(1, $database, ...$args);
+    }
+
+    /** @param array $args */
+    private static function buildDataSet(int $startOffset, array $database, ...$args): array
+    {
+        $pairCount = 1;
+        $argumentCount = count($args);
+        for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
+            $database[] = array_merge(
+                [sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)],
+                Functions::flattenArray($args[$argument])
+            );
+            ++$pairCount;
+        }
+
+        return array_map(/** @scrutinizer ignore-type */ null, ...$database);
+    }
+
+    private static function databaseFromRangeAndValue(array $range, array $valueRange = []): array
+    {
+        $range = Functions::flattenArray($range);
+
+        $valueRange = Functions::flattenArray($valueRange);
+        if (empty($valueRange)) {
+            $valueRange = $range;
+        }
+
+        $database = array_map(/** @scrutinizer ignore-type */ null, array_merge([self::CONDITION_COLUMN_NAME], $range), array_merge([self::VALUE_COLUMN_NAME], $valueRange));
+
+        return $database;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
new file mode 100644
index 000000000..ec2ce34ee
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
@@ -0,0 +1,52 @@
+<?php
+
+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 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)
+    {
+        if (is_array($alpha) || is_array($stdDev) || is_array($size)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $alpha, $stdDev, $size);
+        }
+
+        try {
+            $alpha = StatisticalValidations::validateFloat($alpha);
+            $stdDev = StatisticalValidations::validateFloat($stdDev);
+            $size = StatisticalValidations::validateInt($size);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($alpha <= 0) || ($alpha >= 1) || ($stdDev <= 0) || ($size < 1)) {
+            return ExcelError::NAN();
+        }
+        /** @var float */
+        $temp = Distributions\StandardNormal::inverse(1 - $alpha / 2);
+
+        return Functions::scalar($temp * $stdDev / sqrt($size));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
new file mode 100644
index 000000000..679273038
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Counts extends AggregateBase
+{
+    /**
+     * COUNT.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return int
+     */
+    public static function COUNT(...$args)
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // 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, true)) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * COUNTA.
+     *
+     * Counts the number of cells that are not empty within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return int
+     */
+    public static function COUNTA(...$args)
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            // Nulls are counted if literals, but not if cell values
+            if ($arg !== null || (!Functions::isCellValue($k))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * COUNTBLANK.
+     *
+     * Counts the number of empty cells within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTBLANK(value1[,value2[, ...]])
+     *
+     * @param mixed $range Data values
+     *
+     * @return int
+     */
+    public static function COUNTBLANK($range)
+    {
+        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($range);
+        foreach ($aArgs as $arg) {
+            // Is it a blank cell?
+            if (($arg === null) || ((is_string($arg)) && ($arg == ''))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
new file mode 100644
index 000000000..6b1db3a43
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Deviations
+{
+    /**
+     * DEVSQ.
+     *
+     * Returns the sum of squares of deviations of data points from their sample mean.
+     *
+     * Excel Function:
+     *        DEVSQ(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function sumSquares(...$args)
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+
+        $aMean = Averages::average($aArgs);
+        if (!is_numeric($aMean)) {
+            return ExcelError::NAN();
+        }
+
+        // Return value
+        $returnValue = 0.0;
+        $aCount = -1;
+        foreach ($aArgs as $k => $arg) {
+            // Is it a numeric value?
+            if (
+                (is_bool($arg)) &&
+                ((!Functions::isCellValue($k)) ||
+                    (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+            ) {
+                $arg = (int) $arg;
+            }
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue += ($arg - $aMean) ** 2;
+                ++$aCount;
+            }
+        }
+
+        return $aCount === 0 ? ExcelError::VALUE() : $returnValue;
+    }
+
+    /**
+     * 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.
+     *
+     * @param array ...$args Data Series
+     *
+     * @return float|string
+     */
+    public static function kurtosis(...$args)
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $mean = Averages::average($aArgs);
+        if (!is_numeric($mean)) {
+            return ExcelError::DIV0();
+        }
+        $stdDev = StandardDeviations::STDEV($aArgs);
+
+        if ($stdDev > 0) {
+            $count = $summer = 0;
+
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
+                } else {
+                    // Is it a numeric value?
+                    if ((is_numeric($arg)) && (!is_string($arg))) {
+                        $summer += (($arg - $mean) / $stdDev) ** 4;
+                        ++$count;
+                    }
+                }
+            }
+
+            if ($count > 3) {
+                return $summer * ($count * ($count + 1) /
+                        (($count - 1) * ($count - 2) * ($count - 3))) - (3 * ($count - 1) ** 2 /
+                        (($count - 2) * ($count - 3)));
+            }
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * 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.
+     *
+     * @param array ...$args Data Series
+     *
+     * @return float|int|string The result, or a string containing an error
+     */
+    public static function skew(...$args)
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $mean = Averages::average($aArgs);
+        if (!is_numeric($mean)) {
+            return ExcelError::DIV0();
+        }
+        $stdDev = StandardDeviations::STDEV($aArgs);
+        if ($stdDev === 0.0 || is_string($stdDev)) {
+            return ExcelError::DIV0();
+        }
+
+        $count = $summer = 0;
+        // Loop through arguments
+        foreach ($aArgs as $k => $arg) {
+            if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
+            } elseif (!is_numeric($arg)) {
+                return ExcelError::VALUE();
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $summer += (($arg - $mean) / $stdDev) ** 3;
+                    ++$count;
+                }
+            }
+        }
+
+        if ($count > 2) {
+            return $summer * ($count / (($count - 1) * ($count - 2)));
+        }
+
+        return ExcelError::DIV0();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
new file mode 100644
index 000000000..a88c1054a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
@@ -0,0 +1,286 @@
+<?php
+
+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;
+
+    private const XMININ = 2.23e-308;
+
+    /**
+     * BETADIST.
+     *
+     * 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 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)
+    {
+        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);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $rMax = DistributionValidations::validateFloat($rMax);
+            $rMin = DistributionValidations::validateFloat($rMin);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($rMin > $rMax) {
+            $tmp = $rMin;
+            $rMin = $rMax;
+            $rMax = $tmp;
+        }
+        if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
+            return ExcelError::NAN();
+        }
+
+        $value -= $rMin;
+        $value /= ($rMax - $rMin);
+
+        return self::incompleteBeta($value, $alpha, $beta);
+    }
+
+    /**
+     * BETAINV.
+     *
+     * 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 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)
+    {
+        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);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $rMax = DistributionValidations::validateFloat($rMax);
+            $rMin = DistributionValidations::validateFloat($rMin);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($rMin > $rMax) {
+            $tmp = $rMin;
+            $rMin = $rMax;
+            $rMax = $tmp;
+        }
+        if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0.0)) {
+            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)
+    {
+        $a = 0;
+        $b = 2;
+        $guess = ($a + $b) / 2;
+
+        $i = 0;
+        while ((($b - $a) > Functions::PRECISION) && (++$i <= self::MAX_ITERATIONS)) {
+            $guess = ($a + $b) / 2;
+            $result = self::distribution($guess, $alpha, $beta);
+            if (($result === $probability) || ($result === 0.0)) {
+                $b = $a;
+            } elseif ($result > $probability) {
+                $b = $guess;
+            } else {
+                $a = $guess;
+            }
+        }
+
+        if ($i === self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return round($rMin + $guess * ($rMax - $rMin), 12);
+    }
+
+    /**
+     * Incomplete beta function.
+     *
+     * @author Jaco van Kooten
+     * @author Paul Meagher
+     *
+     * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
+     *
+     * @param float $x require 0<=x<=1
+     * @param float $p require p>0
+     * @param float $q require q>0
+     *
+     * @return float 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
+     */
+    public static function incompleteBeta(float $x, float $p, float $q): float
+    {
+        if ($x <= 0.0) {
+            return 0.0;
+        } elseif ($x >= 1.0) {
+            return 1.0;
+        } elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
+            return 0.0;
+        }
+
+        $beta_gam = exp((0 - self::logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
+        if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
+            return $beta_gam * self::betaFraction($x, $p, $q) / $p;
+        }
+
+        return 1.0 - ($beta_gam * self::betaFraction(1 - $x, $q, $p) / $q);
+    }
+
+    // Function cache for logBeta function
+    /** @var float */
+    private static $logBetaCacheP = 0.0;
+
+    /** @var float */
+    private static $logBetaCacheQ = 0.0;
+
+    /** @var float */
+    private static $logBetaCacheResult = 0.0;
+
+    /**
+     * The natural logarithm of the beta function.
+     *
+     * @param float $p require p>0
+     * @param float $q require q>0
+     *
+     * @return float 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+     *
+     * @author Jaco van Kooten
+     */
+    private static function logBeta(float $p, float $q): float
+    {
+        if ($p != self::$logBetaCacheP || $q != self::$logBetaCacheQ) {
+            self::$logBetaCacheP = $p;
+            self::$logBetaCacheQ = $q;
+            if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
+                self::$logBetaCacheResult = 0.0;
+            } else {
+                self::$logBetaCacheResult = Gamma::logGamma($p) + Gamma::logGamma($q) - Gamma::logGamma($p + $q);
+            }
+        }
+
+        return self::$logBetaCacheResult;
+    }
+
+    /**
+     * Evaluates of continued fraction part of incomplete beta function.
+     * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
+     *
+     * @author Jaco van Kooten
+     */
+    private static function betaFraction(float $x, float $p, float $q): float
+    {
+        $c = 1.0;
+        $sum_pq = $p + $q;
+        $p_plus = $p + 1.0;
+        $p_minus = $p - 1.0;
+        $h = 1.0 - $sum_pq * $x / $p_plus;
+        if (abs($h) < self::XMININ) {
+            $h = self::XMININ;
+        }
+        $h = 1.0 / $h;
+        $frac = $h;
+        $m = 1;
+        $delta = 0.0;
+        while ($m <= self::MAX_ITERATIONS && abs($delta - 1.0) > Functions::PRECISION) {
+            $m2 = 2 * $m;
+            // even index for d
+            $d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < self::XMININ) {
+                $h = self::XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < self::XMININ) {
+                $c = self::XMININ;
+            }
+            $frac *= $h * $c;
+            // odd index for d
+            $d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < self::XMININ) {
+                $h = self::XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < self::XMININ) {
+                $c = self::XMININ;
+            }
+            $delta = $h * $c;
+            $frac *= $delta;
+            ++$m;
+        }
+
+        return $frac;
+    }
+
+    /*
+    private static function betaValue(float $a, float $b): float
+    {
+        return (Gamma::gammaValue($a) * Gamma::gammaValue($b)) /
+            Gamma::gammaValue($a + $b);
+    }
+
+    private static function regularizedIncompleteBeta(float $value, float $a, float $b): float
+    {
+        return self::incompleteBeta($value, $a, $b) / self::betaValue($a, $b);
+    }
+    */
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
new file mode 100644
index 000000000..02b53e888
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
@@ -0,0 +1,237 @@
+<?php
+
+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.
+     *
+     * 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.
+     *
+     * @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 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)
+    {
+        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);
+            $trials = DistributionValidations::validateInt($trials);
+            $probability = DistributionValidations::validateProbability($probability);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($value > $trials)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return self::calculateCumulativeBinomial($value, $trials, $probability);
+        }
+        /** @var float */
+        $comb = Combinations::withoutRepetition($trials, $value);
+
+        return $comb * $probability ** $value
+            * (1 - $probability) ** ($trials - $value);
+    }
+
+    /**
+     * BINOM.DIST.RANGE.
+     *
+     * Returns returns the Binomial Distribution probability for the number of successes from a specified number
+     *     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 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 range($trials, $probability, $successes, $limit = null)
+    {
+        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);
+            $probability = DistributionValidations::validateProbability($probability);
+            $successes = DistributionValidations::validateInt($successes);
+            $limit = DistributionValidations::validateInt($limit);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($successes < 0) || ($successes > $trials)) {
+            return ExcelError::NAN();
+        }
+        if (($limit < 0) || ($limit > $trials) || $limit < $successes) {
+            return ExcelError::NAN();
+        }
+
+        $summer = 0;
+        for ($i = $successes; $i <= $limit; ++$i) {
+            /** @var float */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
+                * (1 - $probability) ** ($trials - $i);
+        }
+
+        return $summer;
+    }
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        if (is_array($failures) || is_array($successes) || is_array($probability)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $failures, $successes, $probability);
+        }
+
+        try {
+            $failures = DistributionValidations::validateInt($failures);
+            $successes = DistributionValidations::validateInt($successes);
+            $probability = DistributionValidations::validateProbability($probability);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($failures < 0) || ($successes < 1)) {
+            return ExcelError::NAN();
+        }
+        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+            if (($failures + $successes - 1) <= 0) {
+                return ExcelError::NAN();
+            }
+        }
+        /** @var float */
+        $comb = Combinations::withoutRepetition($failures + $successes - 1, $successes - 1);
+
+        return $comb
+            * ($probability ** $successes) * ((1 - $probability) ** $failures);
+    }
+
+    /**
+     * 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 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)
+    {
+        if (is_array($trials) || is_array($probability) || is_array($alpha)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $trials, $probability, $alpha);
+        }
+
+        try {
+            $trials = DistributionValidations::validateInt($trials);
+            $probability = DistributionValidations::validateProbability($probability);
+            $alpha = DistributionValidations::validateFloat($alpha);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($trials < 0) {
+            return ExcelError::NAN();
+        } elseif (($alpha < 0.0) || ($alpha > 1.0)) {
+            return ExcelError::NAN();
+        }
+
+        $successes = 0;
+        while ($successes <= $trials) {
+            $result = self::calculateCumulativeBinomial($successes, $trials, $probability);
+            if ($result >= $alpha) {
+                break;
+            }
+            ++$successes;
+        }
+
+        return $successes;
+    }
+
+    /**
+     * @return float|int
+     */
+    private static function calculateCumulativeBinomial(int $value, int $trials, float $probability)
+    {
+        $summer = 0;
+        for ($i = 0; $i <= $value; ++$i) {
+            /** @var float */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
+                * (1 - $probability) ** ($trials - $i);
+        }
+
+        return $summer;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
new file mode 100644
index 000000000..e0793a7db
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
@@ -0,0 +1,335 @@
+<?php
+
+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
+{
+    use ArrayEnabled;
+
+    private const EPS = 2.22e-16;
+
+    /**
+     * CHIDIST.
+     *
+     * 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 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 distributionRightTail($value, $degrees)
+    {
+        if (is_array($value) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+        if ($value < 0) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return 1;
+            }
+
+            return ExcelError::NAN();
+        }
+
+        return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2) / Gamma::gammaValue($degrees / 2));
+    }
+
+    /**
+     * CHIDIST.
+     *
+     * 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 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 distributionLeftTail($value, $degrees, $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);
+            $degrees = DistributionValidations::validateInt($degrees);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+        if ($value < 0) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return 1;
+            }
+
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative === true) {
+            return 1 - self::distributionRightTail($value, $degrees);
+        }
+
+        return ($value ** (($degrees / 2) - 1) * exp(-$value / 2)) /
+            ((2 ** ($degrees / 2)) * Gamma::gammaValue($degrees / 2));
+    }
+
+    /**
+     * CHIINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+
+        $callback = function ($value) use ($degrees) {
+            return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2)
+                    / Gamma::gammaValue($degrees / 2));
+        };
+
+        $newtonRaphson = new NewtonRaphson($callback);
+
+        return $newtonRaphson->execute($probability);
+    }
+
+    /**
+     * CHIINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+
+        return self::inverseLeftTailCalculation($probability, $degrees);
+    }
+
+    /**
+     * CHITEST.
+     *
+     * Uses the chi-square test to calculate the probability that the differences between two supplied data sets
+     *      (of observed and expected frequencies), are likely to be simply due to sampling error,
+     *      or if they are likely to be real.
+     *
+     * @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)
+    {
+        $rows = count($actual);
+        $actual = Functions::flattenArray($actual);
+        $expected = Functions::flattenArray($expected);
+        $columns = intdiv(count($actual), $rows);
+
+        $countActuals = count($actual);
+        $countExpected = count($expected);
+        if ($countActuals !== $countExpected || $countActuals === 1) {
+            return ExcelError::NAN();
+        }
+
+        $result = 0.0;
+        for ($i = 0; $i < $countActuals; ++$i) {
+            if ($expected[$i] == 0.0) {
+                return ExcelError::DIV0();
+            } elseif ($expected[$i] < 0.0) {
+                return ExcelError::NAN();
+            }
+            $result += (($actual[$i] - $expected[$i]) ** 2) / $expected[$i];
+        }
+
+        $degrees = self::degrees($rows, $columns);
+
+        $result = Functions::scalar(self::distributionRightTail($result, $degrees));
+
+        return $result;
+    }
+
+    protected static function degrees(int $rows, int $columns): int
+    {
+        if ($rows === 1) {
+            return $columns - 1;
+        } elseif ($columns === 1) {
+            return $rows - 1;
+        }
+
+        return ($columns - 1) * ($rows - 1);
+    }
+
+    private static function inverseLeftTailCalculation(float $probability, int $degrees): float
+    {
+        // bracket the root
+        $min = 0;
+        $sd = sqrt(2.0 * $degrees);
+        $max = 2 * $sd;
+        $s = -1;
+
+        while ($s * self::pchisq($max, $degrees) > $probability * $s) {
+            $min = $max;
+            $max += 2 * $sd;
+        }
+
+        // Find root using bisection
+        $chi2 = 0.5 * ($min + $max);
+
+        while (($max - $min) > self::EPS * $chi2) {
+            if ($s * self::pchisq($chi2, $degrees) > $probability * $s) {
+                $min = $chi2;
+            } else {
+                $max = $chi2;
+            }
+            $chi2 = 0.5 * ($min + $max);
+        }
+
+        return $chi2;
+    }
+
+    private static function pchisq(float $chi2, int $degrees): float
+    {
+        return self::gammp($degrees, 0.5 * $chi2);
+    }
+
+    private static function gammp(int $n, float $x): float
+    {
+        if ($x < 0.5 * $n + 1) {
+            return self::gser($n, $x);
+        }
+
+        return 1 - self::gcf($n, $x);
+    }
+
+    // Return the incomplete gamma function P(n/2,x) evaluated by
+    // 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(int $n, float $x): float
+    {
+        /** @var float */
+        $gln = Gamma::ln($n / 2);
+        $a = 0.5 * $n;
+        $ap = $a;
+        $sum = 1.0 / $a;
+        $del = $sum;
+        for ($i = 1; $i < 101; ++$i) {
+            ++$ap;
+            $del = $del * $x / $ap;
+            $sum += $del;
+            if ($del < $sum * self::EPS) {
+                break;
+            }
+        }
+
+        return $sum * exp(-$x + $a * log($x) - $gln);
+    }
+
+    // Return the incomplete gamma function Q(n/2,x) evaluated by
+    // 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(int $n, float $x): float
+    {
+        /** @var float */
+        $gln = Gamma::ln($n / 2);
+        $a = 0.5 * $n;
+        $b = $x + 1 - $a;
+        $fpmin = 1.e-300;
+        $c = 1 / $fpmin;
+        $d = 1 / $b;
+        $h = $d;
+        for ($i = 1; $i < 101; ++$i) {
+            $an = -$i * ($i - $a);
+            $b += 2;
+            $d = $an * $d + $b;
+            if (abs($d) < $fpmin) {
+                $d = $fpmin;
+            }
+            $c = $b + $an / $c;
+            if (abs($c) < $fpmin) {
+                $c = $fpmin;
+            }
+            $d = 1 / $d;
+            $del = $d * $c;
+            $h = $h * $del;
+            if (abs($del - 1) < self::EPS) {
+                break;
+            }
+        }
+
+        return $h * exp(-$x + $a * log($x) - $gln);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
new file mode 100644
index 000000000..bd45a2298
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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
+    {
+        $probability = self::validateFloat($probability);
+
+        if ($probability < 0.0 || $probability > 1.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $probability;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
new file mode 100644
index 000000000..a03671ccc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Exponential
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        if (is_array($value) || is_array($lambda) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $lambda, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $lambda = DistributionValidations::validateFloat($lambda);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($lambda < 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative === true) {
+            return 1 - exp(0 - $value * $lambda);
+        }
+
+        return $lambda * exp(0 - $value * $lambda);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
new file mode 100644
index 000000000..ff413b6b8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class F
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        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);
+            $u = DistributionValidations::validateInt($u);
+            $v = DistributionValidations::validateInt($v);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($value < 0 || $u < 1 || $v < 1) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            $adjustedValue = ($u * $value) / ($u * $value + $v);
+
+            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)));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
new file mode 100644
index 000000000..df9906ea9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Fisher
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= -1) || ($value >= 1)) {
+            return ExcelError::NAN();
+        }
+
+        return 0.5 * log((1 + $value) / (1 - $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.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($probability)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $probability);
+        }
+
+        try {
+            DistributionValidations::validateFloat($probability);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (exp(2 * $probability) - 1) / (exp(2 * $probability) + 1);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
new file mode 100644
index 000000000..216f234c1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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 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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ((((int) $value) == ((float) $value)) && $value <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return self::gammaValue($value);
+    }
+
+    /**
+     * GAMMADIST.
+     *
+     * 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 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)
+    {
+        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);
+            $a = DistributionValidations::validateFloat($a);
+            $b = DistributionValidations::validateFloat($b);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($a <= 0) || ($b <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateDistribution($value, $a, $b, $cumulative);
+    }
+
+    /**
+     * GAMMAINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($alpha) || is_array($beta)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $alpha, $beta);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($alpha <= 0.0) || ($beta <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateInverse($probability, $alpha, $beta);
+    }
+
+    /**
+     * GAMMALN.
+     *
+     * 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 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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($value <= 0) {
+            return ExcelError::NAN();
+        }
+
+        return log(self::gammaValue($value));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
new file mode 100644
index 000000000..ee826fca7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
@@ -0,0 +1,390 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+abstract class GammaBase
+{
+    private const LOG_GAMMA_X_MAX_VALUE = 2.55e305;
+
+    private const EPS = 2.22e-16;
+
+    private const MAX_VALUE = 1.2e308;
+
+    private const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
+
+    private const MAX_ITERATIONS = 256;
+
+    /** @return float|string */
+    protected static function calculateDistribution(float $value, float $a, float $b, bool $cumulative)
+    {
+        if ($cumulative) {
+            return self::incompleteGamma($a, $value / $b) / self::gammaValue($a);
+        }
+
+        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;
+        $xHi = $alpha * $beta * 5;
+
+        $dx = 1024;
+        $x = $xNew = 1;
+        $i = 0;
+
+        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) {
+                $dx = 0;
+            } elseif ($error < 0.0) {
+                $xLo = $x;
+            } else {
+                $xHi = $x;
+            }
+
+            $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;
+            }
+
+            // If the NR fails to converge (which for example may be the
+            // case if the initial guess is too rough) we apply a bisection
+            // step to determine a more narrow interval around the root.
+            if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
+                $xNew = ($xLo + $xHi) / 2;
+                $dx = $xNew - $x;
+            }
+            $x = $xNew;
+        }
+
+        if ($i === self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return $x;
+    }
+
+    //
+    //    Implementation of the incomplete Gamma function
+    //
+    public static function incompleteGamma(float $a, float $x): float
+    {
+        static $max = 32;
+        $summer = 0;
+        for ($n = 0; $n <= $max; ++$n) {
+            $divisor = $a;
+            for ($i = 1; $i <= $n; ++$i) {
+                $divisor *= ($a + $i);
+            }
+            $summer += ($x ** $n / $divisor);
+        }
+
+        return $x ** $a * exp(0 - $x) * $summer;
+    }
+
+    //
+    //    Implementation of the Gamma function
+    //
+    public static function gammaValue(float $value): float
+    {
+        if ($value == 0.0) {
+            return 0;
+        }
+
+        static $p0 = 1.000000000190015;
+        static $p = [
+            1 => 76.18009172947146,
+            2 => -86.50532032941677,
+            3 => 24.01409824083091,
+            4 => -1.231739572450155,
+            5 => 1.208650973866179e-3,
+            6 => -5.395239384953e-6,
+        ];
+
+        $y = $x = $value;
+        $tmp = $x + 5.5;
+        $tmp -= ($x + 0.5) * log($tmp);
+
+        $summer = $p0;
+        for ($j = 1; $j <= 6; ++$j) {
+            $summer += ($p[$j] / ++$y);
+        }
+
+        return exp(0 - $tmp + log(self::SQRT2PI * $summer / $x));
+    }
+
+    private const  LG_D1 = -0.5772156649015328605195174;
+
+    private const LG_D2 = 0.4227843350984671393993777;
+
+    private const LG_D4 = 1.791759469228055000094023;
+
+    private const LG_P1 = [
+        4.945235359296727046734888,
+        201.8112620856775083915565,
+        2290.838373831346393026739,
+        11319.67205903380828685045,
+        28557.24635671635335736389,
+        38484.96228443793359990269,
+        26377.48787624195437963534,
+        7225.813979700288197698961,
+    ];
+
+    private const LG_P2 = [
+        4.974607845568932035012064,
+        542.4138599891070494101986,
+        15506.93864978364947665077,
+        184793.2904445632425417223,
+        1088204.76946882876749847,
+        3338152.967987029735917223,
+        5106661.678927352456275255,
+        3074109.054850539556250927,
+    ];
+
+    private const LG_P4 = [
+        14745.02166059939948905062,
+        2426813.369486704502836312,
+        121475557.4045093227939592,
+        2663432449.630976949898078,
+        29403789566.34553899906876,
+        170266573776.5398868392998,
+        492612579337.743088758812,
+        560625185622.3951465078242,
+    ];
+
+    private const LG_Q1 = [
+        67.48212550303777196073036,
+        1113.332393857199323513008,
+        7738.757056935398733233834,
+        27639.87074403340708898585,
+        54993.10206226157329794414,
+        61611.22180066002127833352,
+        36351.27591501940507276287,
+        8785.536302431013170870835,
+    ];
+
+    private const LG_Q2 = [
+        183.0328399370592604055942,
+        7765.049321445005871323047,
+        133190.3827966074194402448,
+        1136705.821321969608938755,
+        5267964.117437946917577538,
+        13467014.54311101692290052,
+        17827365.30353274213975932,
+        9533095.591844353613395747,
+    ];
+
+    private const LG_Q4 = [
+        2690.530175870899333379843,
+        639388.5654300092398984238,
+        41355999.30241388052042842,
+        1120872109.61614794137657,
+        14886137286.78813811542398,
+        101680358627.2438228077304,
+        341747634550.7377132798597,
+        446315818741.9713286462081,
+    ];
+
+    private const LG_C = [
+        -0.001910444077728,
+        8.4171387781295e-4,
+        -5.952379913043012e-4,
+        7.93650793500350248e-4,
+        -0.002777777777777681622553,
+        0.08333333333333333331554247,
+        0.0057083835261,
+    ];
+
+    // Rough estimate of the fourth root of logGamma_xBig
+    private const LG_FRTBIG = 2.25e76;
+
+    private const PNT68 = 0.6796875;
+
+    // Function cache for logGamma
+    /** @var float */
+    private static $logGammaCacheResult = 0.0;
+
+    /** @var float */
+    private static $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) {
+            return self::$logGammaCacheResult;
+        }
+
+        $y = $x;
+        if ($y > 0.0 && $y <= self::LOG_GAMMA_X_MAX_VALUE) {
+            if ($y <= self::EPS) {
+                $res = -log($y);
+            } elseif ($y <= 1.5) {
+                $res = self::logGamma1($y);
+            } elseif ($y <= 4.0) {
+                $res = self::logGamma2($y);
+            } elseif ($y <= 12.0) {
+                $res = self::logGamma3($y);
+            } else {
+                $res = self::logGamma4($y);
+            }
+        } else {
+            // --------------------------
+            //    Return for bad arguments
+            // --------------------------
+            $res = self::MAX_VALUE;
+        }
+
+        // ------------------------------
+        //    Final adjustments and return
+        // ------------------------------
+        self::$logGammaCacheX = $x;
+        self::$logGammaCacheResult = $res;
+
+        return $res;
+    }
+
+    private static function logGamma1(float $y): float
+    {
+        // ---------------------
+        //    EPS .LT. X .LE. 1.5
+        // ---------------------
+        if ($y < self::PNT68) {
+            $corr = -log($y);
+            $xm1 = $y;
+        } else {
+            $corr = 0.0;
+            $xm1 = $y - 1.0;
+        }
+
+        $xden = 1.0;
+        $xnum = 0.0;
+        if ($y <= 0.5 || $y >= self::PNT68) {
+            for ($i = 0; $i < 8; ++$i) {
+                $xnum = $xnum * $xm1 + self::LG_P1[$i];
+                $xden = $xden * $xm1 + self::LG_Q1[$i];
+            }
+
+            return $corr + $xm1 * (self::LG_D1 + $xm1 * ($xnum / $xden));
+        }
+
+        $xm2 = $y - 1.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm2 + self::LG_P2[$i];
+            $xden = $xden * $xm2 + self::LG_Q2[$i];
+        }
+
+        return $corr + $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
+    }
+
+    private static function logGamma2(float $y): float
+    {
+        // ---------------------
+        //    1.5 .LT. X .LE. 4.0
+        // ---------------------
+        $xm2 = $y - 2.0;
+        $xden = 1.0;
+        $xnum = 0.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm2 + self::LG_P2[$i];
+            $xden = $xden * $xm2 + self::LG_Q2[$i];
+        }
+
+        return $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
+    }
+
+    protected static function logGamma3(float $y): float
+    {
+        // ----------------------
+        //    4.0 .LT. X .LE. 12.0
+        // ----------------------
+        $xm4 = $y - 4.0;
+        $xden = -1.0;
+        $xnum = 0.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm4 + self::LG_P4[$i];
+            $xden = $xden * $xm4 + self::LG_Q4[$i];
+        }
+
+        return self::LG_D4 + $xm4 * ($xnum / $xden);
+    }
+
+    protected static function logGamma4(float $y): float
+    {
+        // ---------------------------------
+        //    Evaluate for argument .GE. 12.0
+        // ---------------------------------
+        $res = 0.0;
+        if ($y <= self::LG_FRTBIG) {
+            $res = self::LG_C[6];
+            $ysq = $y * $y;
+            for ($i = 0; $i < 6; ++$i) {
+                $res = $res / $ysq + self::LG_C[$i];
+            }
+            $res /= $y;
+            $corr = log($y);
+            $res = $res + log(self::SQRT2PI) - 0.5 * $corr;
+            $res += $y * ($corr - 1.0);
+        }
+
+        return $res;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
new file mode 100644
index 000000000..b3ad69d1a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Combinations;
+
+class HyperGeometric
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        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);
+            $sampleNumber = DistributionValidations::validateInt($sampleNumber);
+            $populationSuccesses = DistributionValidations::validateInt($populationSuccesses);
+            $populationNumber = DistributionValidations::validateInt($populationNumber);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
+            return ExcelError::NAN();
+        }
+        if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
+            return ExcelError::NAN();
+        }
+        if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
+            return ExcelError::NAN();
+        }
+
+        $successesPopulationAndSample = (float) Combinations::withoutRepetition($populationSuccesses, $sampleSuccesses);
+        $numbersPopulationAndSample = (float) Combinations::withoutRepetition($populationNumber, $sampleNumber);
+        $adjustedPopulationAndSample = (float) Combinations::withoutRepetition(
+            $populationNumber - $populationSuccesses,
+            $sampleNumber - $sampleSuccesses
+        );
+
+        return $successesPopulationAndSample * $adjustedPopulationAndSample / $numbersPopulationAndSample;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
new file mode 100644
index 000000000..d572d234f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class LogNormal
+{
+    use ArrayEnabled;
+
+    /**
+     * LOGNORMDIST.
+     *
+     * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
+     * 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 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)
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= 0) || ($stdDev <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        return StandardNormal::cumulative((log($value) - $mean) / $stdDev);
+    }
+
+    /**
+     * LOGNORM.DIST.
+     *
+     * Returns the lognormal distribution of x, where ln(x) is normally distributed
+     * 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 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)
+    {
+        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);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= 0) || ($stdDev <= 0)) {
+            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)));
+    }
+
+    /**
+     * LOGINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev <= 0) {
+            return ExcelError::NAN();
+        }
+        /** @var float */
+        $inverse = StandardNormal::inverse($probability);
+
+        return exp($mean + $stdDev * $inverse);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
new file mode 100644
index 000000000..d30140728
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
@@ -0,0 +1,65 @@
+<?php
+
+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)
+    {
+        $this->callback = $callback;
+    }
+
+    /** @return float|string */
+    public function execute(float $probability)
+    {
+        $xLo = 100;
+        $xHi = 0;
+
+        $dx = 1;
+        $x = $xNew = 1;
+        $i = 0;
+
+        while ((abs($dx) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
+            // Apply Newton-Raphson step
+            $result = call_user_func($this->callback, $x);
+            $error = $result - $probability;
+
+            if ($error == 0.0) {
+                $dx = 0;
+            } elseif ($error < 0.0) {
+                $xLo = $x;
+            } else {
+                $xHi = $x;
+            }
+
+            // Avoid division by zero
+            if ($result != 0.0) {
+                $dx = $error / $result;
+                $xNew = $x - $dx;
+            }
+
+            // If the NR fails to converge (which for example may be the
+            // case if the initial guess is too rough) we apply a bisection
+            // step to determine a more narrow interval around the root.
+            if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
+                $xNew = ($xLo + $xHi) / 2;
+                $dx = $xNew - $x;
+            }
+            $x = $xNew;
+        }
+
+        if ($i == self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return $x;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
new file mode 100644
index 000000000..5715dacfa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
@@ -0,0 +1,180 @@
+<?php
+
+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\Information\ExcelError;
+
+class Normal
+{
+    use ArrayEnabled;
+
+    public const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        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);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev < 0) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return 0.5 * (1 + Engineering\Erf::erfValue(($value - $mean) / ($stdDev * sqrt(2))));
+        }
+
+        return (1 / (self::SQRT2PI * $stdDev)) * exp(0 - (($value - $mean) ** 2 / (2 * ($stdDev * $stdDev))));
+    }
+
+    /**
+     * NORMINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev < 0) {
+            return ExcelError::NAN();
+        }
+
+        return (self::inverseNcdf($probability) * $stdDev) + $mean;
+    }
+
+    /*
+     *                                inverse_ncdf.php
+     *                            -------------------
+     *    begin                : Friday, January 16, 2004
+     *    copyright            : (C) 2004 Michael Nickerson
+     *    email                : nickersonm@yahoo.com
+     *
+     */
+    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
+        //    a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
+        //    I have not checked the accuracy of this implementation. Be aware that PHP
+        //    will truncate the coeficcients to 14 digits.
+
+        //    You have permission to use and distribute this function freely for
+        //    whatever purpose you want, but please show common courtesy and give credit
+        //    where credit is due.
+
+        //    Input paramater is $p - probability - where 0 < p < 1.
+
+        //    Coefficients in rational approximations
+        static $a = [
+            1 => -3.969683028665376e+01,
+            2 => 2.209460984245205e+02,
+            3 => -2.759285104469687e+02,
+            4 => 1.383577518672690e+02,
+            5 => -3.066479806614716e+01,
+            6 => 2.506628277459239e+00,
+        ];
+
+        static $b = [
+            1 => -5.447609879822406e+01,
+            2 => 1.615858368580409e+02,
+            3 => -1.556989798598866e+02,
+            4 => 6.680131188771972e+01,
+            5 => -1.328068155288572e+01,
+        ];
+
+        static $c = [
+            1 => -7.784894002430293e-03,
+            2 => -3.223964580411365e-01,
+            3 => -2.400758277161838e+00,
+            4 => -2.549732539343734e+00,
+            5 => 4.374664141464968e+00,
+            6 => 2.938163982698783e+00,
+        ];
+
+        static $d = [
+            1 => 7.784695709041462e-03,
+            2 => 3.224671290700398e-01,
+            3 => 2.445134137142996e+00,
+            4 => 3.754408661907416e+00,
+        ];
+
+        //    Define lower and upper region break-points.
+        $p_low = 0.02425; //Use lower region approx. below this
+        $p_high = 1 - $p_low; //Use upper region approx. above this
+
+        if (0 < $p && $p < $p_low) {
+            //    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);
+        } 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);
+        }
+
+        //    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);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
new file mode 100644
index 000000000..041c34a0f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class Poisson
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        if (is_array($value) || is_array($mean) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($mean < 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            $summer = 0;
+            $floor = floor($value);
+            for ($i = 0; $i <= $floor; ++$i) {
+                /** @var float */
+                $fact = MathTrig\Factorial::fact($i);
+                $summer += $mean ** $i / $fact;
+            }
+
+            return exp(0 - $mean) * $summer;
+        }
+        /** @var float */
+        $fact = MathTrig\Factorial::fact($value);
+
+        return (exp(0 - $mean) * $mean ** $value) / $fact;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
new file mode 100644
index 000000000..2777d8099
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
@@ -0,0 +1,153 @@
+<?php
+
+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.
+     *
+     * 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.
+     *
+     * 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 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)
+    {
+        return Normal::distribution($value, 0, 1, true);
+    }
+
+    /**
+     * 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.
+     *
+     * 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 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)
+    {
+        return Normal::distribution($value, 0, 1, $cumulative);
+    }
+
+    /**
+     * NORMSINV.
+     *
+     * Returns the inverse of the standard normal cumulative distribution
+     *
+     * @param mixed $value float probability for which we want the value
+     *                      Or can be an array of values
+     *
+     * 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)
+    {
+        return Normal::inverse($value, 0, 1);
+    }
+
+    /**
+     * GAUSS.
+     *
+     * 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
+     *                      Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (!is_numeric($value)) {
+            return ExcelError::VALUE();
+        }
+        /** @var float */
+        $dist = self::distribution($value, true);
+
+        return $dist - 0.5;
+    }
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        if (is_array($m0) || is_array($sigma)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $dataSet, $m0, $sigma);
+        }
+
+        $dataSet = Functions::flattenArrayIndexed($dataSet);
+
+        if (!is_numeric($m0) || ($sigma !== null && !is_numeric($sigma))) {
+            return ExcelError::VALUE();
+        }
+
+        if ($sigma === null) {
+            /** @var float */
+            $sigma = StandardDeviations::STDEV($dataSet);
+        }
+        $n = count($dataSet);
+
+        $sub1 = Averages::average($dataSet);
+
+        return is_numeric($sub1) ? (1 - self::cumulative(($sub1 - $m0) / ($sigma / sqrt($n)))) : $sub1;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
new file mode 100644
index 000000000..9d89af631
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
@@ -0,0 +1,137 @@
+<?php
+
+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
+{
+    use ArrayEnabled;
+
+    /**
+     * TDIST.
+     *
+     * 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 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)
+    {
+        if (is_array($value) || is_array($degrees) || is_array($tails)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees, $tails);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $degrees = DistributionValidations::validateInt($degrees);
+            $tails = DistributionValidations::validateInt($tails);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateDistribution($value, $degrees, $tails);
+    }
+
+    /**
+     * TINV.
+     *
+     * 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 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)
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $callback = function ($value) use ($degrees) {
+            return 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)
+    {
+        //    tdist, which finds the probability that corresponds to a given value
+        //    of t with k degrees of freedom. This algorithm is translated from a
+        //    pascal function on p81 of "Statistical Computing in Pascal" by D
+        //    Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
+        //    London). The above Pascal algorithm is itself a translation of the
+        //    fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
+        //    Laboratory as reported in (among other places) "Applied Statistics
+        //    Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
+        //    Horwood Ltd.; W. Sussex, England).
+        $tterm = $degrees;
+        $ttheta = atan2($value, sqrt($tterm));
+        $tc = cos($ttheta);
+        $ts = sin($ttheta);
+
+        if (($degrees % 2) === 1) {
+            $ti = 3;
+            $tterm = $tc;
+        } else {
+            $ti = 2;
+            $tterm = 1;
+        }
+
+        $tsum = $tterm;
+        while ($ti < $degrees) {
+            $tterm *= $tc * $tc * ($ti - 1) / $ti;
+            $tsum += $tterm;
+            $ti += 2;
+        }
+
+        $tsum *= $ts;
+        if (($degrees % 2) == 1) {
+            $tsum = Functions::M_2DIVPI * ($tsum + $ttheta);
+        }
+
+        $tValue = 0.5 * (1 + $tsum);
+        if ($tails == 1) {
+            return 1 - abs($tValue);
+        }
+
+        return 1 - abs((1 - $tValue) - $tValue);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
new file mode 100644
index 000000000..51392c41f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Weibull
+{
+    use ArrayEnabled;
+
+    /**
+     * WEIBULL.
+     *
+     * Returns the Weibull distribution. Use this distribution in reliability
+     * 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 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)
+    {
+        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);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return 1 - exp(0 - ($value / $beta) ** $alpha);
+        }
+
+        return ($alpha / $beta ** $alpha) * $value ** ($alpha - 1) * exp(0 - ($value / $beta) ** $alpha);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
new file mode 100644
index 000000000..84726d580
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+abstract class MaxMinBase
+{
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    protected static function datatypeAdjustmentAllowStrings($value)
+    {
+        if (is_bool($value)) {
+            return (int) $value;
+        } elseif (is_string($value)) {
+            return 0;
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
new file mode 100644
index 000000000..304b44b85
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+
+class Maximum extends MaxMinBase
+{
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float
+     */
+    public static function max(...$args)
+    {
+        $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)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MAXA.
+     *
+     * Returns the greatest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MAXA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float
+     */
+    public static function maxA(...$args)
+    {
+        $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);
+                if (($returnValue === null) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
new file mode 100644
index 000000000..0dbbf3a3e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+
+class Minimum extends MaxMinBase
+{
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float
+     */
+    public static function min(...$args)
+    {
+        $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)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MINA.
+     *
+     * Returns the smallest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MINA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float
+     */
+    public static function minA(...$args)
+    {
+        $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);
+                if (($returnValue === null) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
new file mode 100644
index 000000000..4565ca442
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Percentiles
+{
+    public const RANK_SORT_DESCENDING = 0;
+
+    public const RANK_SORT_ASCENDING = 1;
+
+    /**
+     * PERCENTILE.
+     *
+     * Returns the nth percentile of values in a range..
+     *
+     * Excel Function:
+     *        PERCENTILE(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function PERCENTILE(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $entry = array_pop($aArgs);
+
+        try {
+            $entry = StatisticalValidations::validateFloat($entry);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($entry < 0) || ($entry > 1)) {
+            return ExcelError::NAN();
+        }
+
+        $mArgs = self::percentileFilterValues($aArgs);
+        $mValueCount = count($mArgs);
+        if ($mValueCount > 0) {
+            sort($mArgs);
+            $count = Counts::COUNT($mArgs);
+            $index = $entry * ($count - 1);
+            $iBase = floor($index);
+            if ($index == $iBase) {
+                return $mArgs[$index];
+            }
+            $iNext = $iBase + 1;
+            $iProportion = $index - $iBase;
+
+            return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * 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
+     *
+     * @param mixed $valueSet An array of (float) values, or a reference to, a list of numbers
+     * @param mixed $value The number whose rank you want to find
+     * @param mixed $significance The (integer) 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)
+    {
+        $valueSet = Functions::flattenArray($valueSet);
+        $value = Functions::flattenSingleValue($value);
+        $significance = ($significance === null) ? 3 : Functions::flattenSingleValue($significance);
+
+        try {
+            $value = StatisticalValidations::validateFloat($value);
+            $significance = StatisticalValidations::validateInt($significance);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $valueSet = self::rankFilterValues($valueSet);
+        $valueCount = count($valueSet);
+        if ($valueCount == 0) {
+            return ExcelError::NA();
+        }
+        sort($valueSet, SORT_NUMERIC);
+
+        $valueAdjustor = $valueCount - 1;
+        if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
+            return ExcelError::NA();
+        }
+
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            $pos = 0;
+            $testValue = $valueSet[0];
+            while ($testValue < $value) {
+                $testValue = $valueSet[++$pos];
+            }
+            --$pos;
+            $pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
+        }
+
+        return round(((float) $pos) / $valueAdjustor, $significance);
+    }
+
+    /**
+     * QUARTILE.
+     *
+     * Returns the quartile of a data set.
+     *
+     * Excel Function:
+     *        QUARTILE(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function QUARTILE(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+        $entry = array_pop($aArgs);
+
+        try {
+            $entry = StatisticalValidations::validateFloat($entry);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $entry = floor($entry);
+        $entry /= 4;
+        if (($entry < 0) || ($entry > 1)) {
+            return ExcelError::NAN();
+        }
+
+        return self::PERCENTILE($aArgs, $entry);
+    }
+
+    /**
+     * RANK.
+     *
+     * Returns the rank of a number in a list of numbers.
+     *
+     * @param mixed $value The number whose rank you want to find
+     * @param mixed $valueSet An array of float values, 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 (0 = Descending, 1 = Ascending)
+     */
+    public static function RANK($value, $valueSet, $order = self::RANK_SORT_DESCENDING)
+    {
+        $value = Functions::flattenSingleValue($value);
+        $valueSet = Functions::flattenArray($valueSet);
+        $order = ($order === null) ? self::RANK_SORT_DESCENDING : Functions::flattenSingleValue($order);
+
+        try {
+            $value = StatisticalValidations::validateFloat($value);
+            $order = StatisticalValidations::validateInt($order);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $valueSet = self::rankFilterValues($valueSet);
+        if ($order === self::RANK_SORT_DESCENDING) {
+            rsort($valueSet, SORT_NUMERIC);
+        } else {
+            sort($valueSet, SORT_NUMERIC);
+        }
+
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            return ExcelError::NA();
+        }
+
+        return ++$pos;
+    }
+
+    protected static function percentileFilterValues(array $dataSet): array
+    {
+        return array_filter(
+            $dataSet,
+            function ($value): bool {
+                return is_numeric($value) && !is_string($value);
+            }
+        );
+    }
+
+    protected static function rankFilterValues(array $dataSet): array
+    {
+        return array_filter(
+            $dataSet,
+            function ($value): bool {
+                return is_numeric($value);
+            }
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
new file mode 100644
index 000000000..b29356c40
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\Shared\IntOrFloat;
+
+class Permutations
+{
+    use ArrayEnabled;
+
+    /**
+     * 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.
+     *
+     * @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 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)
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = StatisticalValidations::validateInt($numObjs);
+            $numInSet = StatisticalValidations::validateInt($numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($numObjs < $numInSet) {
+            return ExcelError::NAN();
+        }
+        $result1 = MathTrig\Factorial::fact($numObjs);
+        if (is_string($result1)) {
+            return $result1;
+        }
+        $result2 = MathTrig\Factorial::fact($numObjs - $numInSet);
+        if (is_string($result2)) {
+            return $result2;
+        }
+        // phpstan thinks result1 and result2 can be arrays; they can't.
+        $result = round($result1 / $result2); // @phpstan-ignore-line
+
+        return IntOrFloat::evaluate($result);
+    }
+
+    /**
+     * PERMUTATIONA.
+     *
+     * Returns the number of permutations for a given number of objects (with repetitions)
+     *     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 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)
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = StatisticalValidations::validateInt($numObjs);
+            $numInSet = StatisticalValidations::validateInt($numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($numObjs < 0 || $numInSet < 0) {
+            return ExcelError::NAN();
+        }
+
+        $result = $numObjs ** $numInSet;
+
+        return IntOrFloat::evaluate($result);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
new file mode 100644
index 000000000..2eef5fc7f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Size
+{
+    /**
+     * 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)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function large(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
+            $mArgs = self::filter($aArgs);
+            $count = Counts::COUNT($mArgs);
+            --$entry;
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
+            }
+            rsort($mArgs);
+
+            return $mArgs[$entry];
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * 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)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function small(...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
+            $mArgs = self::filter($aArgs);
+            $count = Counts::COUNT($mArgs);
+            --$entry;
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
+            }
+            sort($mArgs);
+
+            return $mArgs[$entry];
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * @param mixed[] $args Data values
+     */
+    protected static function filter(array $args): array
+    {
+        $mArgs = [];
+
+        foreach ($args as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $mArgs[] = $arg;
+            }
+        }
+
+        return $mArgs;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
new file mode 100644
index 000000000..af2712053
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+class StandardDeviations
+{
+    /**
+     * 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[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function STDEV(...$args)
+    {
+        $result = Variances::VAR(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVA.
+     *
+     * Estimates standard deviation based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function STDEVA(...$args)
+    {
+        $result = Variances::VARA(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVP.
+     *
+     * Calculates standard deviation based on the entire population
+     *
+     * Excel Function:
+     *        STDEVP(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function STDEVP(...$args)
+    {
+        $result = Variances::VARP(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVPA.
+     *
+     * Calculates standard deviation based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVPA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string
+     */
+    public static function STDEVPA(...$args)
+    {
+        $result = Variances::VARPA(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
new file mode 100644
index 000000000..51b0a5187
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+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 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 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)
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
+
+        try {
+            $value = self::validateFloat($value);
+            $mean = self::validateFloat($mean);
+            $stdDev = self::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev <= 0) {
+            return ExcelError::NAN();
+        }
+
+        return ($value - $mean) / $stdDev;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
new file mode 100644
index 000000000..e23a52ccd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class StatisticalValidations
+{
+    /**
+     * @param mixed $value
+     */
+    public static function validateFloat($value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateInt($value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateBool($value): bool
+    {
+        if (!is_bool($value) && !is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (bool) $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
new file mode 100644
index 000000000..705de17d8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
@@ -0,0 +1,434 @@
+<?php
+
+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) {
+            if ((is_bool($value)) || (is_string($value)) || ($value === null)) {
+                unset($array1[$key], $array2[$key]);
+            }
+        }
+    }
+
+    /**
+     * @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(&$array1, &$array2): void
+    {
+        if (!is_array($array1)) {
+            $array1 = [$array1];
+        }
+        if (!is_array($array2)) {
+            $array2 = [$array2];
+        }
+
+        $array1 = Functions::flattenArray($array1);
+        $array2 = Functions::flattenArray($array2);
+
+        self::filterTrendValues($array1, $array2);
+        self::filterTrendValues($array2, $array1);
+
+        // Reset the array indexes
+        $array1 = array_merge($array1);
+        $array2 = array_merge($array2);
+    }
+
+    protected static function validateTrendArrays(array $yValues, array $xValues): void
+    {
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount === 0) || ($yValueCount !== $xValueCount)) {
+            throw new Exception(ExcelError::NA());
+        } elseif ($yValueCount === 1) {
+            throw new Exception(ExcelError::DIV0());
+        }
+    }
+
+    /**
+     * CORREL.
+     *
+     * Returns covariance, the average of the products of deviations for each data point pair.
+     *
+     * @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)
+    {
+        if (($xValues === null) || (!is_array($yValues)) || (!is_array($xValues))) {
+            return ExcelError::VALUE();
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getCorrelation();
+    }
+
+    /**
+     * COVAR.
+     *
+     * 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
+     */
+    public static function COVAR($yValues, $xValues)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getCovariance();
+    }
+
+    /**
+     * FORECAST.
+     *
+     * Calculates, or predicts, a future value by using existing values.
+     * 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
+     *                      Or can be an array of values
+     * @param mixed $yValues array of mixed Data Series Y
+     * @param mixed $xValues of mixed Data Series X
+     *
+     * @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)
+    {
+        if (is_array($xValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $xValue, $yValues, $xValues);
+        }
+
+        try {
+            $xValue = StatisticalValidations::validateFloat($xValue);
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getValueOfYForX($xValue);
+    }
+
+    /**
+     * GROWTH.
+     *
+     * Returns values along a predicted exponential Trend
+     *
+     * @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 mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     *
+     * @return float[]
+     */
+    public static function GROWTH($yValues, $xValues = [], $newValues = [], $const = true)
+    {
+        $yValues = Functions::flattenArray($yValues);
+        $xValues = Functions::flattenArray($xValues);
+        $newValues = Functions::flattenArray($newValues);
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+
+        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitExponential->getXValues();
+        }
+
+        $returnArray = [];
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = [$bestFitExponential->getValueOfYForX($xValue)];
+        }
+
+        return $returnArray; //* @phpstan-ignore-line
+    }
+
+    /**
+     * INTERCEPT.
+     *
+     * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     *
+     * @return float|string
+     */
+    public static function INTERCEPT($yValues, $xValues)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getIntersect();
+    }
+
+    /**
+     * 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.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param null|mixed[] $xValues Data Series X
+     * @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
+     */
+    public static function LINEST($yValues, $xValues = null, $const = true, $stats = false)
+    {
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
+        if ($xValues === null) {
+            $xValues = $yValues;
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
+
+        if ($stats === true) {
+            return [
+                [
+                    $bestFitLinear->getSlope(),
+                    $bestFitLinear->getIntersect(),
+                ],
+                [
+                    $bestFitLinear->getSlopeSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitLinear->getIntersectSE(),
+                ],
+                [
+                    $bestFitLinear->getGoodnessOfFit(),
+                    $bestFitLinear->getStdevOfResiduals(),
+                ],
+                [
+                    $bestFitLinear->getF(),
+                    $bestFitLinear->getDFResiduals(),
+                ],
+                [
+                    $bestFitLinear->getSSRegression(),
+                    $bestFitLinear->getSSResiduals(),
+                ],
+            ];
+        }
+
+        return [
+            $bestFitLinear->getSlope(),
+            $bestFitLinear->getIntersect(),
+        ];
+    }
+
+    /**
+     * LOGEST.
+     *
+     * Calculates an exponential curve that best fits the X and Y data series,
+     *        and then returns an array that describes the line.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param null|mixed[] $xValues Data Series X
+     * @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
+     */
+    public static function LOGEST($yValues, $xValues = null, $const = true, $stats = false)
+    {
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
+        if ($xValues === null) {
+            $xValues = $yValues;
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        foreach ($yValues as $value) {
+            if ($value < 0.0) {
+                return ExcelError::NAN();
+            }
+        }
+
+        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+
+        if ($stats === true) {
+            return [
+                [
+                    $bestFitExponential->getSlope(),
+                    $bestFitExponential->getIntersect(),
+                ],
+                [
+                    $bestFitExponential->getSlopeSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitExponential->getIntersectSE(),
+                ],
+                [
+                    $bestFitExponential->getGoodnessOfFit(),
+                    $bestFitExponential->getStdevOfResiduals(),
+                ],
+                [
+                    $bestFitExponential->getF(),
+                    $bestFitExponential->getDFResiduals(),
+                ],
+                [
+                    $bestFitExponential->getSSRegression(),
+                    $bestFitExponential->getSSResiduals(),
+                ],
+            ];
+        }
+
+        return [
+            $bestFitExponential->getSlope(),
+            $bestFitExponential->getIntersect(),
+        ];
+    }
+
+    /**
+     * RSQ.
+     *
+     * Returns the square of the Pearson product moment correlation coefficient through data points
+     *     in known_y's and known_x's.
+     *
+     * @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)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getGoodnessOfFit();
+    }
+
+    /**
+     * SLOPE.
+     *
+     * Returns the slope of the linear regression line through data points in known_y's and known_x's.
+     *
+     * @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)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getSlope();
+    }
+
+    /**
+     * STEYX.
+     *
+     * 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)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getStdevOfResiduals();
+    }
+
+    /**
+     * TREND.
+     *
+     * Returns values along a linear Trend
+     *
+     * @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 mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     *
+     * @return float[]
+     */
+    public static function TREND($yValues, $xValues = [], $newValues = [], $const = true)
+    {
+        $yValues = Functions::flattenArray($yValues);
+        $xValues = Functions::flattenArray($xValues);
+        $newValues = Functions::flattenArray($newValues);
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitLinear->getXValues();
+        }
+
+        $returnArray = [];
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = [$bestFitLinear->getValueOfYForX($xValue)];
+        }
+
+        return $returnArray; //* @phpstan-ignore-line
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
new file mode 100644
index 000000000..25393fd15
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+abstract class VarianceBase
+{
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    protected static function datatypeAdjustmentAllowStrings($value)
+    {
+        if (is_bool($value)) {
+            return (int) $value;
+        } elseif (is_string($value)) {
+            return 0;
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    protected static function datatypeAdjustmentBooleans($value)
+    {
+        if (is_bool($value) && (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE)) {
+            return (int) $value;
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
new file mode 100644
index 000000000..938e671bf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Variances extends VarianceBase
+{
+    /**
+     * VAR.
+     *
+     * Estimates variance based on a sample.
+     *
+     * Excel Function:
+     *        VAR(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VAR(...$args)
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            $arg = self::datatypeAdjustmentBooleans($arg);
+
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARA.
+     *
+     * Estimates variance based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARA(...$args)
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) && (Functions::isValue($k))) {
+                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 != '')))) {
+                    $arg = self::datatypeAdjustmentAllowStrings($arg);
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARP.
+     *
+     * Calculates variance based on the entire population
+     *
+     * Excel Function:
+     *        VARP(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARP(...$args)
+    {
+        // Return value
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            $arg = self::datatypeAdjustmentBooleans($arg);
+
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * $aCount);
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARPA.
+     *
+     * Calculates variance based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARPA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARPA(...$args)
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) && (Functions::isValue($k))) {
+                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 != '')))) {
+                    $arg = self::datatypeAdjustmentAllowStrings($arg);
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * $aCount);
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php
index bbb03926c..7cc1c70da 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php
@@ -2,141 +2,91 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use DateTimeInterface;
 
+/**
+ * @deprecated 1.18.0
+ */
 class TextData
 {
-    private static $invalidChars;
-
-    private static function unicodeToOrd($character)
-    {
-        return unpack('V', iconv('UTF-8', 'UCS-4LE', $character))[1];
-    }
-
     /**
      * CHARACTER.
      *
+     * @deprecated 1.18.0
+     *      Use the character() method in the TextData\CharacterConvert class instead
+     * @see TextData\CharacterConvert::character()
+     *
      * @param string $character Value
      *
-     * @return string
+     * @return array|string
      */
     public static function CHARACTER($character)
     {
-        $character = Functions::flattenSingleValue($character);
-
-        if ((!is_numeric($character)) || ($character < 0)) {
-            return Functions::VALUE();
-        }
-
-        if (function_exists('iconv')) {
-            return iconv('UCS-4LE', 'UTF-8', pack('V', $character));
-        }
-
-        return mb_convert_encoding('&#' . (int) $character . ';', 'UTF-8', 'HTML-ENTITIES');
+        return TextData\CharacterConvert::character($character);
     }
 
     /**
      * TRIMNONPRINTABLE.
      *
+     * @deprecated 1.18.0
+     *      Use the nonPrintable() method in the TextData\Trim class instead
+     * @see TextData\Trim::nonPrintable()
+     *
      * @param mixed $stringValue Value to check
      *
-     * @return string
+     * @return null|array|string
      */
     public static function TRIMNONPRINTABLE($stringValue = '')
     {
-        $stringValue = Functions::flattenSingleValue($stringValue);
-
-        if (is_bool($stringValue)) {
-            return ($stringValue) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        if (self::$invalidChars === null) {
-            self::$invalidChars = range(chr(0), chr(31));
-        }
-
-        if (is_string($stringValue) || is_numeric($stringValue)) {
-            return str_replace(self::$invalidChars, '', trim($stringValue, "\x00..\x1F"));
-        }
-
-        return null;
+        return TextData\Trim::nonPrintable($stringValue);
     }
 
     /**
      * TRIMSPACES.
      *
+     * @deprecated 1.18.0
+     *      Use the spaces() method in the TextData\Trim class instead
+     * @see TextData\Trim::spaces()
+     *
      * @param mixed $stringValue Value to check
      *
-     * @return string
+     * @return array|string
      */
     public static function TRIMSPACES($stringValue = '')
     {
-        $stringValue = Functions::flattenSingleValue($stringValue);
-        if (is_bool($stringValue)) {
-            return ($stringValue) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        if (is_string($stringValue) || is_numeric($stringValue)) {
-            return trim(preg_replace('/ +/', ' ', trim($stringValue, ' ')), ' ');
-        }
-
-        return null;
-    }
-
-    private static function convertBooleanValue($value)
-    {
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-            return (int) $value;
-        }
-
-        return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        return TextData\Trim::spaces($stringValue);
     }
 
     /**
      * ASCIICODE.
      *
-     * @param string $characters Value
+     * @deprecated 1.18.0
+     *      Use the code() method in the TextData\CharacterConvert class instead
+     * @see TextData\CharacterConvert::code()
      *
-     * @return int
+     * @param array|string $characters Value
+     *
+     * @return array|int|string A string if arguments are invalid
      */
     public static function ASCIICODE($characters)
     {
-        if (($characters === null) || ($characters === '')) {
-            return Functions::VALUE();
-        }
-        $characters = Functions::flattenSingleValue($characters);
-        if (is_bool($characters)) {
-            $characters = self::convertBooleanValue($characters);
-        }
-
-        $character = $characters;
-        if (mb_strlen($characters, 'UTF-8') > 1) {
-            $character = mb_substr($characters, 0, 1, 'UTF-8');
-        }
-
-        return self::unicodeToOrd($character);
+        return TextData\CharacterConvert::code($characters);
     }
 
     /**
      * CONCATENATE.
      *
+     * @deprecated 1.18.0
+     *      Use the CONCATENATE() method in the TextData\Concatenate class instead
+     * @see TextData\Concatenate::CONCATENATE()
+     *
+     * @param array $args
+     *
      * @return string
      */
     public static function CONCATENATE(...$args)
     {
-        $returnValue = '';
-
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            if (is_bool($arg)) {
-                $arg = self::convertBooleanValue($arg);
-            }
-            $returnValue .= $arg;
-        }
-
-        return $returnValue;
+        return TextData\Concatenate::CONCATENATE(...$args);
     }
 
     /**
@@ -145,259 +95,160 @@ class TextData
      * 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
+     *      Use the DOLLAR() method in the TextData\Format class instead
+     * @see TextData\Format::DOLLAR()
+     *
      * @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
+     * @return array|string
      */
     public static function DOLLAR($value = 0, $decimals = 2)
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimals = $decimals === null ? 0 : Functions::flattenSingleValue($decimals);
-
-        // Validate parameters
-        if (!is_numeric($value) || !is_numeric($decimals)) {
-            return Functions::NAN();
-        }
-        $decimals = floor($decimals);
-
-        $mask = '$#,##0';
-        if ($decimals > 0) {
-            $mask .= '.' . str_repeat('0', $decimals);
-        } else {
-            $round = pow(10, abs($decimals));
-            if ($value < 0) {
-                $round = 0 - $round;
-            }
-            $value = MathTrig::MROUND($value, $round);
-        }
-
-        return NumberFormat::toFormattedString($value, $mask);
+        return TextData\Format::DOLLAR($value, $decimals);
     }
 
     /**
-     * SEARCHSENSITIVE.
+     * FIND.
      *
-     * @param string $needle The string to look for
-     * @param string $haystack The string in which to look
-     * @param int $offset Offset within $haystack
+     * @deprecated 1.18.0
+     *      Use the sensitive() method in the TextData\Search class instead
+     * @see TextData\Search::sensitive()
      *
-     * @return string
+     * @param array|string $needle The string to look for
+     * @param array|string $haystack The string in which to look
+     * @param array|int $offset Offset within $haystack
+     *
+     * @return array|int|string
      */
     public static function SEARCHSENSITIVE($needle, $haystack, $offset = 1)
     {
-        $needle = Functions::flattenSingleValue($needle);
-        $haystack = Functions::flattenSingleValue($haystack);
-        $offset = Functions::flattenSingleValue($offset);
-
-        if (!is_bool($needle)) {
-            if (is_bool($haystack)) {
-                $haystack = ($haystack) ? Calculation::getTRUE() : Calculation::getFALSE();
-            }
-
-            if (($offset > 0) && (StringHelper::countCharacters($haystack) > $offset)) {
-                if (StringHelper::countCharacters($needle) === 0) {
-                    return $offset;
-                }
-
-                $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
-                if ($pos !== false) {
-                    return ++$pos;
-                }
-            }
-        }
-
-        return Functions::VALUE();
+        return TextData\Search::sensitive($needle, $haystack, $offset);
     }
 
     /**
-     * SEARCHINSENSITIVE.
+     * SEARCH.
      *
-     * @param string $needle The string to look for
-     * @param string $haystack The string in which to look
-     * @param int $offset Offset within $haystack
+     * @deprecated 1.18.0
+     *      Use the insensitive() method in the TextData\Search class instead
+     * @see TextData\Search::insensitive()
      *
-     * @return string
+     * @param array|string $needle The string to look for
+     * @param array|string $haystack The string in which to look
+     * @param array|int $offset Offset within $haystack
+     *
+     * @return array|int|string
      */
     public static function SEARCHINSENSITIVE($needle, $haystack, $offset = 1)
     {
-        $needle = Functions::flattenSingleValue($needle);
-        $haystack = Functions::flattenSingleValue($haystack);
-        $offset = Functions::flattenSingleValue($offset);
-
-        if (!is_bool($needle)) {
-            if (is_bool($haystack)) {
-                $haystack = ($haystack) ? Calculation::getTRUE() : Calculation::getFALSE();
-            }
-
-            if (($offset > 0) && (StringHelper::countCharacters($haystack) > $offset)) {
-                if (StringHelper::countCharacters($needle) === 0) {
-                    return $offset;
-                }
-
-                $pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
-                if ($pos !== false) {
-                    return ++$pos;
-                }
-            }
-        }
-
-        return Functions::VALUE();
+        return TextData\Search::insensitive($needle, $haystack, $offset);
     }
 
     /**
      * FIXEDFORMAT.
      *
+     * @deprecated 1.18.0
+     *      Use the FIXEDFORMAT() method in the TextData\Format class instead
+     * @see TextData\Format::FIXEDFORMAT()
+     *
      * @param mixed $value Value to check
      * @param int $decimals
      * @param bool $no_commas
      *
-     * @return string
+     * @return array|string
      */
     public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = false)
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimals = Functions::flattenSingleValue($decimals);
-        $no_commas = Functions::flattenSingleValue($no_commas);
-
-        // Validate parameters
-        if (!is_numeric($value) || !is_numeric($decimals)) {
-            return Functions::NAN();
-        }
-        $decimals = (int) floor($decimals);
-
-        $valueResult = round($value, $decimals);
-        if ($decimals < 0) {
-            $decimals = 0;
-        }
-        if (!$no_commas) {
-            $valueResult = number_format(
-                $valueResult,
-                $decimals,
-                StringHelper::getDecimalSeparator(),
-                StringHelper::getThousandsSeparator()
-            );
-        }
-
-        return (string) $valueResult;
+        return TextData\Format::FIXEDFORMAT($value, $decimals, $no_commas);
     }
 
     /**
      * LEFT.
      *
-     * @param string $value Value
-     * @param int $chars Number of characters
+     * @deprecated 1.18.0
+     *      Use the left() method in the TextData\Extract class instead
+     * @see TextData\Extract::left()
      *
-     * @return string
+     * @param array|string $value Value
+     * @param array|int $chars Number of characters
+     *
+     * @return array|string
      */
     public static function LEFT($value = '', $chars = 1)
     {
-        $value = Functions::flattenSingleValue($value);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if ($chars < 0) {
-            return Functions::VALUE();
-        }
-
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return mb_substr($value, 0, $chars, 'UTF-8');
+        return TextData\Extract::left($value, $chars);
     }
 
     /**
      * MID.
      *
-     * @param string $value Value
-     * @param int $start Start character
-     * @param int $chars Number of characters
+     * @deprecated 1.18.0
+     *      Use the mid() method in the TextData\Extract class instead
+     * @see TextData\Extract::mid()
      *
-     * @return string
+     * @param array|string $value Value
+     * @param array|int $start Start character
+     * @param array|int $chars Number of characters
+     *
+     * @return array|string
      */
     public static function MID($value = '', $start = 1, $chars = null)
     {
-        $value = Functions::flattenSingleValue($value);
-        $start = Functions::flattenSingleValue($start);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if (($start < 1) || ($chars < 0)) {
-            return Functions::VALUE();
-        }
-
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        if (empty($chars)) {
-            return '';
-        }
-
-        return mb_substr($value, --$start, $chars, 'UTF-8');
+        return TextData\Extract::mid($value, $start, $chars);
     }
 
     /**
      * RIGHT.
      *
-     * @param string $value Value
-     * @param int $chars Number of characters
+     * @deprecated 1.18.0
+     *      Use the right() method in the TextData\Extract class instead
+     * @see TextData\Extract::right()
      *
-     * @return string
+     * @param array|string $value Value
+     * @param array|int $chars Number of characters
+     *
+     * @return array|string
      */
     public static function RIGHT($value = '', $chars = 1)
     {
-        $value = Functions::flattenSingleValue($value);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if ($chars < 0) {
-            return Functions::VALUE();
-        }
-
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
+        return TextData\Extract::right($value, $chars);
     }
 
     /**
      * STRINGLENGTH.
      *
+     * @deprecated 1.18.0
+     *      Use the length() method in the TextData\Text class instead
+     * @see TextData\Text::length()
+     *
      * @param string $value Value
      *
-     * @return int
+     * @return array|int
      */
     public static function STRINGLENGTH($value = '')
     {
-        $value = Functions::flattenSingleValue($value);
-
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return mb_strlen($value, 'UTF-8');
+        return TextData\Text::length($value);
     }
 
     /**
      * LOWERCASE.
      *
-     * Converts a string value to upper case.
+     * Converts a string value to lower case.
      *
-     * @param string $mixedCaseString
+     * @deprecated 1.18.0
+     *      Use the lower() method in the TextData\CaseConvert class instead
+     * @see TextData\CaseConvert::lower()
      *
-     * @return string
+     * @param array|string $mixedCaseString
+     *
+     * @return array|string
      */
     public static function LOWERCASE($mixedCaseString)
     {
-        $mixedCaseString = Functions::flattenSingleValue($mixedCaseString);
-
-        if (is_bool($mixedCaseString)) {
-            $mixedCaseString = ($mixedCaseString) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return StringHelper::strToLower($mixedCaseString);
+        return TextData\CaseConvert::lower($mixedCaseString);
     }
 
     /**
@@ -405,229 +256,140 @@ class TextData
      *
      * Converts a string value to upper case.
      *
+     * @deprecated 1.18.0
+     *      Use the upper() method in the TextData\CaseConvert class instead
+     * @see TextData\CaseConvert::upper()
+     *
      * @param string $mixedCaseString
      *
-     * @return string
+     * @return array|string
      */
     public static function UPPERCASE($mixedCaseString)
     {
-        $mixedCaseString = Functions::flattenSingleValue($mixedCaseString);
-
-        if (is_bool($mixedCaseString)) {
-            $mixedCaseString = ($mixedCaseString) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return StringHelper::strToUpper($mixedCaseString);
+        return TextData\CaseConvert::upper($mixedCaseString);
     }
 
     /**
      * PROPERCASE.
      *
-     * Converts a string value to upper case.
+     * Converts a string value to proper/title case.
      *
-     * @param string $mixedCaseString
+     * @deprecated 1.18.0
+     *      Use the proper() method in the TextData\CaseConvert class instead
+     * @see TextData\CaseConvert::proper()
      *
-     * @return string
+     * @param array|string $mixedCaseString
+     *
+     * @return array|string
      */
     public static function PROPERCASE($mixedCaseString)
     {
-        $mixedCaseString = Functions::flattenSingleValue($mixedCaseString);
-
-        if (is_bool($mixedCaseString)) {
-            $mixedCaseString = ($mixedCaseString) ? Calculation::getTRUE() : Calculation::getFALSE();
-        }
-
-        return StringHelper::strToTitle($mixedCaseString);
+        return TextData\CaseConvert::proper($mixedCaseString);
     }
 
     /**
      * REPLACE.
      *
+     * @deprecated 1.18.0
+     *      Use the replace() method in the TextData\Replace class instead
+     * @see TextData\Replace::replace()
+     *
      * @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
+     * @return array|string
      */
     public static function REPLACE($oldText, $start, $chars, $newText)
     {
-        $oldText = Functions::flattenSingleValue($oldText);
-        $start = Functions::flattenSingleValue($start);
-        $chars = Functions::flattenSingleValue($chars);
-        $newText = Functions::flattenSingleValue($newText);
-
-        $left = self::LEFT($oldText, $start - 1);
-        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText) - ($start + $chars) + 1);
-
-        return $left . $newText . $right;
+        return TextData\Replace::replace($oldText, $start, $chars, $newText);
     }
 
     /**
      * SUBSTITUTE.
      *
+     * @deprecated 1.18.0
+     *      Use the substitute() method in the TextData\Replace class instead
+     * @see TextData\Replace::substitute()
+     *
      * @param string $text Value
      * @param string $fromText From Value
      * @param string $toText To Value
      * @param int $instance Instance Number
      *
-     * @return string
+     * @return array|string
      */
     public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0)
     {
-        $text = Functions::flattenSingleValue($text);
-        $fromText = Functions::flattenSingleValue($fromText);
-        $toText = Functions::flattenSingleValue($toText);
-        $instance = floor(Functions::flattenSingleValue($instance));
-
-        if ($instance == 0) {
-            return str_replace($fromText, $toText, $text);
-        }
-
-        $pos = -1;
-        while ($instance > 0) {
-            $pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
-            if ($pos === false) {
-                break;
-            }
-            --$instance;
-        }
-
-        if ($pos !== false) {
-            return self::REPLACE($text, ++$pos, mb_strlen($fromText, 'UTF-8'), $toText);
-        }
-
-        return $text;
+        return TextData\Replace::substitute($text, $fromText, $toText, $instance);
     }
 
     /**
      * RETURNSTRING.
      *
+     * @deprecated 1.18.0
+     *      Use the test() method in the TextData\Text class instead
+     * @see TextData\Text::test()
+     *
      * @param mixed $testValue Value to check
      *
-     * @return null|string
+     * @return null|array|string
      */
     public static function RETURNSTRING($testValue = '')
     {
-        $testValue = Functions::flattenSingleValue($testValue);
-
-        if (is_string($testValue)) {
-            return $testValue;
-        }
-
-        return null;
+        return TextData\Text::test($testValue);
     }
 
     /**
      * TEXTFORMAT.
      *
+     * @deprecated 1.18.0
+     *      Use the TEXTFORMAT() method in the TextData\Format class instead
+     * @see TextData\Format::TEXTFORMAT()
+     *
      * @param mixed $value Value to check
      * @param string $format Format mask to use
      *
-     * @return string
+     * @return array|string
      */
     public static function TEXTFORMAT($value, $format)
     {
-        $value = Functions::flattenSingleValue($value);
-        $format = Functions::flattenSingleValue($format);
-
-        if ((is_string($value)) && (!is_numeric($value)) && Date::isDateTimeFormatCode($format)) {
-            $value = DateTime::DATEVALUE($value);
-        }
-
-        return (string) NumberFormat::toFormattedString($value, $format);
+        return TextData\Format::TEXTFORMAT($value, $format);
     }
 
     /**
      * VALUE.
      *
+     * @deprecated 1.18.0
+     *      Use the VALUE() method in the TextData\Format class instead
+     * @see TextData\Format::VALUE()
+     *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @return array|DateTimeInterface|float|int|string A string if arguments are invalid
      */
     public static function VALUE($value = '')
     {
-        $value = Functions::flattenSingleValue($value);
-
-        if (!is_numeric($value)) {
-            $numberValue = str_replace(
-                StringHelper::getThousandsSeparator(),
-                '',
-                trim($value, " \t\n\r\0\x0B" . StringHelper::getCurrencyCode())
-            );
-            if (is_numeric($numberValue)) {
-                return (float) $numberValue;
-            }
-
-            $dateSetting = Functions::getReturnDateType();
-            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
-
-            if (strpos($value, ':') !== false) {
-                $timeValue = DateTime::TIMEVALUE($value);
-                if ($timeValue !== Functions::VALUE()) {
-                    Functions::setReturnDateType($dateSetting);
-
-                    return $timeValue;
-                }
-            }
-            $dateValue = DateTime::DATEVALUE($value);
-            if ($dateValue !== Functions::VALUE()) {
-                Functions::setReturnDateType($dateSetting);
-
-                return $dateValue;
-            }
-            Functions::setReturnDateType($dateSetting);
-
-            return Functions::VALUE();
-        }
-
-        return (float) $value;
+        return TextData\Format::VALUE($value);
     }
 
     /**
      * NUMBERVALUE.
      *
+     * @deprecated 1.18.0
+     *      Use the NUMBERVALUE() method in the TextData\Format class instead
+     * @see TextData\Format::NUMBERVALUE()
+     *
      * @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
+     * @return array|float|string
      */
     public static function NUMBERVALUE($value = '', $decimalSeparator = null, $groupSeparator = null)
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimalSeparator = Functions::flattenSingleValue($decimalSeparator);
-        $groupSeparator = Functions::flattenSingleValue($groupSeparator);
-
-        if (!is_numeric($value)) {
-            $decimalSeparator = empty($decimalSeparator) ? StringHelper::getDecimalSeparator() : $decimalSeparator;
-            $groupSeparator = empty($groupSeparator) ? StringHelper::getThousandsSeparator() : $groupSeparator;
-
-            $decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator) . '/', $value, $matches, PREG_OFFSET_CAPTURE);
-            if ($decimalPositions > 1) {
-                return Functions::VALUE();
-            }
-            $decimalOffset = array_pop($matches[0])[1];
-            if (strpos($value, $groupSeparator, $decimalOffset) !== false) {
-                return Functions::VALUE();
-            }
-
-            $value = str_replace([$groupSeparator, $decimalSeparator], ['', '.'], $value);
-
-            // Handle the special case of trailing % signs
-            $percentageString = rtrim($value, '%');
-            if (!is_numeric($percentageString)) {
-                return Functions::VALUE();
-            }
-
-            $percentageAdjustment = strlen($value) - strlen($percentageString);
-            if ($percentageAdjustment) {
-                $value = (float) $percentageString;
-                $value /= pow(10, $percentageAdjustment * 2);
-            }
-        }
-
-        return (float) $value;
+        return TextData\Format::NUMBERVALUE($value, $decimalSeparator, $groupSeparator);
     }
 
     /**
@@ -635,40 +397,54 @@ class TextData
      * EXACT is case-sensitive but ignores formatting differences.
      * Use EXACT to test text being entered into a document.
      *
-     * @param $value1
-     * @param $value2
+     * @deprecated 1.18.0
+     *      Use the exact() method in the TextData\Text class instead
+     * @see TextData\Text::exact()
      *
-     * @return bool
+     * @param mixed $value1
+     * @param mixed $value2
+     *
+     * @return array|bool
      */
     public static function EXACT($value1, $value2)
     {
-        $value1 = Functions::flattenSingleValue($value1);
-        $value2 = Functions::flattenSingleValue($value2);
-
-        return (string) $value2 === (string) $value1;
+        return TextData\Text::exact($value1, $value2);
     }
 
     /**
      * TEXTJOIN.
      *
+     * @deprecated 1.18.0
+     *      Use the TEXTJOIN() method in the TextData\Concatenate class instead
+     * @see TextData\Concatenate::TEXTJOIN()
+     *
      * @param mixed $delimiter
      * @param mixed $ignoreEmpty
      * @param mixed $args
      *
-     * @return string
+     * @return array|string
      */
     public static function TEXTJOIN($delimiter, $ignoreEmpty, ...$args)
     {
-        // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $key => &$arg) {
-            if ($ignoreEmpty && trim($arg) == '') {
-                unset($aArgs[$key]);
-            } elseif (is_bool($arg)) {
-                $arg = self::convertBooleanValue($arg);
-            }
-        }
+        return TextData\Concatenate::TEXTJOIN($delimiter, $ignoreEmpty, ...$args);
+    }
 
-        return implode($delimiter, $aArgs);
+    /**
+     * REPT.
+     *
+     * Returns the result of builtin function repeat after validating args.
+     *
+     * @deprecated 1.18.0
+     *      Use the builtinREPT() method in the TextData\Concatenate class instead
+     * @see TextData\Concatenate::builtinREPT()
+     *
+     * @param array|string $str Should be numeric
+     * @param mixed $number Should be int
+     *
+     * @return array|string
+     */
+    public static function builtinREPT($str, $number)
+    {
+        return TextData\Concatenate::builtinREPT($str, $number);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
new file mode 100644
index 000000000..f1aea1694
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+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)
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        $mixedCaseValue = Helpers::extractString($mixedCaseValue);
+
+        return StringHelper::strToLower($mixedCaseValue);
+    }
+
+    /**
+     * UPPERCASE.
+     *
+     * 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)
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        $mixedCaseValue = Helpers::extractString($mixedCaseValue);
+
+        return StringHelper::strToUpper($mixedCaseValue);
+    }
+
+    /**
+     * PROPERCASE.
+     *
+     * 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)
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        $mixedCaseValue = Helpers::extractString($mixedCaseValue);
+
+        return StringHelper::strToTitle($mixedCaseValue);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
new file mode 100644
index 000000000..83af499bb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class CharacterConvert
+{
+    use ArrayEnabled;
+
+    /**
+     * 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)
+    {
+        if (is_array($character)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $character);
+        }
+
+        $character = Helpers::validateInt($character);
+        $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 ($result === false) ? '' : $result;
+    }
+
+    /**
+     * CODE.
+     *
+     * @param mixed $characters String character to convert to its ASCII value
+     *                              Or can be an array of values
+     *
+     * @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)
+    {
+        if (is_array($characters)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $characters);
+        }
+
+        $characters = Helpers::extractString($characters);
+        if ($characters === '') {
+            return ExcelError::VALUE();
+        }
+
+        $character = $characters;
+        if (mb_strlen($characters, 'UTF-8') > 1) {
+            $character = mb_substr($characters, 0, 1, 'UTF-8');
+        }
+
+        return self::unicodeToOrd($character);
+    }
+
+    private static function unicodeToOrd(string $character): int
+    {
+        $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 $retVal;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
new file mode 100644
index 000000000..37c135df2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+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.
+     *
+     * @param array $args
+     */
+    public static function CONCATENATE(...$args): string
+    {
+        $returnValue = '';
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+
+        foreach ($aArgs as $arg) {
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value)) {
+                $returnValue = $value;
+
+                break;
+            }
+            $returnValue .= Helpers::extractString($arg);
+            if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+                $returnValue = ExcelError::CALC();
+
+                break;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * TEXTJOIN.
+     *
+     * @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 = true, ...$args)
+    {
+        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) {
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value)) {
+                return $value;
+            }
+
+            if ($ignoreEmpty === true && ((is_string($arg) && trim($arg) === '') || $arg === null)) {
+                unset($aArgs[$key]);
+            } elseif (is_bool($arg)) {
+                $arg = Helpers::convertBooleanValue($arg);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * REPT.
+     *
+     * 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)
+    {
+        if (is_array($stringValue) || is_array($repeatCount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $stringValue, $repeatCount);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        if (!is_numeric($repeatCount) || $repeatCount < 0) {
+            $returnValue = ExcelError::VALUE();
+        } elseif (ErrorValue::isError($stringValue)) {
+            $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 $returnValue;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
new file mode 100644
index 000000000..24ddff2ec
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
@@ -0,0 +1,280 @@
+<?php
+
+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\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)
+    {
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value);
+            $chars = Helpers::extractInt($chars, 0, 1);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_substr($value, 0, $chars, 'UTF-8');
+    }
+
+    /**
+     * 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, $chars)
+    {
+        if (is_array($value) || is_array($start) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $start, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value);
+            $start = Helpers::extractInt($start, 1);
+            $chars = Helpers::extractInt($chars, 0);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_substr($value, --$start, $chars, 'UTF-8');
+    }
+
+    /**
+     * 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)
+    {
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value);
+            $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 mixed|mixed[] 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($text, $delimiter, $instance = 1, $matchMode = 0, $matchEnd = 0, $ifNotFound = '#N/A')
+    {
+        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);
+        }
+
+        $text = Helpers::extractString($text ?? '');
+        $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 mixed|mixed[] 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($text, $delimiter, $instance = 1, $matchMode = 0, $matchEnd = 0, $ifNotFound = '#N/A')
+    {
+        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);
+        }
+
+        $text = Helpers::extractString($text ?? '');
+        $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);
+    }
+
+    /**
+     * @param null|array|string $delimiter
+     * @param int $matchMode
+     * @param int $matchEnd
+     * @param mixed $ifNotFound
+     *
+     * @return array|string
+     */
+    private static function validateTextBeforeAfter(string $text, $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
+    {
+        $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(
+                function ($delimiter) {
+                    return 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
new file mode 100644
index 000000000..57d331663
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
@@ -0,0 +1,323 @@
+<?php
+
+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\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.
+     *
+     * 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 $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)
+    {
+        if (is_array($value) || is_array($decimals)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals);
+        }
+
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $mask = '$#,##0';
+        if ($decimals > 0) {
+            $mask .= '.' . str_repeat('0', $decimals);
+        } else {
+            $round = 10 ** abs($decimals);
+            if ($value < 0) {
+                $round = 0 - $round;
+            }
+            $value = MathTrig\Round::multiple($value, $round);
+        }
+        $mask = "{$mask};-{$mask}";
+
+        return NumberFormat::toFormattedString($value, $mask);
+    }
+
+    /**
+     * 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)
+    {
+        if (is_array($value) || is_array($decimals) || is_array($noCommas)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals, $noCommas);
+        }
+
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $valueResult = round($value, $decimals);
+        if ($decimals < 0) {
+            $decimals = 0;
+        }
+        if ($noCommas === false) {
+            $valueResult = number_format(
+                $valueResult,
+                $decimals,
+                StringHelper::getDecimalSeparator(),
+                StringHelper::getThousandsSeparator()
+            );
+        }
+
+        return (string) $valueResult;
+    }
+
+    /**
+     * 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)
+    {
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
+
+        $value = Helpers::extractString($value);
+        $format = Helpers::extractString($format);
+
+        if (!is_numeric($value) && Date::isDateTimeFormatCode($format)) {
+            $value = DateTimeExcel\DateValue::fromString($value) + DateTimeExcel\TimeValue::fromString($value);
+        }
+
+        return (string) NumberFormat::toFormattedString($value, $format);
+    }
+
+    /**
+     * @param mixed $value Value to check
+     *
+     * @return mixed
+     */
+    private static function convertValue($value, bool $spacesMeanZero = false)
+    {
+        $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 ($spacesMeanZero && $value === '') {
+                $value = 0;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * VALUE.
+     *
+     * @param mixed $value Value to check
+     *                         Or can be an array of values
+     *
+     * @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 = '')
+    {
+        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;
+            }
+
+            $dateSetting = Functions::getReturnDateType();
+            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+
+            if (strpos($value, ':') !== false) {
+                $timeValue = Functions::scalar(DateTimeExcel\TimeValue::fromString($value));
+                if ($timeValue !== ExcelError::VALUE()) {
+                    Functions::setReturnDateType($dateSetting);
+
+                    return $timeValue;
+                }
+            }
+            $dateValue = Functions::scalar(DateTimeExcel\DateValue::fromString($value));
+            if ($dateValue !== ExcelError::VALUE()) {
+                Functions::setReturnDateType($dateSetting);
+
+                return $dateValue;
+            }
+            Functions::setReturnDateType($dateSetting);
+
+            return ExcelError::VALUE();
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * TEXT.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $format
+     *
+     * @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($value, $format = false)
+    {
+        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;
+    }
+
+    /**
+     * @param mixed $decimalSeparator
+     */
+    private static function getDecimalSeparator($decimalSeparator): string
+    {
+        return empty($decimalSeparator) ? StringHelper::getDecimalSeparator() : (string) $decimalSeparator;
+    }
+
+    /**
+     * @param mixed $groupSeparator
+     */
+    private static function getGroupSeparator($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
+     *                         Or can be an array of values
+     *
+     * @return array|float|string
+     */
+    public static function NUMBERVALUE($value = '', $decimalSeparator = null, $groupSeparator = null)
+    {
+        if (is_array($value) || is_array($decimalSeparator) || is_array($groupSeparator)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimalSeparator, $groupSeparator);
+        }
+
+        try {
+            $value = self::convertValue($value, true);
+            $decimalSeparator = self::getDecimalSeparator($decimalSeparator);
+            $groupSeparator = self::getGroupSeparator($groupSeparator);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if (!is_numeric($value)) {
+            $decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator, '/') . '/', $value, $matches, PREG_OFFSET_CAPTURE);
+            if ($decimalPositions > 1) {
+                return ExcelError::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);
+
+            // Handle the special case of trailing % signs
+            $percentageString = rtrim($value, '%');
+            if (!is_numeric($percentageString)) {
+                return ExcelError::VALUE();
+            }
+
+            $percentageAdjustment = strlen($value) - strlen($percentageString);
+            if ($percentageAdjustment) {
+                $value = (float) $percentageString;
+                $value /= 10 ** ($percentageAdjustment * 2);
+            }
+        }
+
+        return is_array($value) ? ExcelError::VALUE() : (float) $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
new file mode 100644
index 000000000..e7b67a340
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
@@ -0,0 +1,91 @@
+<?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($value, bool $throwIfError = false): string
+    {
+        if (is_bool($value)) {
+            return self::convertBooleanValue($value);
+        }
+        if ($throwIfError && is_string($value) && ErrorValue::isError($value)) {
+            throw new CalcExp($value);
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function extractInt($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;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function extractFloat($value): float
+    {
+        if ($value === null) {
+            $value = 0.0;
+        }
+        if (is_bool($value)) {
+            $value = (float) $value;
+        }
+        if (!is_numeric($value)) {
+            throw new CalcExp(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function validateInt($value): int
+    {
+        if ($value === null) {
+            $value = 0;
+        } elseif (is_bool($value)) {
+            $value = (int) $value;
+        }
+
+        return (int) $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
new file mode 100644
index 000000000..124f00170
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
@@ -0,0 +1,118 @@
+<?php
+
+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)
+    {
+        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);
+
+            $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 $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 = null)
+    {
+        if (is_array($text) || is_array($fromText) || is_array($toText) || is_array($instance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $text, $fromText, $toText, $instance);
+        }
+
+        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) {
+                return $text;
+            }
+            --$instance;
+        }
+
+        return Functions::scalar(self::REPLACE($text, ++$pos, StringHelper::countCharacters($fromText), $toText));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
new file mode 100644
index 000000000..10b6a1aad
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+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;
+
+    /**
+     * 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 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)
+    {
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
+
+        try {
+            $needle = Helpers::extractString($needle);
+            $haystack = Helpers::extractString($haystack);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        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;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * 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 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)
+    {
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
+
+        try {
+            $needle = Helpers::extractString($needle);
+            $haystack = Helpers::extractString($haystack);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        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;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
new file mode 100644
index 000000000..b8a730767
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
@@ -0,0 +1,255 @@
+<?php
+
+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;
+
+class Text
+{
+    use ArrayEnabled;
+
+    /**
+     * LEN.
+     *
+     * @param mixed $value String Value
+     *                         Or can be an array of values
+     *
+     * @return array|int
+     *         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 = '')
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        $value = Helpers::extractString($value);
+
+        return mb_strlen($value, 'UTF-8');
+    }
+
+    /**
+     * 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.
+     *
+     * @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
+     *         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)
+    {
+        if (is_array($value1) || is_array($value2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value1, $value2);
+        }
+
+        $value1 = Helpers::extractString($value1);
+        $value2 = Helpers::extractString($value2);
+
+        return $value2 === $value1;
+    }
+
+    /**
+     * T.
+     *
+     * @param mixed $testValue Value to check
+     *                         Or can be an array of values
+     *
+     * @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 = '')
+    {
+        if (is_array($testValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $testValue);
+        }
+
+        if (is_string($testValue)) {
+            return $testValue;
+        }
+
+        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 the array built from the text, split by the row and column delimiters
+     */
+    public static function split($text, $columnDelimiter = null, $rowDelimiter = null, bool $ignoreEmpty = false, bool $matchMode = true, $padding = '#N/A')
+    {
+        $text = Functions::flattenSingleValue($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,
+                function ($row) {
+                    return $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,
+                            function ($value) {
+                                return $value !== '';
+                            }
+                        ));
+                    }
+                }
+            );
+            if ($ignoreEmpty === true) {
+                $rows = array_values(array_filter(
+                    $rows,
+                    function ($row) {
+                        return $row !== [] && $row !== [''];
+                    }
+                ));
+            }
+        }
+
+        return self::applyPadding($rows, $padding);
+    }
+
+    /**
+     * @param mixed $padding
+     */
+    private static function applyPadding(array $rows, $padding): array
+    {
+        $columnCount = array_reduce(
+            $rows,
+            function (int $counter, array $row): int {
+                return 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(
+                function ($delimiter) {
+                    return preg_quote($delimiter ?? '', '/');
+                },
+                $valueSet
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote(/** @scrutinizer ignore-type */ 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;
+    }
+
+    /**
+     * @param mixed $cellValue
+     */
+    private static function formatValueMode0($cellValue): string
+    {
+        if (is_bool($cellValue)) {
+            return Calculation::getLocaleBoolean($cellValue ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $cellValue;
+    }
+
+    /**
+     * @param mixed $cellValue
+     */
+    private static function formatValueMode1($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
new file mode 100644
index 000000000..27eceb938
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+
+class Trim
+{
+    use ArrayEnabled;
+
+    /**
+     * CLEAN.
+     *
+     * @param mixed $stringValue String Value to check
+     *                              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 nonPrintable($stringValue = '')
+    {
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        return (string) preg_replace('/[\\x00-\\x1f]/', '', "$stringValue");
+    }
+
+    /**
+     * TRIM.
+     *
+     * @param mixed $stringValue String Value to check
+     *                              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 spaces($stringValue = '')
+    {
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        return trim(preg_replace('/ +/', ' ', trim("$stringValue", ' ')) ?? '', ' ');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
index 341a01797..e8289e3fb 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
@@ -3,9 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Token;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner;
 
 class Stack
 {
+    /**
+     * @var BranchPruner
+     */
+    private $branchPruner;
+
     /**
      * The parser stack for formulae.
      *
@@ -20,12 +26,15 @@ class Stack
      */
     private $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;
     }
@@ -33,28 +42,14 @@ class Stack
     /**
      * 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
-    ) {
-        $stackItem = $this->getStackItem($type, $value, $reference, $storeKey, $onlyIf, $onlyIfNot);
-
+    public function push(string $type, $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 +57,37 @@ class Stack
         }
     }
 
-    public function getStackItem(
-        $type,
-        $value,
-        $reference = null,
-        $storeKey = null,
-        $onlyIf = null,
-        $onlyIfNot = null
-    ) {
+    public function pushStackItem(array $stackItem): void
+    {
+        $this->stack[$this->count++] = $stackItem;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function getStackItem(string $type, $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 +96,8 @@ class Stack
 
     /**
      * 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 +108,8 @@ class Stack
 
     /**
      * 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;
@@ -124,26 +121,9 @@ class Stack
     /**
      * Clear the stack.
      */
-    public function clear()
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php
new file mode 100644
index 000000000..f4dd40e57
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+/**
+ * @deprecated 1.18.0
+ *
+ * @codeCoverageIgnore
+ */
+class Web
+{
+    /**
+     * WEBSERVICE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        Webservice(url)
+     *
+     * @deprecated 1.18.0
+     *      Use the webService() method in the Web\Service class instead
+     * @see Web\Service::webService()
+     *
+     * @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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
new file mode 100644
index 000000000..697d3a614
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Web;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Settings;
+use Psr\Http\Client\ClientExceptionInterface;
+
+class Service
+{
+    /**
+     * WEBSERVICE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        Webservice(url)
+     *
+     * @return string the output resulting from a call to the webservice
+     */
+    public static function webService(string $url)
+    {
+        $url = trim($url);
+        if (strlen($url) > 2048) {
+            return ExcelError::VALUE(); // Invalid URL length
+        }
+
+        if (!preg_match('/^http[s]?:\/\//', $url)) {
+            return ExcelError::VALUE(); // Invalid protocol
+        }
+
+        // Get results from the the webservice
+        $client = Settings::getHttpClient();
+        $requestFactory = Settings::getRequestFactory();
+        $request = $requestFactory->createRequest('GET', $url);
+
+        try {
+            $response = $client->sendRequest($request);
+        } catch (ClientExceptionInterface $e) {
+            return ExcelError::VALUE(); // cURL error
+        }
+
+        if ($response->getStatusCode() != 200) {
+            return ExcelError::VALUE(); // cURL error
+        }
+
+        $output = $response->getBody()->getContents();
+        if (strlen($output) > 32767) {
+            return ExcelError::VALUE(); // Output not a string or too long
+        }
+
+        return $output;
+    }
+
+    /**
+     * URLENCODE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        urlEncode(text)
+     *
+     * @param mixed $text
+     *
+     * @return string the url encoded output
+     */
+    public static function urlEncode($text)
+    {
+        if (!is_string($text)) {
+            return ExcelError::VALUE();
+        }
+
+        return str_replace('+', '%20', urlencode($text));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt
deleted file mode 100644
index 7776e6ead..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt
+++ /dev/null
@@ -1,390 +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
-CELL
-CHAR
-CHIDIST
-CHIINV
-CHITEST
-CHOOSE
-CLEAN
-CODE
-COLUMN
-COLUMNS
-COMBIN
-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
-FORECAST
-FREQUENCY
-FTEST
-FV
-FVSCHEDULE
-GAMAMDIST
-GAMMAINV
-GAMMALN
-GCD
-GEOMEAN
-GESTEP
-GETPIVOTDATA
-GROWTH
-HARMEAN
-HEX2BIN
-HEX2OCT
-HLOOKUP
-HOUR
-HYPERLINK
-HYPGEOMDIST
-IF
-IFERROR
-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
-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
-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
-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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx
new file mode 100644
index 000000000..c0cc1ce88
Binary files /dev/null and b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx differ
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config
index df513734c..49f40fcb5 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config
@@ -1,23 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Ceština (Czech)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= Kč
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #HODNOTA!
-REF	= #REF!
-NAME	= #NÁZEV?
-NUM	= #NUM!
-NA	= #N/A
+NULL
+DIV0 = #DĚLENÍ_NULOU!
+VALUE = #HODNOTA!
+REF = #ODKAZ!
+NAME = #NÁZEV?
+NUM = #ČÍSLO!
+NA = #NENÍ_K_DISPOZICI
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions
index 733d406f1..49c4945c3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions
@@ -1,416 +1,520 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Ceština (Czech)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions		Funkce doplňků a automatizace
+## Funkce pro práci s datovými krychlemi (Cube Functions)
 ##
-GETPIVOTDATA		= ZÍSKATKONTDATA	##	Vrátí data uložená v kontingenční tabulce. Pomocí funkce ZÍSKATKONTDATA můžete načíst souhrnná data z kontingenční tabulky, pokud jsou tato data v kontingenční sestavě zobrazena.
-
+CUBEKPIMEMBER = CUBEKPIMEMBER
+CUBEMEMBER = CUBEMEMBER
+CUBEMEMBERPROPERTY = CUBEMEMBERPROPERTY
+CUBERANKEDMEMBER = CUBERANKEDMEMBER
+CUBESET = CUBESET
+CUBESETCOUNT = CUBESETCOUNT
+CUBEVALUE = CUBEVALUE
 
 ##
-##	Cube functions				Funkce pro práci s krychlemi
+## Funkce databáze (Database Functions)
 ##
-CUBEKPIMEMBER		= CUBEKPIMEMBER		##	Vrátí název, vlastnost a velikost klíčového ukazatele výkonu (KUV) a zobrazí v buňce název a vlastnost. Klíčový ukazatel výkonu je kvantifikovatelná veličina, například hrubý měsíční zisk nebo čtvrtletní obrat na zaměstnance, která se používá pro sledování výkonnosti organizace.
-CUBEMEMBER		= CUBEMEMBER		##	Vrátí člen nebo n-tici v hierarchii krychle. Slouží k ověření, zda v krychli existuje člen nebo n-tice.
-CUBEMEMBERPROPERTY	= CUBEMEMBERPROPERTY	##	Vrátí hodnotu vlastnosti člena v krychli. Slouží k ověření, zda v krychli existuje člen s daným názvem, a k vrácení konkrétní vlastnosti tohoto člena.
-CUBERANKEDMEMBER	= CUBERANKEDMEMBER	##	Vrátí n-tý nebo pořadový člen sady. Použijte ji pro vrácení jednoho nebo více prvků sady, například obchodníka s nejvyšším obratem nebo deseti nejlepších studentů.
-CUBESET			= CUBESET		##	Definuje vypočtenou sadu členů nebo n-tic odesláním výrazu sady do krychle na serveru, který vytvoří sadu a potom ji vrátí do aplikace Microsoft Office Excel.
-CUBESETCOUNT		= CUBESETCOUNT		##	Vrátí počet položek v množině
-CUBEVALUE		= CUBEVALUE		##	Vrátí úhrnnou hodnotu z krychle.
-
+DAVERAGE = DPRŮMĚR
+DCOUNT = DPOČET
+DCOUNTA = DPOČET2
+DGET = DZÍSKAT
+DMAX = DMAX
+DMIN = DMIN
+DPRODUCT = DSOUČIN
+DSTDEV = DSMODCH.VÝBĚR
+DSTDEVP = DSMODCH
+DSUM = DSUMA
+DVAR = DVAR.VÝBĚR
+DVARP = DVAR
 
 ##
-##	Database functions			Funkce databáze
+## Funkce data a času (Date & Time Functions)
 ##
-DAVERAGE		= DPRŮMĚR		##	Vrátí průměr vybraných položek databáze.
-DCOUNT			= DPOČET		##	Spočítá buňky databáze obsahující čísla.
-DCOUNTA			= DPOČET2		##	Spočítá buňky databáze, které nejsou prázdné.
-DGET			= DZÍSKAT		##	Extrahuje z databáze jeden záznam splňující zadaná kritéria.
-DMAX			= DMAX			##	Vrátí maximální hodnotu z vybraných položek databáze.
-DMIN			= DMIN			##	Vrátí minimální hodnotu z vybraných položek databáze.
-DPRODUCT		= DSOUČIN		##	Vynásobí hodnoty určitého pole záznamů v databázi, které splňují daná kritéria.
-DSTDEV			= DSMODCH.VÝBĚR		##	Odhadne směrodatnou odchylku výběru vybraných položek databáze.
-DSTDEVP			= DSMODCH		##	Vypočte směrodatnou odchylku základního souboru vybraných položek databáze.
-DSUM			= DSUMA			##	Sečte čísla ve sloupcovém poli záznamů databáze, která splňují daná kritéria.
-DVAR			= DVAR.VÝBĚR		##	Odhadne rozptyl výběru vybraných položek databáze.
-DVARP			= DVAR			##	Vypočte rozptyl základního souboru vybraných položek databáze.
-
+DATE = DATUM
+DATEVALUE = DATUMHODN
+DAY = DEN
+DAYS = DAYS
+DAYS360 = ROK360
+EDATE = EDATE
+EOMONTH = EOMONTH
+HOUR = HODINA
+ISOWEEKNUM = ISOWEEKNUM
+MINUTE = MINUTA
+MONTH = MĚSÍC
+NETWORKDAYS = NETWORKDAYS
+NETWORKDAYS.INTL = NETWORKDAYS.INTL
+NOW = NYNÍ
+SECOND = SEKUNDA
+TIME = ČAS
+TIMEVALUE = ČASHODN
+TODAY = DNES
+WEEKDAY = DENTÝDNE
+WEEKNUM = WEEKNUM
+WORKDAY = WORKDAY
+WORKDAY.INTL = WORKDAY.INTL
+YEAR = ROK
+YEARFRAC = YEARFRAC
 
 ##
-##	Date and time functions			Funkce data a času
+## Inženýrské funkce (Engineering Functions)
 ##
-DATE			= DATUM			##	Vrátí pořadové číslo určitého data.
-DATEVALUE		= DATUMHODN		##	Převede datum ve formě textu na pořadové číslo.
-DAY			= DEN			##	Převede pořadové číslo na den v měsíci.
-DAYS360			= ROK360		##	Vrátí počet dní mezi dvěma daty na základě roku s 360 dny.
-EDATE			= EDATE			##	Vrátí pořadové číslo data, které označuje určený počet měsíců před nebo po počátečním datu.
-EOMONTH			= EOMONTH		##	Vrátí pořadové číslo posledního dne měsíce před nebo po zadaném počtu měsíců.
-HOUR			= HODINA		##	Převede pořadové číslo na hodinu.
-MINUTE			= MINUTA		##	Převede pořadové číslo na minutu.
-MONTH			= MĚSÍC			##	Převede pořadové číslo na měsíc.
-NETWORKDAYS		= NETWORKDAYS		##	Vrátí počet celých pracovních dní mezi dvěma daty.
-NOW			= NYNÍ			##	Vrátí pořadové číslo aktuálního data a času.
-SECOND			= SEKUNDA		##	Převede pořadové číslo na sekundu.
-TIME			= ČAS			##	Vrátí pořadové číslo určitého času.
-TIMEVALUE		= ČASHODN		##	Převede čas ve formě textu na pořadové číslo.
-TODAY			= DNES			##	Vrátí pořadové číslo dnešního data.
-WEEKDAY			= DENTÝDNE		##	Převede pořadové číslo na den v týdnu.
-WEEKNUM			= WEEKNUM		##	Převede pořadové číslo na číslo představující číselnou pozici týdne v roce.
-WORKDAY			= WORKDAY		##	Vrátí pořadové číslo data před nebo po zadaném počtu pracovních dní.
-YEAR			= ROK			##	Převede pořadové číslo na rok.
-YEARFRAC		= YEARFRAC		##	Vrátí část roku vyjádřenou zlomkem a představující počet celých dní mezi počátečním a koncovým datem.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN2DEC
+BIN2HEX = BIN2HEX
+BIN2OCT = BIN2OCT
+BITAND = BITAND
+BITLSHIFT = BITLSHIFT
+BITOR = BITOR
+BITRSHIFT = BITRSHIFT
+BITXOR = BITXOR
+COMPLEX = COMPLEX
+CONVERT = CONVERT
+DEC2BIN = DEC2BIN
+DEC2HEX = DEC2HEX
+DEC2OCT = DEC2OCT
+DELTA = DELTA
+ERF = ERF
+ERF.PRECISE = ERF.PRECISE
+ERFC = ERFC
+ERFC.PRECISE = ERFC.PRECISE
+GESTEP = GESTEP
+HEX2BIN = HEX2BIN
+HEX2DEC = HEX2DEC
+HEX2OCT = HEX2OCT
+IMABS = IMABS
+IMAGINARY = IMAGINARY
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMCONJUGATE
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOWER
+IMPRODUCT = IMPRODUCT
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMSQRT
+IMSUB = IMSUB
+IMSUM = IMSUM
+IMTAN = IMTAN
+OCT2BIN = OCT2BIN
+OCT2DEC = OCT2DEC
+OCT2HEX = OCT2HEX
 
 ##
-##	Engineering functions			Inženýrské funkce (Technické funkce)
+## Finanční funkce (Financial Functions)
 ##
-BESSELI			= BESSELI		##	Vrátí modifikovanou Besselovu funkci In(x).
-BESSELJ			= BESSELJ		##	Vrátí modifikovanou Besselovu funkci Jn(x).
-BESSELK			= BESSELK		##	Vrátí modifikovanou Besselovu funkci Kn(x).
-BESSELY			= BESSELY		##	Vrátí Besselovu funkci Yn(x).
-BIN2DEC			= BIN2DEC		##	Převede binární číslo na desítkové.
-BIN2HEX			= BIN2HEX		##	Převede binární číslo na šestnáctkové.
-BIN2OCT			= BIN2OCT		##	Převede binární číslo na osmičkové.
-COMPLEX			= COMPLEX		##	Převede reálnou a imaginární část na komplexní číslo.
-CONVERT			= CONVERT		##	Převede číslo do jiného jednotkového měrného systému.
-DEC2BIN			= DEC2BIN		##	Převede desítkového čísla na dvojkové
-DEC2HEX			= DEC2HEX		##	Převede desítkové číslo na šestnáctkové.
-DEC2OCT			= DEC2OCT		##	Převede desítkové číslo na osmičkové.
-DELTA			= DELTA			##	Testuje rovnost dvou hodnot.
-ERF			= ERF			##	Vrátí chybovou funkci.
-ERFC			= ERFC			##	Vrátí doplňkovou chybovou funkci.
-GESTEP			= GESTEP		##	Testuje, zda je číslo větší než mezní hodnota.
-HEX2BIN			= HEX2BIN		##	Převede šestnáctkové číslo na binární.
-HEX2DEC			= HEX2DEC		##	Převede šestnáctkové číslo na desítkové.
-HEX2OCT			= HEX2OCT		##	Převede šestnáctkové číslo na osmičkové.
-IMABS			= IMABS			##	Vrátí absolutní hodnotu (modul) komplexního čísla.
-IMAGINARY		= IMAGINARY		##	Vrátí imaginární část komplexního čísla.
-IMARGUMENT		= IMARGUMENT		##	Vrátí argument théta, úhel vyjádřený v radiánech.
-IMCONJUGATE		= IMCONJUGATE		##	Vrátí komplexně sdružené číslo ke komplexnímu číslu.
-IMCOS			= IMCOS			##	Vrátí kosinus komplexního čísla.
-IMDIV			= IMDIV			##	Vrátí podíl dvou komplexních čísel.
-IMEXP			= IMEXP			##	Vrátí exponenciální tvar komplexního čísla.
-IMLN			= IMLN			##	Vrátí přirozený logaritmus komplexního čísla.
-IMLOG10			= IMLOG10		##	Vrátí dekadický logaritmus komplexního čísla.
-IMLOG2			= IMLOG2		##	Vrátí logaritmus komplexního čísla při základu 2.
-IMPOWER			= IMPOWER		##	Vrátí komplexní číslo umocněné na celé číslo.
-IMPRODUCT		= IMPRODUCT		##	Vrátí součin komplexních čísel.
-IMREAL			= IMREAL		##	Vrátí reálnou část komplexního čísla.
-IMSIN			= IMSIN			##	Vrátí sinus komplexního čísla.
-IMSQRT			= IMSQRT		##	Vrátí druhou odmocninu komplexního čísla.
-IMSUB			= IMSUB			##	Vrátí rozdíl mezi dvěma komplexními čísly.
-IMSUM			= IMSUM			##	Vrátí součet dvou komplexních čísel.
-OCT2BIN			= OCT2BIN		##	Převede osmičkové číslo na binární.
-OCT2DEC			= OCT2DEC		##	Převede osmičkové číslo na desítkové.
-OCT2HEX			= OCT2HEX		##	Převede osmičkové číslo na šestnáctkové.
-
+ACCRINT = ACCRINT
+ACCRINTM = ACCRINTM
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = COUPDAYBS
+COUPDAYS = COUPDAYS
+COUPDAYSNC = COUPDAYSNC
+COUPNCD = COUPNCD
+COUPNUM = COUPNUM
+COUPPCD = COUPPCD
+CUMIPMT = CUMIPMT
+CUMPRINC = CUMPRINC
+DB = ODPIS.ZRYCH
+DDB = ODPIS.ZRYCH2
+DISC = DISC
+DOLLARDE = DOLLARDE
+DOLLARFR = DOLLARFR
+DURATION = DURATION
+EFFECT = EFFECT
+FV = BUDHODNOTA
+FVSCHEDULE = FVSCHEDULE
+INTRATE = INTRATE
+IPMT = PLATBA.ÚROK
+IRR = MÍRA.VÝNOSNOSTI
+ISPMT = ISPMT
+MDURATION = MDURATION
+MIRR = MOD.MÍRA.VÝNOSNOSTI
+NOMINAL = NOMINAL
+NPER = POČET.OBDOBÍ
+NPV = ČISTÁ.SOUČHODNOTA
+ODDFPRICE = ODDFPRICE
+ODDFYIELD = ODDFYIELD
+ODDLPRICE = ODDLPRICE
+ODDLYIELD = ODDLYIELD
+PDURATION = PDURATION
+PMT = PLATBA
+PPMT = PLATBA.ZÁKLAD
+PRICE = PRICE
+PRICEDISC = PRICEDISC
+PRICEMAT = PRICEMAT
+PV = SOUČHODNOTA
+RATE = ÚROKOVÁ.MÍRA
+RECEIVED = RECEIVED
+RRI = RRI
+SLN = ODPIS.LIN
+SYD = ODPIS.NELIN
+TBILLEQ = TBILLEQ
+TBILLPRICE = TBILLPRICE
+TBILLYIELD = TBILLYIELD
+VDB = ODPIS.ZA.INT
+XIRR = XIRR
+XNPV = XNPV
+YIELD = YIELD
+YIELDDISC = YIELDDISC
+YIELDMAT = YIELDMAT
 
 ##
-##	Financial functions			Finanční funkce
+## Informační funkce (Information Functions)
 ##
-ACCRINT			= ACCRINT		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-ACCRINTM		= ACCRINTM		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen k datu splatnosti.
-AMORDEGRC		= AMORDEGRC		##	Vrátí lineární amortizaci v každém účetním období pomocí koeficientu amortizace.
-AMORLINC		= AMORLINC		##	Vrátí lineární amortizaci v každém účetním období.
-COUPDAYBS		= COUPDAYBS		##	Vrátí počet dnů od začátku období placení kupónů do data splatnosti.
-COUPDAYS		= COUPDAYS		##	Vrátí počet dnů v období placení kupónů, které obsahuje den zúčtování.
-COUPDAYSNC		= COUPDAYSNC		##	Vrátí počet dnů od data zúčtování do následujícího data placení kupónu.
-COUPNCD			= COUPNCD		##	Vrátí následující datum placení kupónu po datu zúčtování.
-COUPNUM			= COUPNUM		##	Vrátí počet kupónů splatných mezi datem zúčtování a datem splatnosti.
-COUPPCD			= COUPPCD		##	Vrátí předchozí datum placení kupónu před datem zúčtování.
-CUMIPMT			= CUMIPMT		##	Vrátí kumulativní úrok splacený mezi dvěma obdobími.
-CUMPRINC		= CUMPRINC		##	Vrátí kumulativní jistinu splacenou mezi dvěma obdobími půjčky.
-DB			= ODPIS.ZRYCH		##	Vrátí odpis aktiva za určité období pomocí degresivní metody odpisu s pevným zůstatkem.
-DDB			= ODPIS.ZRYCH2		##	Vrátí odpis aktiva za určité období pomocí dvojité degresivní metody odpisu nebo jiné metody, kterou zadáte.
-DISC			= DISC			##	Vrátí diskontní sazbu cenného papíru.
-DOLLARDE		= DOLLARDE		##	Převede částku v korunách vyjádřenou zlomkem na částku v korunách vyjádřenou desetinným číslem.
-DOLLARFR		= DOLLARFR		##	Převede částku v korunách vyjádřenou desetinným číslem na částku v korunách vyjádřenou zlomkem.
-DURATION		= DURATION		##	Vrátí roční dobu cenného papíru s pravidelnými úrokovými sazbami.
-EFFECT			= EFFECT		##	Vrátí efektivní roční úrokovou sazbu.
-FV			= BUDHODNOTA		##	Vrátí budoucí hodnotu investice.
-FVSCHEDULE		= FVSCHEDULE		##	Vrátí budoucí hodnotu počáteční jistiny po použití série sazeb složitého úroku.
-INTRATE			= INTRATE		##	Vrátí úrokovou sazbu plně investovaného cenného papíru.
-IPMT			= PLATBA.ÚROK		##	Vrátí výšku úroku investice za dané období.
-IRR			= MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní výnosové procento série peněžních toků.
-ISPMT			= ISPMT			##	Vypočte výši úroku z investice zaplaceného během určitého období.
-MDURATION		= MDURATION		##	Vrátí Macauleyho modifikovanou dobu cenného papíru o nominální hodnotě 100 Kč.
-MIRR			= MOD.MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní sazbu výnosu, přičemž kladné a záporné hodnoty peněžních prostředků jsou financovány podle různých sazeb.
-NOMINAL			= NOMINAL		##	Vrátí nominální roční úrokovou sazbu.
-NPER			= POČET.OBDOBÍ		##	Vrátí počet období pro investici.
-NPV			= ČISTÁ.SOUČHODNOTA	##	Vrátí čistou současnou hodnotu investice vypočítanou na základě série pravidelných peněžních toků a diskontní sazby.
-ODDFPRICE		= ODDFPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným prvním obdobím.
-ODDFYIELD		= ODDFYIELD		##	Vrátí výnos cenného papíru s odlišným prvním obdobím.
-ODDLPRICE		= ODDLPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným posledním obdobím.
-ODDLYIELD		= ODDLYIELD		##	Vrátí výnos cenného papíru s odlišným posledním obdobím.
-PMT			= PLATBA		##	Vrátí hodnotu pravidelné splátky anuity.
-PPMT			= PLATBA.ZÁKLAD		##	Vrátí hodnotu splátky jistiny pro zadanou investici za dané období.
-PRICE			= PRICE			##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen v pravidelných termínech.
-PRICEDISC		= PRICEDISC		##	Vrátí cenu diskontního cenného papíru o nominální hodnotě 100 Kč.
-PRICEMAT		= PRICEMAT		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen k datu splatnosti.
-PV			= SOUČHODNOTA		##	Vrátí současnou hodnotu investice.
-RATE			= ÚROKOVÁ.MÍRA		##	Vrátí úrokovou sazbu vztaženou na období anuity.
-RECEIVED		= RECEIVED		##	Vrátí částku obdrženou k datu splatnosti plně investovaného cenného papíru.
-SLN			= ODPIS.LIN		##	Vrátí přímé odpisy aktiva pro jedno období.
-SYD			= ODPIS.NELIN		##	Vrátí směrné číslo ročních odpisů aktiva pro zadané období.
-TBILLEQ			= TBILLEQ		##	Vrátí výnos směnky státní pokladny ekvivalentní výnosu obligace.
-TBILLPRICE		= TBILLPRICE		##	Vrátí cenu směnky státní pokladny o nominální hodnotě 100 Kč.
-TBILLYIELD		= TBILLYIELD		##	Vrátí výnos směnky státní pokladny.
-VDB			= ODPIS.ZA.INT		##	Vrátí odpis aktiva pro určité období nebo část období pomocí degresivní metody odpisu.
-XIRR			= XIRR			##	Vrátí vnitřní výnosnost pro harmonogram peněžních toků, který nemusí být nutně periodický.
-XNPV			= XNPV			##	Vrátí čistou současnou hodnotu pro harmonogram peněžních toků, který nemusí být nutně periodický.
-YIELD			= YIELD			##	Vrátí výnos cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-YIELDDISC		= YIELDDISC		##	Vrátí roční výnos diskontního cenného papíru, například směnky státní pokladny.
-YIELDMAT		= YIELDMAT		##	Vrátí roční výnos cenného papíru, ze kterého je úrok placen k datu splatnosti.
-
+CELL = POLÍČKO
+ERROR.TYPE = CHYBA.TYP
+INFO = O.PROSTŘEDÍ
+ISBLANK = JE.PRÁZDNÉ
+ISERR = JE.CHYBA
+ISERROR = JE.CHYBHODN
+ISEVEN = ISEVEN
+ISFORMULA = ISFORMULA
+ISLOGICAL = JE.LOGHODN
+ISNA = JE.NEDEF
+ISNONTEXT = JE.NETEXT
+ISNUMBER = JE.ČISLO
+ISODD = ISODD
+ISREF = JE.ODKAZ
+ISTEXT = JE.TEXT
+N = N
+NA = NEDEF
+SHEET = SHEET
+SHEETS = SHEETS
+TYPE = TYP
 
 ##
-##	Information functions			Informační funkce
+## Logické funkce (Logical Functions)
 ##
-CELL			= POLÍČKO		##	Vrátí informace o formátování, umístění nebo obsahu buňky.
-ERROR.TYPE		= CHYBA.TYP		##	Vrátí číslo odpovídající typu chyby.
-INFO			= O.PROSTŘEDÍ		##	Vrátí informace o aktuálním pracovním prostředí.
-ISBLANK			= JE.PRÁZDNÉ		##	Vrátí hodnotu PRAVDA, pokud se argument hodnota odkazuje na prázdnou buňku.
-ISERR			= JE.CHYBA		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota (kromě #N/A).
-ISERROR			= JE.CHYBHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota.
-ISEVEN			= ISEVEN		##	Vrátí hodnotu PRAVDA, pokud je číslo sudé.
-ISLOGICAL		= JE.LOGHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota logická hodnota.
-ISNA			= JE.NEDEF		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota chybová hodnota #N/A.
-ISNONTEXT		= JE.NETEXT		##	Vrátí hodnotu PRAVDA, pokud argument hodnota není text.
-ISNUMBER		= JE.ČÍSLO		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota číslo.
-ISODD			= ISODD			##	Vrátí hodnotu PRAVDA, pokud je číslo liché.
-ISREF			= JE.ODKAZ		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota odkaz.
-ISTEXT			= JE.TEXT		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota text.
-N			= N			##	Vrátí hodnotu převedenou na číslo.
-NA			= NEDEF			##	Vrátí chybovou hodnotu #N/A.
-TYPE			= TYP			##	Vrátí číslo označující datový typ hodnoty.
-
+AND = A
+FALSE = NEPRAVDA
+IF = KDYŽ
+IFERROR = IFERROR
+IFNA = IFNA
+IFS = IFS
+NOT = NE
+OR = NEBO
+SWITCH = SWITCH
+TRUE = PRAVDA
+XOR = XOR
 
 ##
-##	Logical functions			Logické funkce
+## Vyhledávací funkce a funkce pro odkazy (Lookup & Reference Functions)
 ##
-AND			= A			##	Vrátí hodnotu PRAVDA, mají-li všechny argumenty hodnotu PRAVDA.
-FALSE			= NEPRAVDA		##	Vrátí logickou hodnotu NEPRAVDA.
-IF			= KDYŽ			##	Určí, který logický test má proběhnout.
-IFERROR			= IFERROR		##	Pokud je vzorec vyhodnocen jako chyba, vrátí zadanou hodnotu. V opačném případě vrátí výsledek vzorce.
-NOT			= NE			##	Provede logickou negaci argumentu funkce.
-OR			= NEBO			##	Vrátí hodnotu PRAVDA, je-li alespoň jeden argument roven hodnotě PRAVDA.
-TRUE			= PRAVDA		##	Vrátí logickou hodnotu PRAVDA.
-
+ADDRESS = ODKAZ
+AREAS = POČET.BLOKŮ
+CHOOSE = ZVOLIT
+COLUMN = SLOUPEC
+COLUMNS = SLOUPCE
+FORMULATEXT = FORMULATEXT
+GETPIVOTDATA = ZÍSKATKONTDATA
+HLOOKUP = VVYHLEDAT
+HYPERLINK = HYPERTEXTOVÝ.ODKAZ
+INDEX = INDEX
+INDIRECT = NEPŘÍMÝ.ODKAZ
+LOOKUP = VYHLEDAT
+MATCH = POZVYHLEDAT
+OFFSET = POSUN
+ROW = ŘÁDEK
+ROWS = ŘÁDKY
+RTD = RTD
+TRANSPOSE = TRANSPOZICE
+VLOOKUP = SVYHLEDAT
 
 ##
-##	Lookup and reference functions		Vyhledávací funkce
+## Matematické a trigonometrické funkce (Math & Trig Functions)
 ##
-ADDRESS			= ODKAZ			##	Vrátí textový odkaz na jednu buňku listu.
-AREAS			= POČET.BLOKŮ		##	Vrátí počet oblastí v odkazu.
-CHOOSE			= ZVOLIT		##	Zvolí hodnotu ze seznamu hodnot.
-COLUMN			= SLOUPEC		##	Vrátí číslo sloupce odkazu.
-COLUMNS			= SLOUPCE		##	Vrátí počet sloupců v odkazu.
-HLOOKUP			= VVYHLEDAT		##	Prohledá horní řádek matice a vrátí hodnotu určené buňky.
-HYPERLINK		= HYPERTEXTOVÝ.ODKAZ	##	Vytvoří zástupce nebo odkaz, který otevře dokument uložený na síťovém serveru, v síti intranet nebo Internet.
-INDEX			= INDEX			##	Pomocí rejstříku zvolí hodnotu z odkazu nebo matice.
-INDIRECT		= NEPŘÍMÝ.ODKAZ		##	Vrátí odkaz určený textovou hodnotou.
-LOOKUP			= VYHLEDAT		##	Vyhledá hodnoty ve vektoru nebo matici.
-MATCH			= POZVYHLEDAT		##	Vyhledá hodnoty v odkazu nebo matici.
-OFFSET			= POSUN			##	Vrátí posun odkazu od zadaného odkazu.
-ROW			= ŘÁDEK			##	Vrátí číslo řádku odkazu.
-ROWS			= ŘÁDKY			##	Vrátí počet řádků v odkazu.
-RTD			= RTD			##	Načte data reálného času z programu, který podporuje automatizaci modelu COM (Automatizace: Způsob práce s objekty určité aplikace z jiné aplikace nebo nástroje pro vývoj. Automatizace (dříve nazývaná automatizace OLE) je počítačovým standardem a je funkcí modelu COM (Component Object Model).).
-TRANSPOSE		= TRANSPOZICE		##	Vrátí transponovanou matici.
-VLOOKUP			= SVYHLEDAT		##	Prohledá první sloupec matice, přesune kurzor v řádku a vrátí hodnotu buňky.
-
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGGREGATE
+ARABIC = ARABIC
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTG
+ATAN2 = ARCTG2
+ATANH = ARCTGH
+BASE = BASE
+CEILING.MATH = CEILING.MATH
+COMBIN = KOMBINACE
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = DEGREES
+EVEN = ZAOKROUHLIT.NA.SUDÉ
+EXP = EXP
+FACT = FAKTORIÁL
+FACTDOUBLE = FACTDOUBLE
+FLOOR.MATH = FLOOR.MATH
+GCD = GCD
+INT = CELÁ.ČÁST
+LCM = LCM
+LN = LN
+LOG = LOGZ
+LOG10 = LOG
+MDETERM = DETERMINANT
+MINVERSE = INVERZE
+MMULT = SOUČIN.MATIC
+MOD = MOD
+MROUND = MROUND
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MUNIT
+ODD = ZAOKROUHLIT.NA.LICHÉ
+PI = PI
+POWER = POWER
+PRODUCT = SOUČIN
+QUOTIENT = QUOTIENT
+RADIANS = RADIANS
+RAND = NÁHČÍSLO
+RANDBETWEEN = RANDBETWEEN
+ROMAN = ROMAN
+ROUND = ZAOKROUHLIT
+ROUNDDOWN = ROUNDDOWN
+ROUNDUP = ROUNDUP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERIESSUM
+SIGN = SIGN
+SIN = SIN
+SINH = SINH
+SQRT = ODMOCNINA
+SQRTPI = SQRTPI
+SUBTOTAL = SUBTOTAL
+SUM = SUMA
+SUMIF = SUMIF
+SUMIFS = SUMIFS
+SUMPRODUCT = SOUČIN.SKALÁRNÍ
+SUMSQ = SUMA.ČTVERCŮ
+SUMX2MY2 = SUMX2MY2
+SUMX2PY2 = SUMX2PY2
+SUMXMY2 = SUMXMY2
+TAN = TG
+TANH = TGH
+TRUNC = USEKNOUT
 
 ##
-##	Math and trigonometry functions		Matematické a trigonometrické funkce
+## Statistické funkce (Statistical Functions)
 ##
-ABS			= ABS			##	Vrátí absolutní hodnotu čísla.
-ACOS			= ARCCOS		##	Vrátí arkuskosinus čísla.
-ACOSH			= ARCCOSH		##	Vrátí hyperbolický arkuskosinus čísla.
-ASIN			= ARCSIN		##	Vrátí arkussinus čísla.
-ASINH			= ARCSINH		##	Vrátí hyperbolický arkussinus čísla.
-ATAN			= ARCTG			##	Vrátí arkustangens čísla.
-ATAN2			= ARCTG2		##	Vrátí arkustangens x-ové a y-ové souřadnice.
-ATANH			= ARCTGH		##	Vrátí hyperbolický arkustangens čísla.
-CEILING			= ZAOKR.NAHORU		##	Zaokrouhlí číslo na nejbližší celé číslo nebo na nejbližší násobek zadané hodnoty.
-COMBIN			= KOMBINACE		##	Vrátí počet kombinací pro daný počet položek.
-COS			= COS			##	Vrátí kosinus čísla.
-COSH			= COSH			##	Vrátí hyperbolický kosinus čísla.
-DEGREES			= DEGREES		##	Převede radiány na stupně.
-EVEN			= ZAOKROUHLIT.NA.SUDÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé sudé číslo.
-EXP			= EXP			##	Vrátí základ přirozeného logaritmu e umocněný na zadané číslo.
-FACT			= FAKTORIÁL		##	Vrátí faktoriál čísla.
-FACTDOUBLE		= FACTDOUBLE		##	Vrátí dvojitý faktoriál čísla.
-FLOOR			= ZAOKR.DOLŮ		##	Zaokrouhlí číslo dolů, směrem k nule.
-GCD			= GCD			##	Vrátí největší společný dělitel.
-INT			= CELÁ.ČÁST		##	Zaokrouhlí číslo dolů na nejbližší celé číslo.
-LCM			= LCM			##	Vrátí nejmenší společný násobek.
-LN			= LN			##	Vrátí přirozený logaritmus čísla.
-LOG			= LOGZ			##	Vrátí logaritmus čísla při zadaném základu.
-LOG10			= LOG			##	Vrátí dekadický logaritmus čísla.
-MDETERM			= DETERMINANT		##	Vrátí determinant matice.
-MINVERSE		= INVERZE		##	Vrátí inverzní matici.
-MMULT			= SOUČIN.MATIC		##	Vrátí součin dvou matic.
-MOD			= MOD			##	Vrátí zbytek po dělení.
-MROUND			= MROUND		##	Vrátí číslo zaokrouhlené na požadovaný násobek.
-MULTINOMIAL		= MULTINOMIAL		##	Vrátí mnohočlen z množiny čísel.
-ODD			= ZAOKROUHLIT.NA.LICHÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé liché číslo.
-PI			= PI			##	Vrátí hodnotu čísla pí.
-POWER			= POWER			##	Umocní číslo na zadanou mocninu.
-PRODUCT			= SOUČIN		##	Vynásobí argumenty funkce.
-QUOTIENT		= QUOTIENT		##	Vrátí celou část dělení.
-RADIANS			= RADIANS		##	Převede stupně na radiány.
-RAND			= NÁHČÍSLO		##	Vrátí náhodné číslo mezi 0 a 1.
-RANDBETWEEN		= RANDBETWEEN		##	Vrátí náhodné číslo mezi zadanými čísly.
-ROMAN			= ROMAN			##	Převede arabskou číslici na římskou ve formátu textu.
-ROUND			= ZAOKROUHLIT		##	Zaokrouhlí číslo na zadaný počet číslic.
-ROUNDDOWN		= ROUNDDOWN		##	Zaokrouhlí číslo dolů, směrem k nule.
-ROUNDUP			= ROUNDUP		##	Zaokrouhlí číslo nahoru, směrem od nuly.
-SERIESSUM		= SERIESSUM		##	Vrátí součet mocninné řady určené podle vzorce.
-SIGN			= SIGN			##	Vrátí znaménko čísla.
-SIN			= SIN			##	Vrátí sinus daného úhlu.
-SINH			= SINH			##	Vrátí hyperbolický sinus čísla.
-SQRT			= ODMOCNINA		##	Vrátí kladnou druhou odmocninu.
-SQRTPI			= SQRTPI		##	Vrátí druhou odmocninu výrazu (číslo * pí).
-SUBTOTAL		= SUBTOTAL		##	Vrátí souhrn v seznamu nebo databázi.
-SUM			= SUMA			##	Sečte argumenty funkce.
-SUMIF			= SUMIF			##	Sečte buňky vybrané podle zadaných kritérií.
-SUMIFS			= SUMIFS		##	Sečte buňky určené více zadanými podmínkami.
-SUMPRODUCT		= SOUČIN.SKALÁRNÍ	##	Vrátí součet součinů odpovídajících prvků matic.
-SUMSQ			= SUMA.ČTVERCŮ		##	Vrátí součet čtverců argumentů.
-SUMX2MY2		= SUMX2MY2		##	Vrátí součet rozdílu čtverců odpovídajících hodnot ve dvou maticích.
-SUMX2PY2		= SUMX2PY2		##	Vrátí součet součtu čtverců odpovídajících hodnot ve dvou maticích.
-SUMXMY2			= SUMXMY2		##	Vrátí součet čtverců rozdílů odpovídajících hodnot ve dvou maticích.
-TAN			= TGTG			##	Vrátí tangens čísla.
-TANH			= TGH			##	Vrátí hyperbolický tangens čísla.
-TRUNC			= USEKNOUT		##	Zkrátí číslo na celé číslo.
-
+AVEDEV = PRŮMODCHYLKA
+AVERAGE = PRŮMĚR
+AVERAGEA = AVERAGEA
+AVERAGEIF = AVERAGEIF
+AVERAGEIFS = AVERAGEIFS
+BETA.DIST = BETA.DIST
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.DIST
+BINOM.DIST.RANGE = BINOM.DIST.RANGE
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHISQ.DIST
+CHISQ.DIST.RT = CHISQ.DIST.RT
+CHISQ.INV = CHISQ.INV
+CHISQ.INV.RT = CHISQ.INV.RT
+CHISQ.TEST = CHISQ.TEST
+CONFIDENCE.NORM = CONFIDENCE.NORM
+CONFIDENCE.T = CONFIDENCE.T
+CORREL = CORREL
+COUNT = POČET
+COUNTA = POČET2
+COUNTBLANK = COUNTBLANK
+COUNTIF = COUNTIF
+COUNTIFS = COUNTIFS
+COVARIANCE.P = COVARIANCE.P
+COVARIANCE.S = COVARIANCE.S
+DEVSQ = DEVSQ
+EXPON.DIST = EXPON.DIST
+F.DIST = F.DIST
+F.DIST.RT = F.DIST.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = FORECAST.ETS
+FORECAST.ETS.CONFINT = FORECAST.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = FORECAST.ETS.SEASONALITY
+FORECAST.ETS.STAT = FORECAST.ETS.STAT
+FORECAST.LINEAR = FORECAST.LINEAR
+FREQUENCY = ČETNOSTI
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.DIST
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRECISE
+GAUSS = GAUSS
+GEOMEAN = GEOMEAN
+GROWTH = LOGLINTREND
+HARMEAN = HARMEAN
+HYPGEOM.DIST = HYPGEOM.DIST
+INTERCEPT = INTERCEPT
+KURT = KURT
+LARGE = LARGE
+LINEST = LINREGRESE
+LOGEST = LOGLINREGRESE
+LOGNORM.DIST = LOGNORM.DIST
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXIFS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINIFS
+MODE.MULT = MODE.MULT
+MODE.SNGL = MODE.SNGL
+NEGBINOM.DIST = NEGBINOM.DIST
+NORM.DIST = NORM.DIST
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.DIST
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = PERCENTRANK.EXC
+PERCENTRANK.INC = PERCENTRANK.INC
+PERMUT = PERMUTACE
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.DIST
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = RANK.AVG
+RANK.EQ = RANK.EQ
+RSQ = RKQ
+SKEW = SKEW
+SKEW.P = SKEW.P
+SLOPE = SLOPE
+SMALL = SMALL
+STANDARDIZE = STANDARDIZE
+STDEV.P = SMODCH.P
+STDEV.S = SMODCH.VÝBĚR.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STEYX
+T.DIST = T.DIST
+T.DIST.2T = T.DIST.2T
+T.DIST.RT = T.DIST.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = LINTREND
+TRIMMEAN = TRIMMEAN
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.DIST
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions			Statistické funkce
+## Textové funkce (Text Functions)
 ##
-AVEDEV			= PRŮMODCHYLKA		##	Vrátí průměrnou hodnotu absolutních odchylek datových bodů od jejich střední hodnoty.
-AVERAGE			= PRŮMĚR		##	Vrátí průměrnou hodnotu argumentů.
-AVERAGEA		= AVERAGEA		##	Vrátí průměrnou hodnotu argumentů včetně čísel, textu a logických hodnot.
-AVERAGEIF		= AVERAGEIF		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk v oblasti, které vyhovují příslušné podmínce.
-AVERAGEIFS		= AVERAGEIFS		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk vyhovujících několika podmínkám.
-BETADIST		= BETADIST		##	Vrátí hodnotu součtového rozdělení beta.
-BETAINV			= BETAINV		##	Vrátí inverzní hodnotu součtového rozdělení pro zadané rozdělení beta.
-BINOMDIST		= BINOMDIST		##	Vrátí hodnotu binomického rozdělení pravděpodobnosti jednotlivých veličin.
-CHIDIST			= CHIDIST		##	Vrátí jednostrannou pravděpodobnost rozdělení chí-kvadrát.
-CHIINV			= CHIINV		##	Vrátí hodnotu funkce inverzní k distribuční funkci jednostranné pravděpodobnosti rozdělení chí-kvadrát.
-CHITEST			= CHITEST		##	Vrátí test nezávislosti.
-CONFIDENCE		= CONFIDENCE		##	Vrátí interval spolehlivosti pro střední hodnotu základního souboru.
-CORREL			= CORREL		##	Vrátí korelační koeficient mezi dvěma množinami dat.
-COUNT			= POČET			##	Vrátí počet čísel v seznamu argumentů.
-COUNTA			= POČET2		##	Vrátí počet hodnot v seznamu argumentů.
-COUNTBLANK		= COUNTBLANK		##	Spočítá počet prázdných buněk v oblasti.
-COUNTIF			= COUNTIF		##	Spočítá buňky v oblasti, které odpovídají zadaným kritériím.
-COUNTIFS		= COUNTIFS		##	Spočítá buňky v oblasti, které odpovídají více kritériím.
-COVAR			= COVAR			##	Vrátí hodnotu kovariance, průměrnou hodnotu součinů párových odchylek
-CRITBINOM		= CRITBINOM		##	Vrátí nejmenší hodnotu, pro kterou má součtové binomické rozdělení hodnotu větší nebo rovnu hodnotě kritéria.
-DEVSQ			= DEVSQ			##	Vrátí součet čtverců odchylek.
-EXPONDIST		= EXPONDIST		##	Vrátí hodnotu exponenciálního rozdělení.
-FDIST			= FDIST			##	Vrátí hodnotu rozdělení pravděpodobnosti F.
-FINV			= FINV			##	Vrátí hodnotu inverzní funkce k distribuční funkci rozdělení F.
-FISHER			= FISHER		##	Vrátí hodnotu Fisherovy transformace.
-FISHERINV		= FISHERINV		##	Vrátí hodnotu inverzní funkce k Fisherově transformaci.
-FORECAST		= FORECAST		##	Vrátí hodnotu lineárního trendu.
-FREQUENCY		= ČETNOSTI		##	Vrátí četnost rozdělení jako svislou matici.
-FTEST			= FTEST			##	Vrátí výsledek F-testu.
-GAMMADIST		= GAMMADIST		##	Vrátí hodnotu rozdělení gama.
-GAMMAINV		= GAMMAINV		##	Vrátí hodnotu inverzní funkce k distribuční funkci součtového rozdělení gama.
-GAMMALN			= GAMMALN		##	Vrátí přirozený logaritmus funkce gama, Γ(x).
-GEOMEAN			= GEOMEAN		##	Vrátí geometrický průměr.
-GROWTH			= LOGLINTREND		##	Vrátí hodnoty exponenciálního trendu.
-HARMEAN			= HARMEAN		##	Vrátí harmonický průměr.
-HYPGEOMDIST		= HYPGEOMDIST		##	Vrátí hodnotu hypergeometrického rozdělení.
-INTERCEPT		= INTERCEPT		##	Vrátí úsek lineární regresní čáry.
-KURT			= KURT			##	Vrátí hodnotu excesu množiny dat.
-LARGE			= LARGE			##	Vrátí k-tou největší hodnotu množiny dat.
-LINEST			= LINREGRESE		##	Vrátí parametry lineárního trendu.
-LOGEST			= LOGLINREGRESE		##	Vrátí parametry exponenciálního trendu.
-LOGINV			= LOGINV		##	Vrátí inverzní funkci k distribuční funkci logaritmicko-normálního rozdělení.
-LOGNORMDIST		= LOGNORMDIST		##	Vrátí hodnotu součtového logaritmicko-normálního rozdělení.
-MAX			= MAX			##	Vrátí maximální hodnotu seznamu argumentů.
-MAXA			= MAXA			##	Vrátí maximální hodnotu seznamu argumentů včetně čísel, textu a logických hodnot.
-MEDIAN			= MEDIAN		##	Vrátí střední hodnotu zadaných čísel.
-MIN			= MIN			##	Vrátí minimální hodnotu seznamu argumentů.
-MINA			= MINA			##	Vrátí nejmenší hodnotu v seznamu argumentů včetně čísel, textu a logických hodnot.
-MODE			= MODE			##	Vrátí hodnotu, která se v množině dat vyskytuje nejčastěji.
-NEGBINOMDIST		= NEGBINOMDIST		##	Vrátí hodnotu negativního binomického rozdělení.
-NORMDIST		= NORMDIST		##	Vrátí hodnotu normálního součtového rozdělení.
-NORMINV			= NORMINV		##	Vrátí inverzní funkci k funkci normálního součtového rozdělení.
-NORMSDIST		= NORMSDIST		##	Vrátí hodnotu standardního normálního součtového rozdělení.
-NORMSINV		= NORMSINV		##	Vrátí inverzní funkci k funkci standardního normálního součtového rozdělení.
-PEARSON			= PEARSON		##	Vrátí Pearsonův výsledný momentový korelační koeficient.
-PERCENTILE		= PERCENTIL		##	Vrátí hodnotu k-tého percentilu hodnot v oblasti.
-PERCENTRANK		= PERCENTRANK		##	Vrátí pořadí hodnoty v množině dat vyjádřené procentuální částí množiny dat.
-PERMUT			= PERMUTACE		##	Vrátí počet permutací pro zadaný počet objektů.
-POISSON			= POISSON		##	Vrátí hodnotu distribuční funkce Poissonova rozdělení.
-PROB			= PROB			##	Vrátí pravděpodobnost výskytu hodnot v oblasti mezi dvěma mezními hodnotami.
-QUARTILE		= QUARTIL		##	Vrátí hodnotu kvartilu množiny dat.
-RANK			= RANK			##	Vrátí pořadí čísla v seznamu čísel.
-RSQ			= RKQ			##	Vrátí druhou mocninu Pearsonova výsledného momentového korelačního koeficientu.
-SKEW			= SKEW			##	Vrátí zešikmení rozdělení.
-SLOPE			= SLOPE			##	Vrátí směrnici lineární regresní čáry.
-SMALL			= SMALL			##	Vrátí k-tou nejmenší hodnotu množiny dat.
-STANDARDIZE		= STANDARDIZE		##	Vrátí normalizovanou hodnotu.
-STDEV			= SMODCH.VÝBĚR		##	Vypočte směrodatnou odchylku výběru.
-STDEVA			= STDEVA		##	Vypočte směrodatnou odchylku výběru včetně čísel, textu a logických hodnot.
-STDEVP			= SMODCH		##	Vypočte směrodatnou odchylku základního souboru.
-STDEVPA			= STDEVPA		##	Vypočte směrodatnou odchylku základního souboru včetně čísel, textu a logických hodnot.
-STEYX			= STEYX			##	Vrátí standardní chybu předpovězené hodnoty y pro každou hodnotu x v regresi.
-TDIST			= TDIST			##	Vrátí hodnotu Studentova t-rozdělení.
-TINV			= TINV			##	Vrátí inverzní funkci k distribuční funkci Studentova t-rozdělení.
-TREND			= LINTREND		##	Vrátí hodnoty lineárního trendu.
-TRIMMEAN		= TRIMMEAN		##	Vrátí střední hodnotu vnitřní části množiny dat.
-TTEST			= TTEST			##	Vrátí pravděpodobnost spojenou se Studentovým t-testem.
-VAR			= VAR.VÝBĚR		##	Vypočte rozptyl výběru.
-VARA			= VARA			##	Vypočte rozptyl výběru včetně čísel, textu a logických hodnot.
-VARP			= VAR			##	Vypočte rozptyl základního souboru.
-VARPA			= VARPA			##	Vypočte rozptyl základního souboru včetně čísel, textu a logických hodnot.
-WEIBULL			= WEIBULL		##	Vrátí hodnotu Weibullova rozdělení.
-ZTEST			= ZTEST			##	Vrátí jednostrannou P-hodnotu z-testu.
-
+BAHTTEXT = BAHTTEXT
+CHAR = ZNAK
+CLEAN = VYČISTIT
+CODE = KÓD
+CONCAT = CONCAT
+DOLLAR = KČ
+EXACT = STEJNÉ
+FIND = NAJÍT
+FIXED = ZAOKROUHLIT.NA.TEXT
+LEFT = ZLEVA
+LEN = DÉLKA
+LOWER = MALÁ
+MID = ČÁST
+NUMBERVALUE = NUMBERVALUE
+PHONETIC = ZVUKOVÉ
+PROPER = VELKÁ2
+REPLACE = NAHRADIT
+REPT = OPAKOVAT
+RIGHT = ZPRAVA
+SEARCH = HLEDAT
+SUBSTITUTE = DOSADIT
+T = T
+TEXT = HODNOTA.NA.TEXT
+TEXTJOIN = TEXTJOIN
+TRIM = PROČISTIT
+UNICHAR = UNICHAR
+UNICODE = UNICODE
+UPPER = VELKÁ
+VALUE = HODNOTA
 
 ##
-##	Text functions				Textové funkce
+## Webové funkce (Web Functions)
 ##
-ASC			= ASC			##	Změní znaky s plnou šířkou (dvoubajtové)v řetězci znaků na znaky s poloviční šířkou (jednobajtové).
-BAHTTEXT		= BAHTTEXT		##	Převede číslo na text ve formátu, měny ß (baht).
-CHAR			= ZNAK			##	Vrátí znak určený číslem kódu.
-CLEAN			= VYČISTIT		##	Odebere z textu všechny netisknutelné znaky.
-CODE			= KÓD			##	Vrátí číselný kód prvního znaku zadaného textového řetězce.
-CONCATENATE		= CONCATENATE		##	Spojí několik textových položek do jedné.
-DOLLAR			= KČ			##	Převede číslo na text ve formátu měny Kč (česká koruna).
-EXACT			= STEJNÉ		##	Zkontroluje, zda jsou dvě textové hodnoty shodné.
-FIND			= NAJÍT			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FINDB			= FINDB			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FIXED			= ZAOKROUHLIT.NA.TEXT	##	Zformátuje číslo jako text s pevným počtem desetinných míst.
-JIS			= JIS			##	Změní znaky s poloviční šířkou (jednobajtové) v řetězci znaků na znaky s plnou šířkou (dvoubajtové).
-LEFT			= ZLEVA			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEFTB			= LEFTB			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEN			= DÉLKA			##	Vrátí počet znaků textového řetězce.
-LENB			= LENB			##	Vrátí počet znaků textového řetězce.
-LOWER			= MALÁ			##	Převede text na malá písmena.
-MID			= ČÁST			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-MIDB			= MIDB			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-PHONETIC		= ZVUKOVÉ		##	Extrahuje fonetické znaky (furigana) z textového řetězce.
-PROPER			= VELKÁ2		##	Převede první písmeno každého slova textové hodnoty na velké.
-REPLACE			= NAHRADIT		##	Nahradí znaky uvnitř textu.
-REPLACEB		= NAHRADITB		##	Nahradí znaky uvnitř textu.
-REPT			= OPAKOVAT		##	Zopakuje text podle zadaného počtu opakování.
-RIGHT			= ZPRAVA		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-RIGHTB			= RIGHTB		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-SEARCH			= HLEDAT		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SEARCHB			= SEARCHB		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SUBSTITUTE		= DOSADIT		##	V textovém řetězci nahradí starý text novým.
-T			= T			##	Převede argumenty na text.
-TEXT			= HODNOTA.NA.TEXT	##	Zformátuje číslo a převede ho na text.
-TRIM			= PROČISTIT		##	Odstraní z textu mezery.
-UPPER			= VELKÁ			##	Převede text na velká písmena.
-VALUE			= HODNOTA		##	Převede textový argument na číslo.
+ENCODEURL = ENCODEURL
+FILTERXML = FILTERXML
+WEBSERVICE = WEBSERVICE
+
+##
+## Funkce pro kompatibilitu (Compatibility Functions)
+##
+BETADIST = BETADIST
+BETAINV = BETAINV
+BINOMDIST = BINOMDIST
+CEILING = ZAOKR.NAHORU
+CHIDIST = CHIDIST
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = CONCATENATE
+CONFIDENCE = CONFIDENCE
+COVAR = COVAR
+CRITBINOM = CRITBINOM
+EXPONDIST = EXPONDIST
+FDIST = FDIST
+FINV = FINV
+FLOOR = ZAOKR.DOLŮ
+FORECAST = FORECAST
+FTEST = FTEST
+GAMMADIST = GAMMADIST
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMDIST
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMDIST
+MODE = MODE
+NEGBINOMDIST = NEGBINOMDIST
+NORMDIST = NORMDIST
+NORMINV = NORMINV
+NORMSDIST = NORMSDIST
+NORMSINV = NORMSINV
+PERCENTILE = PERCENTIL
+PERCENTRANK = PERCENTRANK
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = RANK
+STDEV = SMODCH.VÝBĚR
+STDEVP = SMODCH
+TDIST = TDIST
+TINV = TINV
+TTEST = TTEST
+VAR = VAR.VÝBĚR
+VARP = VAR
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config
index a7aa8fee9..284b24903 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config
@@ -1,25 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Dansk (Danish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= kr
-
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NUL!
-DIV0	= #DIVISION/0!
-VALUE	= #VÆRDI!
-REF	= #REFERENCE!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
+NULL = #NUL!
+DIV0
+VALUE = #VÆRDI!
+REF = #REFERENCE!
+NAME = #NAVN?
+NUM
+NA = #I/T
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
index d02aa2ec9..03b68c9bd 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
@@ -1,416 +1,538 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Dansk (Danish)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Tilføjelsesprogram- og automatiseringsfunktioner
+## Kubefunktioner (Cube Functions)
 ##
-GETPIVOTDATA		= HENTPIVOTDATA			##	Returnerer data, der er lagret i en pivottabelrapport
-
+CUBEKPIMEMBER = KUBE.KPI.MEDLEM
+CUBEMEMBER = KUBEMEDLEM
+CUBEMEMBERPROPERTY = KUBEMEDLEM.EGENSKAB
+CUBERANKEDMEMBER = KUBERANGERET.MEDLEM
+CUBESET = KUBESÆT
+CUBESETCOUNT = KUBESÆT.ANTAL
+CUBEVALUE = KUBEVÆRDI
 
 ##
-##	Cube functions					Kubefunktioner
+## Databasefunktioner (Database Functions)
 ##
-CUBEKPIMEMBER		= KUBE.KPI.MEDLEM		##	Returnerer navn, egenskab og mål for en KPI-indikator og viser navnet og egenskaben i cellen. En KPI-indikator er en målbar størrelse, f.eks. bruttooverskud pr. måned eller personaleudskiftning pr. kvartal, der bruges til at overvåge en organisations præstationer.
-CUBEMEMBER		= KUBE.MEDLEM			##	Returnerer et medlem eller en tupel fra kubehierarkiet. Bruges til at validere, om et medlem eller en tupel findes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEM.EGENSKAB		##	Returnerer værdien af en egenskab for et medlem i kuben. Bruges til at validere, om et medlemsnavn findes i kuben, og returnere den angivne egenskab for medlemmet.
-CUBERANKEDMEMBER	= KUBEMEDLEM.RANG		##	Returnerer det n'te eller rangordnede medlem i et sæt. Bruges til at returnere et eller flere elementer i et sæt, f.eks. topsælgere eller de 10 bedste elever.
-CUBESET			= KUBESÆT			##	Definerer et beregnet sæt medlemmer eller tupler ved at sende et sætudtryk til kuben på serveren, som opretter sættet og returnerer det til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESÆT.TÆL			##	Returnerer antallet af elementer i et sæt.
-CUBEVALUE		= KUBEVÆRDI			##	Returnerer en sammenlagt (aggregeret) værdi fra en kube.
-
+DAVERAGE = DMIDDEL
+DCOUNT = DTÆL
+DCOUNTA = DTÆLV
+DGET = DHENT
+DMAX = DMAKS
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAFV
+DSTDEVP = DSTDAFVP
+DSUM = DSUM
+DVAR = DVARIANS
+DVARP = DVARIANSP
 
 ##
-##	Database functions				Databasefunktioner
+## Dato- og klokkeslætfunktioner (Date & Time Functions)
 ##
-DAVERAGE		= DMIDDEL			##	Returnerer gennemsnittet af markerede databaseposter
-DCOUNT			= DTÆL				##	Tæller de celler, der indeholder tal, i en database
-DCOUNTA			= DTÆLV				##	Tæller udfyldte celler i en database
-DGET			= DHENT				##	Uddrager en enkelt post, der opfylder de angivne kriterier, fra en database
-DMAX			= DMAKS				##	Returnerer den største værdi blandt markerede databaseposter
-DMIN			= DMIN				##	Returnerer den mindste værdi blandt markerede databaseposter
-DPRODUCT		= DPRODUKT			##	Ganger værdierne i et bestemt felt med poster, der opfylder kriterierne i en database
-DSTDEV			= DSTDAFV			##	Beregner et skøn over standardafvigelsen baseret på en stikprøve af markerede databaseposter
-DSTDEVP			= DSTDAFVP			##	Beregner standardafvigelsen baseret på hele populationen af markerede databaseposter
-DSUM			= DSUM				##	Sammenlægger de tal i feltkolonnen i databasen, der opfylder kriterierne
-DVAR			= DVARIANS			##	Beregner varians baseret på en stikprøve af markerede databaseposter
-DVARP			= DVARIANSP			##	Beregner varians baseret på hele populationen af markerede databaseposter
-
+DATE = DATO
+DATEDIF = DATO.FORSKEL
+DATESTRING = DATOSTRENG
+DATEVALUE = DATOVÆRDI
+DAY = DAG
+DAYS = DAGE
+DAYS360 = DAGE360
+EDATE = EDATO
+EOMONTH = SLUT.PÅ.MÅNED
+HOUR = TIME
+ISOWEEKNUM = ISOUGE.NR
+MINUTE = MINUT
+MONTH = MÅNED
+NETWORKDAYS = ANTAL.ARBEJDSDAGE
+NETWORKDAYS.INTL = ANTAL.ARBEJDSDAGE.INTL
+NOW = NU
+SECOND = SEKUND
+THAIDAYOFWEEK = THAILANDSKUGEDAG
+THAIMONTHOFYEAR = THAILANDSKMÅNED
+THAIYEAR = THAILANDSKÅR
+TIME = TID
+TIMEVALUE = TIDSVÆRDI
+TODAY = IDAG
+WEEKDAY = UGEDAG
+WEEKNUM = UGE.NR
+WORKDAY = ARBEJDSDAG
+WORKDAY.INTL = ARBEJDSDAG.INTL
+YEAR = ÅR
+YEARFRAC = ÅR.BRØK
 
 ##
-##	Date and time functions				Dato- og klokkeslætsfunktioner
+## Tekniske funktioner (Engineering Functions)
 ##
-DATE			= DATO				##	Returnerer serienummeret for en bestemt dato
-DATEVALUE		= DATOVÆRDI			##	Konverterer en dato i form af tekst til et serienummer
-DAY			= DAG				##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGE360			##	Beregner antallet af dage mellem to datoer på grundlag af et år med 360 dage
-EDATE			= EDATO				##	Returnerer serienummeret for den dato, der ligger det angivne antal måneder før eller efter startdatoen
-EOMONTH			= SLUT.PÅ.MÅNED			##	Returnerer serienummeret på den sidste dag i måneden før eller efter et angivet antal måneder
-HOUR			= TIME				##	Konverterer et serienummer til en time
-MINUTE			= MINUT				##	Konverterer et serienummer til et minut
-MONTH			= MÅNED				##	Konverterer et serienummer til en måned
-NETWORKDAYS		= ANTAL.ARBEJDSDAGE		##	Returnerer antallet af hele arbejdsdage mellem to datoer
-NOW			= NU				##	Returnerer serienummeret for den aktuelle dato eller det aktuelle klokkeslæt
-SECOND			= SEKUND			##	Konverterer et serienummer til et sekund
-TIME			= KLOKKESLÆT			##	Returnerer serienummeret for et bestemt klokkeslæt
-TIMEVALUE		= TIDSVÆRDI			##	Konverterer et klokkeslæt i form af tekst til et serienummer
-TODAY			= IDAG				##	Returnerer serienummeret for dags dato
-WEEKDAY			= UGEDAG			##	Konverterer et serienummer til en ugedag
-WEEKNUM			= UGE.NR			##	Konverterer et serienummer til et tal, der angiver ugenummeret i året
-WORKDAY			= ARBEJDSDAG			##	Returnerer serienummeret for dagen før eller efter det angivne antal arbejdsdage
-YEAR			= ÅR				##	Konverterer et serienummer til et år
-YEARFRAC		= ÅR.BRØK			##	Returnerer årsbrøken, der repræsenterer antallet af hele dage mellem startdato og slutdato
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.TIL.DEC
+BIN2HEX = BIN.TIL.HEX
+BIN2OCT = BIN.TIL.OKT
+BITAND = BITOG
+BITLSHIFT = BITLSKIFT
+BITOR = BITELLER
+BITRSHIFT = BITRSKIFT
+BITXOR = BITXELLER
+COMPLEX = KOMPLEKS
+CONVERT = KONVERTER
+DEC2BIN = DEC.TIL.BIN
+DEC2HEX = DEC.TIL.HEX
+DEC2OCT = DEC.TIL.OKT
+DELTA = DELTA
+ERF = FEJLFUNK
+ERF.PRECISE = ERF.PRECISE
+ERFC = FEJLFUNK.KOMP
+ERFC.PRECISE = ERFC.PRECISE
+GESTEP = GETRIN
+HEX2BIN = HEX.TIL.BIN
+HEX2DEC = HEX.TIL.DEC
+HEX2OCT = HEX.TIL.OKT
+IMABS = IMAGABS
+IMAGINARY = IMAGINÆR
+IMARGUMENT = IMAGARGUMENT
+IMCONJUGATE = IMAGKONJUGERE
+IMCOS = IMAGCOS
+IMCOSH = IMAGCOSH
+IMCOT = IMAGCOT
+IMCSC = IMAGCSC
+IMCSCH = IMAGCSCH
+IMDIV = IMAGDIV
+IMEXP = IMAGEKSP
+IMLN = IMAGLN
+IMLOG10 = IMAGLOG10
+IMLOG2 = IMAGLOG2
+IMPOWER = IMAGPOTENS
+IMPRODUCT = IMAGPRODUKT
+IMREAL = IMAGREELT
+IMSEC = IMAGSEC
+IMSECH = IMAGSECH
+IMSIN = IMAGSIN
+IMSINH = IMAGSINH
+IMSQRT = IMAGKVROD
+IMSUB = IMAGSUB
+IMSUM = IMAGSUM
+IMTAN = IMAGTAN
+OCT2BIN = OKT.TIL.BIN
+OCT2DEC = OKT.TIL.DEC
+OCT2HEX = OKT.TIL.HEX
 
 ##
-##	Engineering functions				Tekniske funktioner
+## Finansielle funktioner (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Returnerer den modificerede Bessel-funktion In(x)
-BESSELJ			= BESSELJ			##	Returnerer Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerer den modificerede Bessel-funktion Kn(x)
-BESSELY			= BESSELY			##	Returnerer Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TIL.DEC			##	Konverterer et binært tal til et decimaltal
-BIN2HEX			= BIN.TIL.HEX			##	Konverterer et binært tal til et heksadecimalt tal
-BIN2OCT			= BIN.TIL.OKT			##	Konverterer et binært tal til et oktaltal.
-COMPLEX			= KOMPLEKS			##	Konverterer reelle og imaginære koefficienter til et komplekst tal
-CONVERT			= KONVERTER			##	Konverterer et tal fra én måleenhed til en anden
-DEC2BIN			= DEC.TIL.BIN			##	Konverterer et decimaltal til et binært tal
-DEC2HEX			= DEC.TIL.HEX			##	Konverterer et decimaltal til et heksadecimalt tal
-DEC2OCT			= DEC.TIL.OKT			##	Konverterer et decimaltal til et oktaltal
-DELTA			= DELTA				##	Tester, om to værdier er ens
-ERF			= FEJLFUNK			##	Returner fejlfunktionen
-ERFC			= FEJLFUNK.KOMP			##	Returnerer den komplementære fejlfunktion
-GESTEP			= GETRIN			##	Tester, om et tal er større end en grænseværdi
-HEX2BIN			= HEX.TIL.BIN			##	Konverterer et heksadecimalt tal til et binært tal
-HEX2DEC			= HEX.TIL.DEC			##	Konverterer et decimaltal til et heksadecimalt tal
-HEX2OCT			= HEX.TIL.OKT			##	Konverterer et heksadecimalt tal til et oktaltal
-IMABS			= IMAGABS			##	Returnerer den absolutte værdi (modulus) for et komplekst tal
-IMAGINARY		= IMAGINÆR			##	Returnerer den imaginære koefficient for et komplekst tal
-IMARGUMENT		= IMAGARGUMENT			##	Returnerer argumentet theta, en vinkel udtrykt i radianer
-IMCONJUGATE		= IMAGKONJUGERE			##	Returnerer den komplekse konjugation af et komplekst tal
-IMCOS			= IMAGCOS			##	Returnerer et komplekst tals cosinus
-IMDIV			= IMAGDIV			##	Returnerer kvotienten for to komplekse tal
-IMEXP			= IMAGEKSP			##	Returnerer et komplekst tals eksponentialfunktion
-IMLN			= IMAGLN			##	Returnerer et komplekst tals naturlige logaritme
-IMLOG10			= IMAGLOG10			##	Returnerer et komplekst tals sædvanlige logaritme (titalslogaritme)
-IMLOG2			= IMAGLOG2			##	Returnerer et komplekst tals sædvanlige logaritme (totalslogaritme)
-IMPOWER			= IMAGPOTENS			##	Returnerer et komplekst tal opløftet i en heltalspotens
-IMPRODUCT		= IMAGPRODUKT			##	Returnerer produktet af komplekse tal
-IMREAL			= IMAGREELT			##	Returnerer den reelle koefficient for et komplekst tal
-IMSIN			= IMAGSIN			##	Returnerer et komplekst tals sinus
-IMSQRT			= IMAGKVROD			##	Returnerer et komplekst tals kvadratrod
-IMSUB			= IMAGSUB			##	Returnerer forskellen mellem to komplekse tal
-IMSUM			= IMAGSUM			##	Returnerer summen af komplekse tal
-OCT2BIN			= OKT.TIL.BIN			##	Konverterer et oktaltal til et binært tal
-OCT2DEC			= OKT.TIL.DEC			##	Konverterer et oktaltal til et decimaltal
-OCT2HEX			= OKT.TIL.HEX			##	Konverterer et oktaltal til et heksadecimalt tal
-
+ACCRINT = PÅLØBRENTE
+ACCRINTM = PÅLØBRENTE.UDLØB
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPONDAGE.SA
+COUPDAYS = KUPONDAGE.A
+COUPDAYSNC = KUPONDAGE.ANK
+COUPNCD = KUPONDAG.NÆSTE
+COUPNUM = KUPONBETALINGER
+COUPPCD = KUPONDAG.FORRIGE
+CUMIPMT = AKKUM.RENTE
+CUMPRINC = AKKUM.HOVEDSTOL
+DB = DB
+DDB = DSA
+DISC = DISKONTO
+DOLLARDE = KR.DECIMAL
+DOLLARFR = KR.BRØK
+DURATION = VARIGHED
+EFFECT = EFFEKTIV.RENTE
+FV = FV
+FVSCHEDULE = FVTABEL
+INTRATE = RENTEFOD
+IPMT = R.YDELSE
+IRR = IA
+ISPMT = ISPMT
+MDURATION = MVARIGHED
+MIRR = MIA
+NOMINAL = NOMINEL
+NPER = NPER
+NPV = NUTIDSVÆRDI
+ODDFPRICE = ULIGE.KURS.PÅLYDENDE
+ODDFYIELD = ULIGE.FØRSTE.AFKAST
+ODDLPRICE = ULIGE.SIDSTE.KURS
+ODDLYIELD = ULIGE.SIDSTE.AFKAST
+PDURATION = PVARIGHED
+PMT = YDELSE
+PPMT = H.YDELSE
+PRICE = KURS
+PRICEDISC = KURS.DISKONTO
+PRICEMAT = KURS.UDLØB
+PV = NV
+RATE = RENTE
+RECEIVED = MODTAGET.VED.UDLØB
+RRI = RRI
+SLN = LA
+SYD = ÅRSAFSKRIVNING
+TBILLEQ = STATSOBLIGATION
+TBILLPRICE = STATSOBLIGATION.KURS
+TBILLYIELD = STATSOBLIGATION.AFKAST
+VDB = VSA
+XIRR = INTERN.RENTE
+XNPV = NETTO.NUTIDSVÆRDI
+YIELD = AFKAST
+YIELDDISC = AFKAST.DISKONTO
+YIELDMAT = AFKAST.UDLØBSDATO
 
 ##
-##	Financial functions				Finansielle funktioner
+## Informationsfunktioner (Information Functions)
 ##
-ACCRINT			= PÅLØBRENTE			##	Returnerer den påløbne rente for et værdipapir med periodiske renteudbetalinger
-ACCRINTM		= PÅLØBRENTE.UDLØB		##	Returnerer den påløbne rente for et værdipapir, hvor renteudbetalingen finder sted ved papirets udløb
-AMORDEGRC		= AMORDEGRC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode ved hjælp af en afskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode
-COUPDAYBS		= KUPONDAGE.SA			##	Returnerer antallet af dage fra starten af kuponperioden til afregningsdatoen
-COUPDAYS		= KUPONDAGE.A			##	Returnerer antallet af dage fra begyndelsen af kuponperioden til afregningsdatoen
-COUPDAYSNC		= KUPONDAGE.ANK			##	Returnerer antallet af dage i den kuponperiode, der indeholder afregningsdatoen
-COUPNCD			= KUPONDAG.NÆSTE		##	Returnerer den næste kupondato efter afregningsdatoen
-COUPNUM			= KUPONBETALINGER		##	Returnerer antallet af kuponudbetalinger mellem afregnings- og udløbsdatoen
-COUPPCD			= KUPONDAG.FORRIGE		##	Returnerer den forrige kupondato før afregningsdatoen
-CUMIPMT			= AKKUM.RENTE			##	Returnerer den akkumulerede rente, der betales på et lån mellem to perioder
-CUMPRINC		= AKKUM.HOVEDSTOL		##	Returnerer den akkumulerede nedbringelse af hovedstol mellem to perioder
-DB			= DB				##	Returnerer afskrivningen på et aktiv i en angivet periode ved anvendelse af saldometoden
-DDB			= DSA				##	Returnerer afskrivningsbeløbet for et aktiv over en bestemt periode ved anvendelse af dobbeltsaldometoden eller en anden afskrivningsmetode, som du angiver
-DISC			= DISKONTO			##	Returnerer et værdipapirs diskonto
-DOLLARDE		= KR.DECIMAL			##	Konverterer en kronepris udtrykt som brøk til en kronepris udtrykt som decimaltal
-DOLLARFR		= KR.BRØK			##	Konverterer en kronepris udtrykt som decimaltal til en kronepris udtrykt som brøk
-DURATION		= VARIGHED			##	Returnerer den årlige løbetid for et værdipapir med periodiske renteudbetalinger
-EFFECT			= EFFEKTIV.RENTE		##	Returnerer den årlige effektive rente
-FV			= FV				##	Returnerer fremtidsværdien af en investering
-FVSCHEDULE		= FVTABEL			##	Returnerer den fremtidige værdi af en hovedstol, når der er tilskrevet rente og rentes rente efter forskellige rentesatser
-INTRATE			= RENTEFOD			##	Returnerer renten på et fuldt ud investeret værdipapir
-IPMT			= R.YDELSE			##	Returnerer renten fra en investering for en given periode
-IRR			= IA				##	Returnerer den interne rente for en række pengestrømme
-ISPMT			= ISPMT				##	Beregner den betalte rente i løbet af en bestemt investeringsperiode
-MDURATION		= MVARIGHED			##	Returnerer Macauleys modificerede løbetid for et værdipapir med en formodet pari på kr. 100
-MIRR			= MIA				##	Returnerer den interne forrentning, hvor positive og negative pengestrømme finansieres til forskellig rente
-NOMINAL			= NOMINEL			##	Returnerer den årlige nominelle rente
-NPER			= NPER				##	Returnerer antallet af perioder for en investering
-NPV			= NUTIDSVÆRDI			##	Returnerer nettonutidsværdien for en investering baseret på en række periodiske pengestrømme og en diskonteringssats
-ODDFPRICE		= ULIGE.KURS.PÅLYDENDE		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med en ulige (kort eller lang) første periode
-ODDFYIELD		= ULIGE.FØRSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige første periode
-ODDLPRICE		= ULIGE.SIDSTE.KURS		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med ulige sidste periode
-ODDLYIELD		= ULIGE.SIDSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige sidste periode
-PMT			= YDELSE			##	Returnerer renten fra en investering for en given periode
-PPMT			= H.YDELSE			##	Returnerer ydelsen på hovedstolen for en investering i en given periode
-PRICE			= KURS				##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir med periodiske renteudbetalinger
-PRICEDISC		= KURS.DISKONTO			##	Returnerer kursen pr. kr 100 nominel værdi for et diskonteret værdipapir
-PRICEMAT		= KURS.UDLØB			##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir, hvor renten udbetales ved papirets udløb
-PV			= NV				##	Returnerer den nuværende værdi af en investering
-RATE			= RENTE				##	Returnerer renten i hver periode for en annuitet
-RECEIVED		= MODTAGET.VED.UDLØB		##	Returnerer det beløb, der modtages ved udløbet af et fuldt ud investeret værdipapir
-SLN			= LA				##	Returnerer den lineære afskrivning for et aktiv i en enkelt periode
-SYD			= ÅRSAFSKRIVNING		##	Returnerer den årlige afskrivning på et aktiv i en bestemt periode
-TBILLEQ			= STATSOBLIGATION		##	Returnerer det obligationsækvivalente afkast for en statsobligation
-TBILLPRICE		= STATSOBLIGATION.KURS		##	Returnerer kursen pr. kr 100 nominel værdi for en statsobligation
-TBILLYIELD		= STATSOBLIGATION.AFKAST	##	Returnerer en afkastet på en statsobligation
-VDB			= VSA				##	Returnerer afskrivningen på et aktiv i en angivet periode, herunder delperioder, ved brug af dobbeltsaldometoden
-XIRR			= INTERN.RENTE			##	Returnerer den interne rente for en plan over pengestrømme, der ikke behøver at være periodiske
-XNPV			= NETTO.NUTIDSVÆRDI		##	Returnerer nutidsværdien for en plan over pengestrømme, der ikke behøver at være periodiske
-YIELD			= AFKAST			##	Returnerer afkastet for et værdipapir med periodiske renteudbetalinger
-YIELDDISC		= AFKAST.DISKONTO		##	Returnerer det årlige afkast for et diskonteret værdipapir, f.eks. en statsobligation
-YIELDMAT		= AFKAST.UDLØBSDATO		##	Returnerer det årlige afkast for et værdipapir, hvor renten udbetales ved papirets udløb
-
+CELL = CELLE
+ERROR.TYPE = FEJLTYPE
+INFO = INFO
+ISBLANK = ER.TOM
+ISERR = ER.FJL
+ISERROR = ER.FEJL
+ISEVEN = ER.LIGE
+ISFORMULA = ER.FORMEL
+ISLOGICAL = ER.LOGISK
+ISNA = ER.IKKE.TILGÆNGELIG
+ISNONTEXT = ER.IKKE.TEKST
+ISNUMBER = ER.TAL
+ISODD = ER.ULIGE
+ISREF = ER.REFERENCE
+ISTEXT = ER.TEKST
+N = TAL
+NA = IKKE.TILGÆNGELIG
+SHEET = ARK
+SHEETS = ARK.FLERE
+TYPE = VÆRDITYPE
 
 ##
-##	Information functions				Informationsfunktioner
+## Logiske funktioner (Logical Functions)
 ##
-CELL			= CELLE				##	Returnerer oplysninger om formatering, placering eller indhold af en celle
-ERROR.TYPE		= FEJLTYPE			##	Returnerer et tal, der svarer til en fejltype
-INFO			= INFO				##	Returnerer oplysninger om det aktuelle operativmiljø
-ISBLANK			= ER.TOM			##	Returnerer SAND, hvis værdien er tom
-ISERR			= ER.FJL			##	Returnerer SAND, hvis værdien er en fejlværdi undtagen #I/T
-ISERROR			= ER.FEJL			##	Returnerer SAND, hvis værdien er en fejlværdi
-ISEVEN			= ER.LIGE			##	Returnerer SAND, hvis tallet er lige
-ISLOGICAL		= ER.LOGISK			##	Returnerer SAND, hvis værdien er en logisk værdi
-ISNA			= ER.IKKE.TILGÆNGELIG		##	Returnerer SAND, hvis værdien er fejlværdien #I/T
-ISNONTEXT		= ER.IKKE.TEKST			##	Returnerer SAND, hvis værdien ikke er tekst
-ISNUMBER		= ER.TAL			##	Returnerer SAND, hvis værdien er et tal
-ISODD			= ER.ULIGE			##	Returnerer SAND, hvis tallet er ulige
-ISREF			= ER.REFERENCE			##	Returnerer SAND, hvis værdien er en reference
-ISTEXT			= ER.TEKST			##	Returnerer SAND, hvis værdien er tekst
-N			= TAL				##	Returnerer en værdi konverteret til et tal
-NA			= IKKE.TILGÆNGELIG		##	Returnerer fejlværdien #I/T
-TYPE			= VÆRDITYPE			##	Returnerer et tal, der angiver datatypen for en værdi
-
+AND = OG
+FALSE = FALSK
+IF = HVIS
+IFERROR = HVIS.FEJL
+IFNA = HVISIT
+IFS = HVISER
+NOT = IKKE
+OR = ELLER
+SWITCH = SKIFT
+TRUE = SAND
+XOR = XELLER
 
 ##
-##	Logical functions				Logiske funktioner
+## Opslags- og referencefunktioner (Lookup & Reference Functions)
 ##
-AND			= OG				##	Returnerer SAND, hvis alle argumenterne er sande
-FALSE			= FALSK				##	Returnerer den logiske værdi FALSK
-IF			= HVIS				##	Angiver en logisk test, der skal udføres
-IFERROR			= HVIS.FEJL			##	Returnerer en værdi, du angiver, hvis en formel evauleres som en fejl. Returnerer i modsat fald resultatet af formlen
-NOT			= IKKE				##	Vender argumentets logik om
-OR			= ELLER				##	Returneret værdien SAND, hvis mindst ét argument er sandt
-TRUE			= SAND				##	Returnerer den logiske værdi SAND
-
+ADDRESS = ADRESSE
+AREAS = OMRÅDER
+CHOOSE = VÆLG
+COLUMN = KOLONNE
+COLUMNS = KOLONNER
+FORMULATEXT = FORMELTEKST
+GETPIVOTDATA = GETPIVOTDATA
+HLOOKUP = VOPSLAG
+HYPERLINK = HYPERLINK
+INDEX = INDEKS
+INDIRECT = INDIREKTE
+LOOKUP = SLÅ.OP
+MATCH = SAMMENLIGN
+OFFSET = FORSKYDNING
+ROW = RÆKKE
+ROWS = RÆKKER
+RTD = RTD
+TRANSPOSE = TRANSPONER
+VLOOKUP = LOPSLAG
+*RC = RK
 
 ##
-##	Lookup and reference functions			Opslags- og referencefunktioner
+## Matematiske og trigonometriske funktioner (Math & Trig Functions)
 ##
-ADDRESS			= ADRESSE			##	Returnerer en reference som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER			##	Returnerer antallet af områder i en reference
-CHOOSE			= VÆLG				##	Vælger en værdi på en liste med værdier
-COLUMN			= KOLONNE			##	Returnerer kolonnenummeret i en reference
-COLUMNS			= KOLONNER			##	Returnerer antallet af kolonner i en reference
-HLOOKUP			= VOPSLAG			##	Søger i den øverste række af en matrix og returnerer værdien af den angivne celle
-HYPERLINK		= HYPERLINK			##	Opretter en genvej kaldet et hyperlink, der åbner et dokument, som er lagret på en netværksserver, på et intranet eller på internettet
-INDEX			= INDEKS			##	Anvender et indeks til at vælge en værdi fra en reference eller en matrix
-INDIRECT		= INDIREKTE			##	Returnerer en reference, der er angivet af en tekstværdi
-LOOKUP			= SLÅ.OP			##	Søger værdier i en vektor eller en matrix
-MATCH			= SAMMENLIGN			##	Søger værdier i en reference eller en matrix
-OFFSET			= FORSKYDNING			##	Returnerer en reference forskudt i forhold til en given reference
-ROW			= RÆKKE				##	Returnerer rækkenummeret for en reference
-ROWS			= RÆKKER			##	Returnerer antallet af rækker i en reference
-RTD			= RTD				##	Henter realtidsdata fra et program, der understøtter COM-automatisering (Automation: En metode til at arbejde med objekter fra et andet program eller udviklingsværktøj. Automation, som tidligere blev kaldt OLE Automation, er en industristandard og en funktion i COM (Component Object Model).)
-TRANSPOSE		= TRANSPONER			##	Returnerer en transponeret matrix
-VLOOKUP			= LOPSLAG			##	Søger i øverste række af en matrix og flytter på tværs af rækken for at returnere en celleværdi
-
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = SAMLING
+ARABIC = ARABISK
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = BASIS
+CEILING.MATH = LOFT.MAT
+CEILING.PRECISE = LOFT.PRECISE
+COMBIN = KOMBIN
+COMBINA = KOMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.LOFT
+EVEN = LIGE
+EXP = EKSP
+FACT = FAKULTET
+FACTDOUBLE = DOBBELT.FAKULTET
+FLOOR.MATH = AFRUND.BUND.MAT
+FLOOR.PRECISE = AFRUND.GULV.PRECISE
+GCD = STØRSTE.FÆLLES.DIVISOR
+INT = HELTAL
+ISO.CEILING = ISO.LOFT
+LCM = MINDSTE.FÆLLES.MULTIPLUM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERT
+MMULT = MPRODUKT
+MOD = REST
+MROUND = MAFRUND
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MENHED
+ODD = ULIGE
+PI = PI
+POWER = POTENS
+PRODUCT = PRODUKT
+QUOTIENT = KVOTIENT
+RADIANS = RADIANER
+RAND = SLUMP
+RANDBETWEEN = SLUMPMELLEM
+ROMAN = ROMERTAL
+ROUND = AFRUND
+ROUNDBAHTDOWN = RUNDBAHTNED
+ROUNDBAHTUP = RUNDBAHTOP
+ROUNDDOWN = RUND.NED
+ROUNDUP = RUND.OP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERIESUM
+SIGN = FORTEGN
+SIN = SIN
+SINH = SINH
+SQRT = KVROD
+SQRTPI = KVRODPI
+SUBTOTAL = SUBTOTAL
+SUM = SUM
+SUMIF = SUM.HVIS
+SUMIFS = SUM.HVISER
+SUMPRODUCT = SUMPRODUKT
+SUMSQ = SUMKV
+SUMX2MY2 = SUMX2MY2
+SUMX2PY2 = SUMX2PY2
+SUMXMY2 = SUMXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AFKORT
 
 ##
-##	Math and trigonometry functions			Matematiske og trigonometriske funktioner
+## Statistiske funktioner (Statistical Functions)
 ##
-ABS			= ABS				##	Returnerer den absolutte værdi af et tal
-ACOS			= ARCCOS			##	Returnerer et tals arcus cosinus
-ACOSH			= ARCCOSH			##	Returnerer den inverse hyperbolske cosinus af tal
-ASIN			= ARCSIN			##	Returnerer et tals arcus sinus
-ASINH			= ARCSINH			##	Returnerer den inverse hyperbolske sinus for tal
-ATAN			= ARCTAN			##	Returnerer et tals arcus tangens
-ATAN2			= ARCTAN2			##	Returnerer de angivne x- og y-koordinaters arcus tangens
-ATANH			= ARCTANH			##	Returnerer et tals inverse hyperbolske tangens
-CEILING			= AFRUND.LOFT			##	Afrunder et tal til nærmeste heltal eller til nærmeste multiplum af betydning
-COMBIN			= KOMBIN			##	Returnerer antallet af kombinationer for et givet antal objekter
-COS			= COS				##	Returnerer et tals cosinus
-COSH			= COSH				##	Returnerer den inverse hyperbolske cosinus af et tal
-DEGREES			= GRADER			##	Konverterer radianer til grader
-EVEN			= LIGE				##	Runder et tal op til nærmeste lige heltal
-EXP			= EKSP				##	Returnerer e opløftet til en potens af et angivet tal
-FACT			= FAKULTET			##	Returnerer et tals fakultet
-FACTDOUBLE		= DOBBELT.FAKULTET		##	Returnerer et tals dobbelte fakultet
-FLOOR			= AFRUND.GULV			##	Runder et tal ned mod nul
-GCD			= STØRSTE.FÆLLES.DIVISOR	##	Returnerer den største fælles divisor
-INT			= HELTAL			##	Nedrunder et tal til det nærmeste heltal
-LCM			= MINDSTE.FÆLLES.MULTIPLUM	##	Returnerer det mindste fælles multiplum
-LN			= LN				##	Returnerer et tals naturlige logaritme
-LOG			= LOG				##	Returnerer logaritmen for et tal på grundlag af et angivet grundtal
-LOG10			= LOG10				##	Returnerer titalslogaritmen af et tal
-MDETERM			= MDETERM			##	Returnerer determinanten for en matrix
-MINVERSE		= MINVERT			##	Returnerer den inverse matrix for en matrix
-MMULT			= MPRODUKT			##	Returnerer matrixproduktet af to matrixer
-MOD			= REST				##	Returnerer restværdien fra division
-MROUND			= MAFRUND			##	Returnerer et tal afrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMIAL			##	Returnerer et multinomialt talsæt
-ODD			= ULIGE				##	Runder et tal op til nærmeste ulige heltal
-PI			= PI				##	Returnerer værdien af pi
-POWER			= POTENS			##	Returnerer resultatet af et tal opløftet til en potens
-PRODUCT			= PRODUKT			##	Multiplicerer argumenterne
-QUOTIENT		= KVOTIENT			##	Returnerer heltalsdelen ved division
-RADIANS			= RADIANER			##	Konverterer grader til radianer
-RAND			= SLUMP				##	Returnerer et tilfældigt tal mellem 0 og 1
-RANDBETWEEN		= SLUMP.MELLEM			##	Returnerer et tilfældigt tal mellem de tal, der angives
-ROMAN			= ROMERTAL			##	Konverterer et arabertal til romertal som tekst
-ROUND			= AFRUND			##	Afrunder et tal til et angivet antal decimaler
-ROUNDDOWN		= RUND.NED			##	Runder et tal ned mod nul
-ROUNDUP			= RUND.OP			##	Runder et tal op, væk fra 0 (nul)
-SERIESSUM		= SERIESUM			##	Returnerer summen af en potensserie baseret på en formel
-SIGN			= FORTEGN			##	Returnerer et tals fortegn
-SIN			= SIN				##	Returnerer en given vinkels sinusværdi
-SINH			= SINH				##	Returnerer den hyperbolske sinus af et tal
-SQRT			= KVROD				##	Returnerer en positiv kvadratrod
-SQRTPI			= KVRODPI			##	Returnerer kvadratroden af (tal * pi;)
-SUBTOTAL		= SUBTOTAL			##	Returnerer en subtotal på en liste eller i en database
-SUM			= SUM				##	Lægger argumenterne sammen
-SUMIF			= SUM.HVIS			##	Lægger de celler sammen, der er specificeret af et givet kriterium.
-SUMIFS			= SUM.HVISER			##	Lægger de celler i et område sammen, der opfylder flere kriterier.
-SUMPRODUCT		= SUMPRODUKT			##	Returnerer summen af produkter af ens matrixkomponenter
-SUMSQ			= SUMKV				##	Returnerer summen af argumenternes kvadrater
-SUMX2MY2		= SUMX2MY2			##	Returnerer summen af differensen mellem kvadrater af ens værdier i to matrixer
-SUMX2PY2		= SUMX2PY2			##	Returnerer summen af summen af kvadrater af tilsvarende værdier i to matrixer
-SUMXMY2			= SUMXMY2			##	Returnerer summen af kvadrater af differenser mellem ens værdier i to matrixer
-TAN			= TAN				##	Returnerer et tals tangens
-TANH			= TANH				##	Returnerer et tals hyperbolske tangens
-TRUNC			= AFKORT			##	Afkorter et tal til et heltal
-
+AVEDEV = MAD
+AVERAGE = MIDDEL
+AVERAGEA = MIDDELV
+AVERAGEIF = MIDDEL.HVIS
+AVERAGEIFS = MIDDEL.HVISER
+BETA.DIST = BETA.FORDELING
+BETA.INV = BETA.INV
+BINOM.DIST = BINOMIAL.FORDELING
+BINOM.DIST.RANGE = BINOMIAL.DIST.INTERVAL
+BINOM.INV = BINOMIAL.INV
+CHISQ.DIST = CHI2.FORDELING
+CHISQ.DIST.RT = CHI2.FORD.RT
+CHISQ.INV = CHI2.INV
+CHISQ.INV.RT = CHI2.INV.RT
+CHISQ.TEST = CHI2.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENST
+CORREL = KORRELATION
+COUNT = TÆL
+COUNTA = TÆLV
+COUNTBLANK = ANTAL.BLANKE
+COUNTIF = TÆL.HVIS
+COUNTIFS = TÆL.HVISER
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = SAK
+EXPON.DIST = EKSP.FORDELING
+F.DIST = F.FORDELING
+F.DIST.RT = F.FORDELING.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SÆSONUDSVING
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEÆR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FORDELING
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRECISE
+GAUSS = GAUSS
+GEOMEAN = GEOMIDDELVÆRDI
+GROWTH = FORØGELSE
+HARMEAN = HARMIDDELVÆRDI
+HYPGEOM.DIST = HYPGEO.FORDELING
+INTERCEPT = SKÆRING
+KURT = TOPSTEJL
+LARGE = STØRSTE
+LINEST = LINREGR
+LOGEST = LOGREGR
+LOGNORM.DIST = LOGNORM.FORDELING
+LOGNORM.INV = LOGNORM.INV
+MAX = MAKS
+MAXA = MAKSV
+MAXIFS = MAKSHVISER
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINV
+MINIFS = MINHVISER
+MODE.MULT = HYPPIGST.FLERE
+MODE.SNGL = HYPPIGST.ENKELT
+NEGBINOM.DIST = NEGBINOM.FORDELING
+NORM.DIST = NORMAL.FORDELING
+NORM.INV = NORM.INV
+NORM.S.DIST = STANDARD.NORM.FORDELING
+NORM.S.INV = STANDARD.NORM.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = FRAKTIL.UDELAD
+PERCENTILE.INC = FRAKTIL.MEDTAG
+PERCENTRANK.EXC = PROCENTPLADS.UDELAD
+PERCENTRANK.INC = PROCENTPLADS.MEDTAG
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.FORDELING
+PROB = SANDSYNLIGHED
+QUARTILE.EXC = KVARTIL.UDELAD
+QUARTILE.INC = KVARTIL.MEDTAG
+RANK.AVG = PLADS.GNSN
+RANK.EQ = PLADS.LIGE
+RSQ = FORKLARINGSGRAD
+SKEW = SKÆVHED
+SKEW.P = SKÆVHED.P
+SLOPE = STIGNING
+SMALL = MINDSTE
+STANDARDIZE = STANDARDISER
+STDEV.P = STDAFV.P
+STDEV.S = STDAFV.S
+STDEVA = STDAFVV
+STDEVPA = STDAFVPV
+STEYX = STFYX
+T.DIST = T.FORDELING
+T.DIST.2T = T.FORDELING.2T
+T.DIST.RT = T.FORDELING.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TENDENS
+TRIMMEAN = TRIMMIDDELVÆRDI
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARIANSV
+VARPA = VARIANSPV
+WEIBULL.DIST = WEIBULL.FORDELING
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions				Statistiske funktioner
+## Tekstfunktioner (Text Functions)
 ##
-AVEDEV			= MAD				##	Returnerer den gennemsnitlige numeriske afvigelse fra stikprøvens middelværdi
-AVERAGE			= MIDDEL			##	Returnerer middelværdien af argumenterne
-AVERAGEA		= MIDDELV			##	Returnerer middelværdien af argumenterne og medtager tal, tekst og logiske værdier
-AVERAGEIF		= MIDDEL.HVIS			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder et givet kriterium, i et område
-AVERAGEIFS		= MIDDEL.HVISER			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder flere kriterier.
-BETADIST		= BETAFORDELING			##	Returnerer den kumulative betafordelingsfunktion
-BETAINV			= BETAINV			##	Returnerer den inverse kumulative fordelingsfunktion for en angivet betafordeling
-BINOMDIST		= BINOMIALFORDELING		##	Returnerer punktsandsynligheden for binomialfordelingen
-CHIDIST			= CHIFORDELING			##	Returnerer fraktilsandsynligheden for en chi2-fordeling
-CHIINV			= CHIINV			##	Returnerer den inverse fraktilsandsynlighed for en chi2-fordeling
-CHITEST			= CHITEST			##	Foretager en test for uafhængighed
-CONFIDENCE		= KONFIDENSINTERVAL		##	Returnerer et konfidensinterval for en population
-CORREL			= KORRELATION			##	Returnerer korrelationskoefficienten mellem to datasæt
-COUNT			= TÆL				##	Tæller antallet af tal på en liste med argumenter
-COUNTA			= TÆLV				##	Tæller antallet af værdier på en liste med argumenter
-COUNTBLANK		= ANTAL.BLANKE			##	Tæller antallet af tomme celler i et område
-COUNTIF			= TÆLHVIS			##	Tæller antallet af celler, som opfylder de givne kriterier, i et område
-COUNTIFS		= TÆL.HVISER			##	Tæller antallet af de celler, som opfylder flere kriterier, i et område
-COVAR			= KOVARIANS			##	Beregner kovariansen mellem to stokastiske variabler
-CRITBINOM		= KRITBINOM			##	Returnerer den mindste værdi for x, for hvilken det gælder, at fordelingsfunktionen er mindre end eller lig med kriterieværdien.
-DEVSQ			= SAK				##	Returnerer summen af de kvadrerede afvigelser fra middelværdien
-EXPONDIST		= EKSPFORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING			##	Returnerer fraktilsandsynligheden for F-fordelingen
-FINV			= FINV				##	Returnerer den inverse fraktilsandsynlighed for F-fordelingen
-FISHER			= FISHER			##	Returnerer Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerer den inverse Fisher-transformation
-FORECAST		= PROGNOSE			##	Returnerer en prognoseværdi baseret på lineær tendens
-FREQUENCY		= FREKVENS			##	Returnerer en frekvensfordeling i en søjlevektor
-FTEST			= FTEST				##	Returnerer resultatet af en F-test til sammenligning af varians
-GAMMADIST		= GAMMAFORDELING		##	Returnerer fordelingsfunktionen for gammafordelingen
-GAMMAINV		= GAMMAINV			##	Returnerer den inverse fordelingsfunktion for gammafordelingen
-GAMMALN			= GAMMALN			##	Returnerer den naturlige logaritme til gammafordelingen, G(x)
-GEOMEAN			= GEOMIDDELVÆRDI		##	Returnerer det geometriske gennemsnit
-GROWTH			= FORØGELSE			##	Returnerer værdier langs en eksponentiel tendens
-HARMEAN			= HARMIDDELVÆRDI		##	Returnerer det harmoniske gennemsnit
-HYPGEOMDIST		= HYPGEOFORDELING		##	Returnerer punktsandsynligheden i en hypergeometrisk fordeling
-INTERCEPT		= SKÆRING			##	Returnerer afskæringsværdien på y-aksen i en lineær regression
-KURT			= TOPSTEJL			##	Returnerer kurtosisværdien for en stokastisk variabel
-LARGE			= STOR				##	Returnerer den k'te største værdi i et datasæt
-LINEST			= LINREGR			##	Returnerer parameterestimaterne for en lineær tendens
-LOGEST			= LOGREGR			##	Returnerer parameterestimaterne for en eksponentiel tendens
-LOGINV			= LOGINV			##	Returnerer den inverse fordelingsfunktion for lognormalfordelingen
-LOGNORMDIST		= LOGNORMFORDELING		##	Returnerer fordelingsfunktionen for lognormalfordelingen
-MAX			= MAKS				##	Returnerer den maksimale værdi på en liste med argumenter.
-MAXA			= MAKSV				##	Returnerer den maksimale værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MEDIAN			= MEDIAN			##	Returnerer medianen for de angivne tal
-MIN			= MIN				##	Returnerer den mindste værdi på en liste med argumenter.
-MINA			= MINV				##	Returnerer den mindste værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MODE			= HYPPIGST			##	Returnerer den hyppigste værdi i et datasæt
-NEGBINOMDIST		= NEGBINOMFORDELING		##	Returnerer den negative binomialfordeling
-NORMDIST		= NORMFORDELING			##	Returnerer fordelingsfunktionen for normalfordelingen
-NORMINV			= NORMINV			##	Returnerer den inverse fordelingsfunktion for normalfordelingen
-NORMSDIST		= STANDARDNORMFORDELING		##	Returnerer fordelingsfunktionen for standardnormalfordelingen
-NORMSINV		= STANDARDNORMINV		##	Returnerer den inverse fordelingsfunktion for standardnormalfordelingen
-PEARSON			= PEARSON			##	Returnerer Pearsons korrelationskoefficient
-PERCENTILE		= FRAKTIL			##	Returnerer den k'te fraktil for datasættet
-PERCENTRANK		= PROCENTPLADS			##	Returnerer den procentuelle rang for en given værdi i et datasæt
-PERMUT			= PERMUT			##	Returnerer antallet af permutationer for et givet sæt objekter
-POISSON			= POISSON			##	Returnerer fordelingsfunktionen for en Poisson-fordeling
-PROB			= SANDSYNLIGHED			##	Returnerer intervalsandsynligheden
-QUARTILE		= KVARTIL			##	Returnerer kvartilen i et givet datasæt
-RANK			= PLADS				##	Returnerer rangen for et tal på en liste med tal
-RSQ			= FORKLARINGSGRAD		##	Returnerer R2-værdien fra en simpel lineær regression
-SKEW			= SKÆVHED			##	Returnerer skævheden for en stokastisk variabel
-SLOPE			= HÆLDNING			##	Returnerer estimatet på hældningen fra en simpel lineær regression
-SMALL			= MINDSTE			##	Returnerer den k'te mindste værdi i datasættet
-STANDARDIZE		= STANDARDISER			##	Returnerer en standardiseret værdi
-STDEV			= STDAFV			##	Estimerer standardafvigelsen på basis af en stikprøve
-STDEVA			= STDAFVV			##	Beregner standardafvigelsen på basis af en prøve og medtager tal, tekst og logiske værdier
-STDEVP			= STDAFVP			##	Beregner standardafvigelsen på basis af en hel population
-STDEVPA			= STDAFVPV			##	Beregner standardafvigelsen på basis af en hel population og medtager tal, tekst og logiske værdier
-STEYX			= STFYX				##	Returnerer standardafvigelsen for de estimerede y-værdier i den simple lineære regression
-TDIST			= TFORDELING			##	Returnerer fordelingsfunktionen for Student's t-fordeling
-TINV			= TINV				##	Returnerer den inverse fordelingsfunktion for Student's t-fordeling
-TREND			= TENDENS			##	Returnerer værdi under antagelse af en lineær tendens
-TRIMMEAN		= TRIMMIDDELVÆRDI		##	Returnerer den trimmede middelværdi for datasættet
-TTEST			= TTEST				##	Returnerer den sandsynlighed, der er forbundet med Student's t-test
-VAR			= VARIANS			##	Beregner variansen på basis af en prøve
-VARA			= VARIANSV			##	Beregner variansen på basis af en prøve og medtager tal, tekst og logiske værdier
-VARP			= VARIANSP			##	Beregner variansen på basis af hele populationen
-VARPA			= VARIANSPV			##	Beregner variansen på basis af hele populationen og medtager tal, tekst og logiske værdier
-WEIBULL			= WEIBULL			##	Returnerer fordelingsfunktionen for Weibull-fordelingen
-ZTEST			= ZTEST				##	Returnerer sandsynlighedsværdien ved en en-sidet z-test
-
+BAHTTEXT = BAHTTEKST
+CHAR = TEGN
+CLEAN = RENS
+CODE = KODE
+CONCAT = CONCAT
+DOLLAR = KR
+EXACT = EKSAKT
+FIND = FIND
+FIXED = FAST
+ISTHAIDIGIT = ERTHAILANDSKCIFFER
+LEFT = VENSTRE
+LEN = LÆNGDE
+LOWER = SMÅ.BOGSTAVER
+MID = MIDT
+NUMBERSTRING = TALSTRENG
+NUMBERVALUE = TALVÆRDI
+PHONETIC = FONETISK
+PROPER = STORT.FORBOGSTAV
+REPLACE = ERSTAT
+REPT = GENTAG
+RIGHT = HØJRE
+SEARCH = SØG
+SUBSTITUTE = UDSKIFT
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.KOMBINER
+THAIDIGIT = THAILANDSKCIFFER
+THAINUMSOUND = THAILANDSKNUMLYD
+THAINUMSTRING = THAILANDSKNUMSTRENG
+THAISTRINGLENGTH = THAILANDSKSTRENGLÆNGDE
+TRIM = FJERN.OVERFLØDIGE.BLANKE
+UNICHAR = UNICHAR
+UNICODE = UNICODE
+UPPER = STORE.BOGSTAVER
+VALUE = VÆRDI
 
 ##
-##	Text functions					Tekstfunktioner
+## Webfunktioner (Web Functions)
 ##
-ASC			= ASC				##	Ændrer engelske tegn i fuld bredde (dobbelt-byte) eller katakana i en tegnstreng til tegn i halv bredde (enkelt-byte)
-BAHTTEXT		= BAHTTEKST			##	Konverterer et tal til tekst ved hjælp af valutaformatet ß (baht)
-CHAR			= TEGN				##	Returnerer det tegn, der svarer til kodenummeret
-CLEAN			= RENS				##	Fjerner alle tegn, der ikke kan udskrives, fra tekst
-CODE			= KODE				##	Returnerer en numerisk kode for det første tegn i en tekststreng
-CONCATENATE		= SAMMENKÆDNING			##	Sammenkæder adskillige tekstelementer til ét tekstelement
-DOLLAR			= KR				##	Konverterer et tal til tekst ved hjælp af valutaformatet kr. (kroner)
-EXACT			= EKSAKT			##	Kontrollerer, om to tekstværdier er identiske
-FIND			= FIND				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FINDB			= FINDB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FIXED			= FAST				##	Formaterer et tal som tekst med et fast antal decimaler
-JIS			= JIS				##	Ændrer engelske tegn i halv bredde (enkelt-byte) eller katakana i en tegnstreng til tegn i fuld bredde (dobbelt-byte)
-LEFT			= VENSTRE			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEFTB			= VENSTREB			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEN			= LÆNGDE			##	Returnerer antallet af tegn i en tekststreng
-LENB			= LÆNGDEB			##	Returnerer antallet af tegn i en tekststreng
-LOWER			= SMÅ.BOGSTAVER			##	Konverterer tekst til små bogstaver
-MID			= MIDT				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-MIDB			= MIDTB				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-PHONETIC		= FONETISK			##	Uddrager de fonetiske (furigana) tegn fra en tekststreng
-PROPER			= STORT.FORBOGSTAV		##	Konverterer første bogstav i hvert ord i teksten til stort bogstav
-REPLACE			= ERSTAT			##	Erstatter tegn i tekst
-REPLACEB		= ERSTATB			##	Erstatter tegn i tekst
-REPT			= GENTAG			##	Gentager tekst et givet antal gange
-RIGHT			= HØJRE				##	Returnerer tegnet længste til højre i en tekstværdi
-RIGHTB			= HØJREB			##	Returnerer tegnet længste til højre i en tekstværdi
-SEARCH			= SØG				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SEARCHB			= SØGB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SUBSTITUTE		= UDSKIFT			##	Udskifter gammel tekst med ny tekst i en tekststreng
-T			= T				##	Konverterer argumenterne til tekst
-TEXT			= TEKST				##	Formaterer et tal og konverterer det til tekst
-TRIM			= FJERN.OVERFLØDIGE.BLANKE	##	Fjerner mellemrum fra tekst
-UPPER			= STORE.BOGSTAVER		##	Konverterer tekst til store bogstaver
-VALUE			= VÆRDI				##	Konverterer et tekstargument til et tal
+ENCODEURL = KODNINGSURL
+FILTERXML = FILTRERXML
+WEBSERVICE = WEBTJENESTE
+
+##
+## Kompatibilitetsfunktioner (Compatibility Functions)
+##
+BETADIST = BETAFORDELING
+BETAINV = BETAINV
+BINOMDIST = BINOMIALFORDELING
+CEILING = AFRUND.LOFT
+CHIDIST = CHIFORDELING
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = SAMMENKÆDNING
+CONFIDENCE = KONFIDENSINTERVAL
+COVAR = KOVARIANS
+CRITBINOM = KRITBINOM
+EXPONDIST = EKSPFORDELING
+FDIST = FFORDELING
+FINV = FINV
+FLOOR = AFRUND.GULV
+FORECAST = PROGNOSE
+FTEST = FTEST
+GAMMADIST = GAMMAFORDELING
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOFORDELING
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFORDELING
+MODE = HYPPIGST
+NEGBINOMDIST = NEGBINOMFORDELING
+NORMDIST = NORMFORDELING
+NORMINV = NORMINV
+NORMSDIST = STANDARDNORMFORDELING
+NORMSINV = STANDARDNORMINV
+PERCENTILE = FRAKTIL
+PERCENTRANK = PROCENTPLADS
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = PLADS
+STDEV = STDAFV
+STDEVP = STDAFVP
+TDIST = TFORDELING
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config
index 9751c4b6b..4ca2b82b5 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Deutsch (German)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #WERT!
-REF	= #BEZUG!
-NAME	= #NAME?
-NUM	= #ZAHL!
-NA	= #NV
+NULL
+DIV0
+VALUE = #WERT!
+REF = #BEZUG!
+NAME
+NUM = #ZAHL!
+NA = #NV
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
index 01df42f64..d49fc5f1b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
@@ -1,416 +1,534 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Deutsch (German)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Add-In- und Automatisierungsfunktionen
+## Cubefunktionen (Cube Functions)
 ##
-GETPIVOTDATA	= PIVOTDATENZUORDNEN			##	In einem PivotTable-Bericht gespeicherte Daten werden zurückgegeben.
-
+CUBEKPIMEMBER = CUBEKPIELEMENT
+CUBEMEMBER = CUBEELEMENT
+CUBEMEMBERPROPERTY = CUBEELEMENTEIGENSCHAFT
+CUBERANKEDMEMBER = CUBERANGELEMENT
+CUBESET = CUBEMENGE
+CUBESETCOUNT = CUBEMENGENANZAHL
+CUBEVALUE = CUBEWERT
 
 ##
-##	Cube functions					Cubefunktionen
+## Datenbankfunktionen (Database Functions)
 ##
-CUBEKPIMEMBER		= CUBEKPIELEMENT		##	Gibt Name, Eigenschaft und Measure eines Key Performance Indicators (KPI) zurück und zeigt den Namen und die Eigenschaft in der Zelle an. Ein KPI ist ein quantifizierbares Maß, wie z. B. der monatliche Bruttogewinn oder die vierteljährliche Mitarbeiterfluktuation, mit dessen Hilfe das Leistungsverhalten eines Unternehmens überwacht werden kann.
-CUBEMEMBER		= CUBEELEMENT			##	Gibt ein Element oder ein Tuple in einer Cubehierarchie zurück. Wird verwendet, um zu überprüfen, ob das Element oder Tuple im Cube vorhanden ist.
-CUBEMEMBERPROPERTY	= CUBEELEMENTEIGENSCHAFT	##	Gibt den Wert einer Elementeigenschaft im Cube zurück. Wird verwendet, um zu überprüfen, ob ein Elementname im Cube vorhanden ist, und um die für dieses Element angegebene Eigenschaft zurückzugeben.
-CUBERANKEDMEMBER	= CUBERANGELEMENT		##	Gibt das n-te oder n-rangige Element in einer Menge zurück. Wird verwendet, um mindestens ein Element in einer Menge zurückzugeben, wie z. B. bester Vertriebsmitarbeiter oder 10 beste Kursteilnehmer.
-CUBESET			= CUBEMENGE			##	Definiert eine berechnete Menge Elemente oder Tuples durch Senden eines Mengenausdrucks an den Cube auf dem Server, der die Menge erstellt und an Microsoft Office Excel zurückgibt.
-CUBESETCOUNT		= CUBEMENGENANZAHL		##	Gibt die Anzahl der Elemente in einer Menge zurück.
-CUBEVALUE		= CUBEWERT			##	Gibt einen Aggregatwert aus einem Cube zurück.
-
+DAVERAGE = DBMITTELWERT
+DCOUNT = DBANZAHL
+DCOUNTA = DBANZAHL2
+DGET = DBAUSZUG
+DMAX = DBMAX
+DMIN = DBMIN
+DPRODUCT = DBPRODUKT
+DSTDEV = DBSTDABW
+DSTDEVP = DBSTDABWN
+DSUM = DBSUMME
+DVAR = DBVARIANZ
+DVARP = DBVARIANZEN
 
 ##
-##	Database functions				Datenbankfunktionen
+## Datums- und Uhrzeitfunktionen (Date & Time Functions)
 ##
-DAVERAGE		= DBMITTELWERT			##	Gibt den Mittelwert der ausgewählten Datenbankeinträge zurück
-DCOUNT			= DBANZAHL			##	Zählt die Zellen mit Zahlen in einer Datenbank
-DCOUNTA			= DBANZAHL2			##	Zählt nicht leere Zellen in einer Datenbank
-DGET			= DBAUSZUG			##	Extrahiert aus einer Datenbank einen einzelnen Datensatz, der den angegebenen Kriterien entspricht
-DMAX			= DBMAX				##	Gibt den größten Wert aus ausgewählten Datenbankeinträgen zurück
-DMIN			= DBMIN				##	Gibt den kleinsten Wert aus ausgewählten Datenbankeinträgen zurück
-DPRODUCT		= DBPRODUKT			##	Multipliziert die Werte in einem bestimmten Feld mit Datensätzen, die den Kriterien in einer Datenbank entsprechen
-DSTDEV			= DBSTDABW			##	Schätzt die Standardabweichung auf der Grundlage einer Stichprobe aus ausgewählten Datenbankeinträgen
-DSTDEVP			= DBSTDABWN			##	Berechnet die Standardabweichung auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-DSUM			= DBSUMME			##	Addiert die Zahlen in der Feldspalte mit Datensätzen in der Datenbank, die den Kriterien entsprechen
-DVAR			= DBVARIANZ			##	Schätzt die Varianz auf der Grundlage ausgewählter Datenbankeinträge
-DVARP			= DBVARIANZEN			##	Berechnet die Varianz auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-
+DATE = DATUM
+DATEVALUE = DATWERT
+DAY = TAG
+DAYS = TAGE
+DAYS360 = TAGE360
+EDATE = EDATUM
+EOMONTH = MONATSENDE
+HOUR = STUNDE
+ISOWEEKNUM = ISOKALENDERWOCHE
+MINUTE = MINUTE
+MONTH = MONAT
+NETWORKDAYS = NETTOARBEITSTAGE
+NETWORKDAYS.INTL = NETTOARBEITSTAGE.INTL
+NOW = JETZT
+SECOND = SEKUNDE
+THAIDAYOFWEEK = THAIWOCHENTAG
+THAIMONTHOFYEAR = THAIMONATDESJAHRES
+THAIYEAR = THAIJAHR
+TIME = ZEIT
+TIMEVALUE = ZEITWERT
+TODAY = HEUTE
+WEEKDAY = WOCHENTAG
+WEEKNUM = KALENDERWOCHE
+WORKDAY = ARBEITSTAG
+WORKDAY.INTL = ARBEITSTAG.INTL
+YEAR = JAHR
+YEARFRAC = BRTEILJAHRE
 
 ##
-##	Date and time functions				Datums- und Zeitfunktionen
+## Technische Funktionen (Engineering Functions)
 ##
-DATE			= DATUM				##	Gibt die fortlaufende Zahl eines bestimmten Datums zurück
-DATEVALUE		= DATWERT			##	Wandelt ein Datum in Form von Text in eine fortlaufende Zahl um
-DAY			= TAG				##	Wandelt eine fortlaufende Zahl in den Tag des Monats um
-DAYS360			= TAGE360			##	Berechnet die Anzahl der Tage zwischen zwei Datumsangaben ausgehend von einem Jahr, das 360 Tage hat
-EDATE			= EDATUM			##	Gibt die fortlaufende Zahl des Datums zurück, bei dem es sich um die angegebene Anzahl von Monaten vor oder nach dem Anfangstermin handelt
-EOMONTH			= MONATSENDE			##	Gibt die fortlaufende Zahl des letzten Tags des Monats vor oder nach einer festgelegten Anzahl von Monaten zurück
-HOUR			= STUNDE			##	Wandelt eine fortlaufende Zahl in eine Stunde um
-MINUTE			= MINUTE			##	Wandelt eine fortlaufende Zahl in eine Minute um
-MONTH			= MONAT				##	Wandelt eine fortlaufende Zahl in einen Monat um
-NETWORKDAYS		= NETTOARBEITSTAGE		##	Gibt die Anzahl von ganzen Arbeitstagen zwischen zwei Datumswerten zurück
-NOW			= JETZT				##	Gibt die fortlaufende Zahl des aktuellen Datums und der aktuellen Uhrzeit zurück
-SECOND			= SEKUNDE			##	Wandelt eine fortlaufende Zahl in eine Sekunde um
-TIME			= ZEIT				##	Gibt die fortlaufende Zahl einer bestimmten Uhrzeit zurück
-TIMEVALUE		= ZEITWERT			##	Wandelt eine Uhrzeit in Form von Text in eine fortlaufende Zahl um
-TODAY			= HEUTE				##	Gibt die fortlaufende Zahl des heutigen Datums zurück
-WEEKDAY			= WOCHENTAG			##	Wandelt eine fortlaufende Zahl in den Wochentag um
-WEEKNUM			= KALENDERWOCHE			##	Wandelt eine fortlaufende Zahl in eine Zahl um, die angibt, in welche Woche eines Jahres das angegebene Datum fällt
-WORKDAY			= ARBEITSTAG			##	Gibt die fortlaufende Zahl des Datums vor oder nach einer bestimmten Anzahl von Arbeitstagen zurück
-YEAR			= JAHR				##	Wandelt eine fortlaufende Zahl in ein Jahr um
-YEARFRAC		= BRTEILJAHRE			##	Gibt die Anzahl der ganzen Tage zwischen Ausgangsdatum und Enddatum in Bruchteilen von Jahren zurück
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BININDEZ
+BIN2HEX = BININHEX
+BIN2OCT = BININOKT
+BITAND = BITUND
+BITLSHIFT = BITLVERSCHIEB
+BITOR = BITODER
+BITRSHIFT = BITRVERSCHIEB
+BITXOR = BITXODER
+COMPLEX = KOMPLEXE
+CONVERT = UMWANDELN
+DEC2BIN = DEZINBIN
+DEC2HEX = DEZINHEX
+DEC2OCT = DEZINOKT
+DELTA = DELTA
+ERF = GAUSSFEHLER
+ERF.PRECISE = GAUSSF.GENAU
+ERFC = GAUSSFKOMPL
+ERFC.PRECISE = GAUSSFKOMPL.GENAU
+GESTEP = GGANZZAHL
+HEX2BIN = HEXINBIN
+HEX2DEC = HEXINDEZ
+HEX2OCT = HEXINOKT
+IMABS = IMABS
+IMAGINARY = IMAGINÄRTEIL
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGIERTE
+IMCOS = IMCOS
+IMCOSH = IMCOSHYP
+IMCOT = IMCOT
+IMCSC = IMCOSEC
+IMCSCH = IMCOSECHYP
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMAPOTENZ
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREALTEIL
+IMSEC = IMSEC
+IMSECH = IMSECHYP
+IMSIN = IMSIN
+IMSINH = IMSINHYP
+IMSQRT = IMWURZEL
+IMSUB = IMSUB
+IMSUM = IMSUMME
+IMTAN = IMTAN
+OCT2BIN = OKTINBIN
+OCT2DEC = OKTINDEZ
+OCT2HEX = OKTINHEX
 
 ##
-##	Engineering functions				Konstruktionsfunktionen
+## Finanzmathematische Funktionen (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Gibt die geänderte Besselfunktion In(x) zurück
-BESSELJ			= BESSELJ			##	Gibt die Besselfunktion Jn(x) zurück
-BESSELK			= BESSELK			##	Gibt die geänderte Besselfunktion Kn(x) zurück
-BESSELY			= BESSELY			##	Gibt die Besselfunktion Yn(x) zurück
-BIN2DEC			= BININDEZ			##	Wandelt eine binäre Zahl (Dualzahl) in eine dezimale Zahl um
-BIN2HEX			= BININHEX			##	Wandelt eine binäre Zahl (Dualzahl) in eine hexadezimale Zahl um
-BIN2OCT			= BININOKT			##	Wandelt eine binäre Zahl (Dualzahl) in eine oktale Zahl um
-COMPLEX			= KOMPLEXE			##	Wandelt den Real- und Imaginärteil in eine komplexe Zahl um
-CONVERT			= UMWANDELN			##	Wandelt eine Zahl von einem Maßsystem in ein anderes um
-DEC2BIN			= DEZINBIN			##	Wandelt eine dezimale Zahl in eine binäre Zahl (Dualzahl) um
-DEC2HEX			= DEZINHEX			##	Wandelt eine dezimale Zahl in eine hexadezimale Zahl um
-DEC2OCT			= DEZINOKT			##	Wandelt eine dezimale Zahl in eine oktale Zahl um
-DELTA			= DELTA				##	Überprüft, ob zwei Werte gleich sind
-ERF			= GAUSSFEHLER			##	Gibt die Gauss'sche Fehlerfunktion zurück
-ERFC			= GAUSSFKOMPL			##	Gibt das Komplement zur Gauss'schen Fehlerfunktion zurück
-GESTEP			= GGANZZAHL			##	Überprüft, ob eine Zahl größer als ein gegebener Schwellenwert ist
-HEX2BIN			= HEXINBIN			##	Wandelt eine hexadezimale Zahl in eine Binärzahl um
-HEX2DEC			= HEXINDEZ			##	Wandelt eine hexadezimale Zahl in eine dezimale Zahl um
-HEX2OCT			= HEXINOKT			##	Wandelt eine hexadezimale Zahl in eine Oktalzahl um
-IMABS			= IMABS				##	Gibt den Absolutbetrag (Modulo) einer komplexen Zahl zurück
-IMAGINARY		= IMAGINÄRTEIL			##	Gibt den Imaginärteil einer komplexen Zahl zurück
-IMARGUMENT		= IMARGUMENT			##	Gibt das Argument Theta zurück, einen Winkel, der als Bogenmaß ausgedrückt wird
-IMCONJUGATE		= IMKONJUGIERTE			##	Gibt die konjugierte komplexe Zahl zu einer komplexen Zahl zurück
-IMCOS			= IMCOS				##	Gibt den Kosinus einer komplexen Zahl zurück
-IMDIV			= IMDIV				##	Gibt den Quotienten zweier komplexer Zahlen zurück
-IMEXP			= IMEXP				##	Gibt die algebraische Form einer in exponentieller Schreibweise vorliegenden komplexen Zahl zurück
-IMLN			= IMLN				##	Gibt den natürlichen Logarithmus einer komplexen Zahl zurück
-IMLOG10			= IMLOG10			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 10 zurück
-IMLOG2			= IMLOG2			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 2 zurück
-IMPOWER			= IMAPOTENZ			##	Potenziert eine komplexe Zahl mit einer ganzen Zahl
-IMPRODUCT		= IMPRODUKT			##	Gibt das Produkt von komplexen Zahlen zurück
-IMREAL			= IMREALTEIL			##	Gibt den Realteil einer komplexen Zahl zurück
-IMSIN			= IMSIN				##	Gibt den Sinus einer komplexen Zahl zurück
-IMSQRT			= IMWURZEL			##	Gibt die Quadratwurzel einer komplexen Zahl zurück
-IMSUB			= IMSUB				##	Gibt die Differenz zwischen zwei komplexen Zahlen zurück
-IMSUM			= IMSUMME			##	Gibt die Summe von komplexen Zahlen zurück
-OCT2BIN			= OKTINBIN			##	Wandelt eine oktale Zahl in eine binäre Zahl (Dualzahl) um
-OCT2DEC			= OKTINDEZ			##	Wandelt eine oktale Zahl in eine dezimale Zahl um
-OCT2HEX			= OKTINHEX			##	Wandelt eine oktale Zahl in eine hexadezimale Zahl um
-
+ACCRINT = AUFGELZINS
+ACCRINTM = AUFGELZINSF
+AMORDEGRC = AMORDEGRK
+AMORLINC = AMORLINEARK
+COUPDAYBS = ZINSTERMTAGVA
+COUPDAYS = ZINSTERMTAGE
+COUPDAYSNC = ZINSTERMTAGNZ
+COUPNCD = ZINSTERMNZ
+COUPNUM = ZINSTERMZAHL
+COUPPCD = ZINSTERMVZ
+CUMIPMT = KUMZINSZ
+CUMPRINC = KUMKAPITAL
+DB = GDA2
+DDB = GDA
+DISC = DISAGIO
+DOLLARDE = NOTIERUNGDEZ
+DOLLARFR = NOTIERUNGBRU
+DURATION = DURATION
+EFFECT = EFFEKTIV
+FV = ZW
+FVSCHEDULE = ZW2
+INTRATE = ZINSSATZ
+IPMT = ZINSZ
+IRR = IKV
+ISPMT = ISPMT
+MDURATION = MDURATION
+MIRR = QIKV
+NOMINAL = NOMINAL
+NPER = ZZR
+NPV = NBW
+ODDFPRICE = UNREGER.KURS
+ODDFYIELD = UNREGER.REND
+ODDLPRICE = UNREGLE.KURS
+ODDLYIELD = UNREGLE.REND
+PDURATION = PDURATION
+PMT = RMZ
+PPMT = KAPZ
+PRICE = KURS
+PRICEDISC = KURSDISAGIO
+PRICEMAT = KURSFÄLLIG
+PV = BW
+RATE = ZINS
+RECEIVED = AUSZAHLUNG
+RRI = ZSATZINVEST
+SLN = LIA
+SYD = DIA
+TBILLEQ = TBILLÄQUIV
+TBILLPRICE = TBILLKURS
+TBILLYIELD = TBILLRENDITE
+VDB = VDB
+XIRR = XINTZINSFUSS
+XNPV = XKAPITALWERT
+YIELD = RENDITE
+YIELDDISC = RENDITEDIS
+YIELDMAT = RENDITEFÄLL
 
 ##
-##	Financial functions				Finanzmathematische Funktionen
+## Informationsfunktionen (Information Functions)
 ##
-ACCRINT			= AUFGELZINS			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers mit periodischen Zinszahlungen zurück
-ACCRINTM		= AUFGELZINSF			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers zurück, die bei Fälligkeit ausgezahlt werden
-AMORDEGRC		= AMORDEGRK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume mithilfe eines Abschreibungskoeffizienten zurück
-AMORLINC		= AMORLINEARK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume zurück
-COUPDAYBS		= ZINSTERMTAGVA			##	Gibt die Anzahl der Tage vom Anfang des Zinstermins bis zum Abrechnungstermin zurück
-COUPDAYS		= ZINSTERMTAGE			##	Gibt die Anzahl der Tage der Zinsperiode zurück, die den Abrechnungstermin einschließt
-COUPDAYSNC		= ZINSTERMTAGNZ			##	Gibt die Anzahl der Tage vom Abrechnungstermin bis zum nächsten Zinstermin zurück
-COUPNCD			= ZINSTERMNZ			##	Gibt das Datum des ersten Zinstermins nach dem Abrechnungstermin zurück
-COUPNUM			= ZINSTERMZAHL			##	Gibt die Anzahl der Zinstermine zwischen Abrechnungs- und Fälligkeitsdatum zurück
-COUPPCD			= ZINSTERMVZ			##	Gibt das Datum des letzten Zinstermins vor dem Abrechnungstermin zurück
-CUMIPMT			= KUMZINSZ			##	Berechnet die kumulierten Zinsen, die zwischen zwei Perioden zu zahlen sind
-CUMPRINC		= KUMKAPITAL			##	Berechnet die aufgelaufene Tilgung eines Darlehens, die zwischen zwei Perioden zu zahlen ist
-DB			= GDA2				##	Gibt die geometrisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-DDB			= GDA				##	Gibt die Abschreibung eines Anlageguts für einen angegebenen Zeitraum unter Verwendung der degressiven Doppelraten-Abschreibung oder eines anderen von Ihnen angegebenen Abschreibungsverfahrens zurück
-DISC			= DISAGIO			##	Gibt den in Prozent ausgedrückten Abzinsungssatz eines Wertpapiers zurück
-DOLLARDE		= NOTIERUNGDEZ			##	Wandelt eine Notierung, die als Dezimalbruch ausgedrückt wurde, in eine Dezimalzahl um
-DOLLARFR		= NOTIERUNGBRU			##	Wandelt eine Notierung, die als Dezimalzahl ausgedrückt wurde, in einen Dezimalbruch um
-DURATION		= DURATION			##	Gibt die jährliche Duration eines Wertpapiers mit periodischen Zinszahlungen zurück
-EFFECT			= EFFEKTIV			##	Gibt die jährliche Effektivverzinsung zurück
-FV			= ZW				##	Gibt den zukünftigen Wert (Endwert) einer Investition zurück
-FVSCHEDULE		= ZW2				##	Gibt den aufgezinsten Wert des Anfangskapitals für eine Reihe periodisch unterschiedlicher Zinssätze zurück
-INTRATE			= ZINSSATZ			##	Gibt den Zinssatz eines voll investierten Wertpapiers zurück
-IPMT			= ZINSZ				##	Gibt die Zinszahlung einer Investition für die angegebene Periode zurück
-IRR			= IKV				##	Gibt den internen Zinsfuß einer Investition ohne Finanzierungskosten oder Reinvestitionsgewinne zurück
-ISPMT			= ISPMT				##	Berechnet die während eines bestimmten Zeitraums für eine Investition gezahlten Zinsen
-MDURATION		= MDURATION			##	Gibt die geänderte Dauer für ein Wertpapier mit einem angenommenen Nennwert von 100 € zurück
-MIRR			= QIKV				##	Gibt den internen Zinsfuß zurück, wobei positive und negative Zahlungen zu unterschiedlichen Sätzen finanziert werden
-NOMINAL			= NOMINAL			##	Gibt die jährliche Nominalverzinsung zurück
-NPER			= ZZR				##	Gibt die Anzahl der Zahlungsperioden einer Investition zurück
-NPV			= NBW				##	Gibt den Nettobarwert einer Investition auf Basis periodisch anfallender Zahlungen und eines Abzinsungsfaktors zurück
-ODDFPRICE		= UNREGER.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDFYIELD		= UNREGER.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDLPRICE		= UNREGLE.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-ODDLYIELD		= UNREGLE.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-PMT			= RMZ				##	Gibt die periodische Zahlung für eine Annuität zurück
-PPMT			= KAPZ				##	Gibt die Kapitalrückzahlung einer Investition für eine angegebene Periode zurück
-PRICE			= KURS				##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-PRICEDISC		= KURSDISAGIO			##	Gibt den Kurs pro 100 € Nennwert eines unverzinslichen Wertpapiers zurück
-PRICEMAT		= KURSFÄLLIG			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-PV			= BW				##	Gibt den Barwert einer Investition zurück
-RATE			= ZINS				##	Gibt den Zinssatz pro Zeitraum einer Annuität zurück
-RECEIVED		= AUSZAHLUNG			##	Gibt den Auszahlungsbetrag eines voll investierten Wertpapiers am Fälligkeitstermin zurück
-SLN			= LIA				##	Gibt die lineare Abschreibung eines Wirtschaftsguts pro Periode zurück
-SYD			= DIA				##	Gibt die arithmetisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-TBILLEQ			= TBILLÄQUIV			##	Gibt die Rendite für ein Wertpapier zurück
-TBILLPRICE		= TBILLKURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück
-TBILLYIELD		= TBILLRENDITE			##	Gibt die Rendite für ein Wertpapier zurück
-VDB			= VDB				##	Gibt die degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode oder Teilperiode zurück
-XIRR			= XINTZINSFUSS			##	Gibt den internen Zinsfuß einer Reihe nicht periodisch anfallender Zahlungen zurück
-XNPV			= XKAPITALWERT			##	Gibt den Nettobarwert (Kapitalwert) einer Reihe nicht periodisch anfallender Zahlungen zurück
-YIELD			= RENDITE			##	Gibt die Rendite eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-YIELDDISC		= RENDITEDIS			##	Gibt die jährliche Rendite eines unverzinslichen Wertpapiers zurück
-YIELDMAT		= RENDITEFÄLL			##	Gibt die jährliche Rendite eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-
+CELL = ZELLE
+ERROR.TYPE = FEHLER.TYP
+INFO = INFO
+ISBLANK = ISTLEER
+ISERR = ISTFEHL
+ISERROR = ISTFEHLER
+ISEVEN = ISTGERADE
+ISFORMULA = ISTFORMEL
+ISLOGICAL = ISTLOG
+ISNA = ISTNV
+ISNONTEXT = ISTKTEXT
+ISNUMBER = ISTZAHL
+ISODD = ISTUNGERADE
+ISREF = ISTBEZUG
+ISTEXT = ISTTEXT
+N = N
+NA = NV
+SHEET = BLATT
+SHEETS = BLÄTTER
+TYPE = TYP
 
 ##
-##	Information functions				Informationsfunktionen
+## Logische Funktionen (Logical Functions)
 ##
-CELL			= ZELLE				##	Gibt Informationen zu Formatierung, Position oder Inhalt einer Zelle zurück
-ERROR.TYPE		= FEHLER.TYP			##	Gibt eine Zahl zurück, die einem Fehlertyp entspricht
-INFO			= INFO				##	Gibt Informationen zur aktuellen Betriebssystemumgebung zurück
-ISBLANK			= ISTLEER			##	Gibt WAHR zurück, wenn der Wert leer ist
-ISERR			= ISTFEHL			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert außer #N/V ist
-ISERROR			= ISTFEHLER			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert ist
-ISEVEN			= ISTGERADE			##	Gibt WAHR zurück, wenn es sich um eine gerade Zahl handelt
-ISLOGICAL		= ISTLOG			##	Gibt WAHR zurück, wenn der Wert ein Wahrheitswert ist
-ISNA			= ISTNV				##	Gibt WAHR zurück, wenn der Wert der Fehlerwert #N/V ist
-ISNONTEXT		= ISTKTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das keinen Text enthält
-ISNUMBER		= ISTZAHL			##	Gibt WAHR zurück, wenn der Wert eine Zahl ist
-ISODD			= ISTUNGERADE			##	Gibt WAHR zurück, wenn es sich um eine ungerade Zahl handelt
-ISREF			= ISTBEZUG			##	Gibt WAHR zurück, wenn der Wert ein Bezug ist
-ISTEXT			= ISTTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das Text enthält
-N			= N				##	Gibt den in eine Zahl umgewandelten Wert zurück
-NA			= NV				##	Gibt den Fehlerwert #NV zurück
-TYPE			= TYP				##	Gibt eine Zahl zurück, die den Datentyp des angegebenen Werts anzeigt
-
+AND = UND
+FALSE = FALSCH
+IF = WENN
+IFERROR = WENNFEHLER
+IFNA = WENNNV
+IFS = WENNS
+NOT = NICHT
+OR = ODER
+SWITCH = ERSTERWERT
+TRUE = WAHR
+XOR = XODER
 
 ##
-##	Logical functions				Logische Funktionen
+## Nachschlage- und Verweisfunktionen (Lookup & Reference Functions)
 ##
-AND			= UND				##	Gibt WAHR zurück, wenn alle zugehörigen Argumente WAHR sind
-FALSE			= FALSCH			##	Gibt den Wahrheitswert FALSCH zurück
-IF			= WENN				##	Gibt einen logischen Test zum Ausführen an
-IFERROR			= WENNFEHLER			##	Gibt einen von Ihnen festgelegten Wert zurück, wenn die Auswertung der Formel zu einem Fehler führt; andernfalls wird das Ergebnis der Formel zurückgegeben
-NOT			= NICHT				##	Kehrt den Wahrheitswert der zugehörigen Argumente um
-OR			= ODER				##	Gibt WAHR zurück, wenn ein Argument WAHR ist
-TRUE			= WAHR				##	Gibt den Wahrheitswert WAHR zurück
-
+ADDRESS = ADRESSE
+AREAS = BEREICHE
+CHOOSE = WAHL
+COLUMN = SPALTE
+COLUMNS = SPALTEN
+FORMULATEXT = FORMELTEXT
+GETPIVOTDATA = PIVOTDATENZUORDNEN
+HLOOKUP = WVERWEIS
+HYPERLINK = HYPERLINK
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = VERWEIS
+MATCH = VERGLEICH
+OFFSET = BEREICH.VERSCHIEBEN
+ROW = ZEILE
+ROWS = ZEILEN
+RTD = RTD
+TRANSPOSE = MTRANS
+VLOOKUP = SVERWEIS
+*RC = ZS
 
 ##
-##	Lookup and reference functions			Nachschlage- und Verweisfunktionen
+## Mathematische und trigonometrische Funktionen (Math & Trig Functions)
 ##
-ADDRESS			= ADRESSE			##	Gibt einen Bezug auf eine einzelne Zelle in einem Tabellenblatt als Text zurück
-AREAS			= BEREICHE			##	Gibt die Anzahl der innerhalb eines Bezugs aufgeführten Bereiche zurück
-CHOOSE			= WAHL				##	Wählt einen Wert aus eine Liste mit Werten aus
-COLUMN			= SPALTE			##	Gibt die Spaltennummer eines Bezugs zurück
-COLUMNS			= SPALTEN			##	Gibt die Anzahl der Spalten in einem Bezug zurück
-HLOOKUP			= HVERWEIS			##	Sucht in der obersten Zeile einer Matrix und gibt den Wert der angegebenen Zelle zurück
-HYPERLINK		= HYPERLINK			##	Erstellt eine Verknüpfung, über die ein auf einem Netzwerkserver, in einem Intranet oder im Internet gespeichertes Dokument geöffnet wird
-INDEX			= INDEX				##	Verwendet einen Index, um einen Wert aus einem Bezug oder einer Matrix auszuwählen
-INDIRECT		= INDIREKT			##	Gibt einen Bezug zurück, der von einem Textwert angegeben wird
-LOOKUP			= LOOKUP			##	Sucht Werte in einem Vektor oder einer Matrix
-MATCH			= VERGLEICH			##	Sucht Werte in einem Bezug oder einer Matrix
-OFFSET			= BEREICH.VERSCHIEBEN		##	Gibt einen Bezugoffset aus einem gegebenen Bezug zurück
-ROW			= ZEILE				##	Gibt die Zeilennummer eines Bezugs zurück
-ROWS			= ZEILEN			##	Gibt die Anzahl der Zeilen in einem Bezug zurück
-RTD			= RTD				##	Ruft Echtzeitdaten von einem Programm ab, das die COM-Automatisierung (Automatisierung: Ein Verfahren, bei dem aus einer Anwendung oder einem Entwicklungstool heraus mit den Objekten einer anderen Anwendung gearbeitet wird. Die früher als OLE-Automatisierung bezeichnete Automatisierung ist ein Industriestandard und eine Funktion von COM (Component Object Model).) unterstützt
-TRANSPOSE		= MTRANS			##	Gibt die transponierte Matrix einer Matrix zurück
-VLOOKUP			= SVERWEIS			##	Sucht in der ersten Spalte einer Matrix und arbeitet sich durch die Zeile, um den Wert einer Zelle zurückzugeben
-
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSHYP
+ACOT = ARCCOT
+ACOTH = ARCCOTHYP
+AGGREGATE = AGGREGAT
+ARABIC = ARABISCH
+ASIN = ARCSIN
+ASINH = ARCSINHYP
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANHYP
+BASE = BASIS
+CEILING.MATH = OBERGRENZE.MATHEMATIK
+CEILING.PRECISE = OBERGRENZE.GENAU
+COMBIN = KOMBINATIONEN
+COMBINA = KOMBINATIONEN2
+COS = COS
+COSH = COSHYP
+COT = COT
+COTH = COTHYP
+CSC = COSEC
+CSCH = COSECHYP
+DECIMAL = DEZIMAL
+DEGREES = GRAD
+ECMA.CEILING = ECMA.OBERGRENZE
+EVEN = GERADE
+EXP = EXP
+FACT = FAKULTÄT
+FACTDOUBLE = ZWEIFAKULTÄT
+FLOOR.MATH = UNTERGRENZE.MATHEMATIK
+FLOOR.PRECISE = UNTERGRENZE.GENAU
+GCD = GGT
+INT = GANZZAHL
+ISO.CEILING = ISO.OBERGRENZE
+LCM = KGV
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDET
+MINVERSE = MINV
+MMULT = MMULT
+MOD = REST
+MROUND = VRUNDEN
+MULTINOMIAL = POLYNOMIAL
+MUNIT = MEINHEIT
+ODD = UNGERADE
+PI = PI
+POWER = POTENZ
+PRODUCT = PRODUKT
+QUOTIENT = QUOTIENT
+RADIANS = BOGENMASS
+RAND = ZUFALLSZAHL
+RANDBETWEEN = ZUFALLSBEREICH
+ROMAN = RÖMISCH
+ROUND = RUNDEN
+ROUNDBAHTDOWN = RUNDBAHTNED
+ROUNDBAHTUP = BAHTAUFRUNDEN
+ROUNDDOWN = ABRUNDEN
+ROUNDUP = AUFRUNDEN
+SEC = SEC
+SECH = SECHYP
+SERIESSUM = POTENZREIHE
+SIGN = VORZEICHEN
+SIN = SIN
+SINH = SINHYP
+SQRT = WURZEL
+SQRTPI = WURZELPI
+SUBTOTAL = TEILERGEBNIS
+SUM = SUMME
+SUMIF = SUMMEWENN
+SUMIFS = SUMMEWENNS
+SUMPRODUCT = SUMMENPRODUKT
+SUMSQ = QUADRATESUMME
+SUMX2MY2 = SUMMEX2MY2
+SUMX2PY2 = SUMMEX2PY2
+SUMXMY2 = SUMMEXMY2
+TAN = TAN
+TANH = TANHYP
+TRUNC = KÜRZEN
 
 ##
-##	Math and trigonometry functions			Mathematische und trigonometrische Funktionen
+## Statistische Funktionen (Statistical Functions)
 ##
-ABS			= ABS				##	Gibt den Absolutwert einer Zahl zurück
-ACOS			= ARCCOS			##	Gibt den Arkuskosinus einer Zahl zurück
-ACOSH			= ARCCOSHYP			##	Gibt den umgekehrten hyperbolischen Kosinus einer Zahl zurück
-ASIN			= ARCSIN			##	Gibt den Arkussinus einer Zahl zurück
-ASINH			= ARCSINHYP			##	Gibt den umgekehrten hyperbolischen Sinus einer Zahl zurück
-ATAN			= ARCTAN			##	Gibt den Arkustangens einer Zahl zurück
-ATAN2			= ARCTAN2			##	Gibt den Arkustangens einer x- und einer y-Koordinate zurück
-ATANH			= ARCTANHYP			##	Gibt den umgekehrten hyperbolischen Tangens einer Zahl zurück
-CEILING			= OBERGRENZE			##	Rundet eine Zahl auf die nächste ganze Zahl oder das nächste Vielfache von Schritt
-COMBIN			= KOMBINATIONEN			##	Gibt die Anzahl der Kombinationen für eine bestimmte Anzahl von Objekten zurück
-COS			= COS				##	Gibt den Kosinus einer Zahl zurück
-COSH			= COSHYP			##	Gibt den hyperbolischen Kosinus einer Zahl zurück
-DEGREES			= GRAD				##	Wandelt Bogenmaß (Radiant) in Grad um
-EVEN			= GERADE			##	Rundet eine Zahl auf die nächste gerade ganze Zahl auf
-EXP			= EXP				##	Potenziert die Basis e mit der als Argument angegebenen Zahl
-FACT			= FAKULTÄT			##	Gibt die Fakultät einer Zahl zurück
-FACTDOUBLE		= ZWEIFAKULTÄT			##	Gibt die Fakultät zu Zahl mit Schrittlänge 2 zurück
-FLOOR			= UNTERGRENZE			##	Rundet die Zahl auf Anzahl_Stellen ab
-GCD			= GGT				##	Gibt den größten gemeinsamen Teiler zurück
-INT			= GANZZAHL			##	Rundet eine Zahl auf die nächstkleinere ganze Zahl ab
-LCM			= KGV				##	Gibt das kleinste gemeinsame Vielfache zurück
-LN			= LN				##	Gibt den natürlichen Logarithmus einer Zahl zurück
-LOG			= LOG				##	Gibt den Logarithmus einer Zahl zu der angegebenen Basis zurück
-LOG10			= LOG10				##	Gibt den Logarithmus einer Zahl zur Basis 10 zurück
-MDETERM			= MDET				##	Gibt die Determinante einer Matrix zurück
-MINVERSE		= MINV				##	Gibt die inverse Matrix einer Matrix zurück
-MMULT			= MMULT				##	Gibt das Produkt zweier Matrizen zurück
-MOD			= REST				##	Gibt den Rest einer Division zurück
-MROUND			= VRUNDEN			##	Gibt eine auf das gewünschte Vielfache gerundete Zahl zurück
-MULTINOMIAL		= POLYNOMIAL			##	Gibt den Polynomialkoeffizienten einer Gruppe von Zahlen zurück
-ODD			= UNGERADE			##	Rundet eine Zahl auf die nächste ungerade ganze Zahl auf
-PI			= PI				##	Gibt den Wert Pi zurück
-POWER			= POTENZ			##	Gibt als Ergebnis eine potenzierte Zahl zurück
-PRODUCT			= PRODUKT			##	Multipliziert die zugehörigen Argumente
-QUOTIENT		= QUOTIENT			##	Gibt den ganzzahligen Anteil einer Division zurück
-RADIANS			= BOGENMASS			##	Wandelt Grad in Bogenmaß (Radiant) um
-RAND			= ZUFALLSZAHL			##	Gibt eine Zufallszahl zwischen 0 und 1 zurück
-RANDBETWEEN		= ZUFALLSBEREICH		##	Gibt eine Zufallszahl aus dem festgelegten Bereich zurück
-ROMAN			= RÖMISCH			##	Wandelt eine arabische Zahl in eine römische Zahl als Text um
-ROUND			= RUNDEN			##	Rundet eine Zahl auf eine bestimmte Anzahl von Dezimalstellen
-ROUNDDOWN		= ABRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen ab
-ROUNDUP			= AUFRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen auf
-SERIESSUM		= POTENZREIHE			##	Gibt die Summe von Potenzen (zur Berechnung von Potenzreihen und dichotomen Wahrscheinlichkeiten) zurück
-SIGN			= VORZEICHEN			##	Gibt das Vorzeichen einer Zahl zurück
-SIN			= SIN				##	Gibt den Sinus einer Zahl zurück
-SINH			= SINHYP			##	Gibt den hyperbolischen Sinus einer Zahl zurück
-SQRT			= WURZEL			##	Gibt die Quadratwurzel einer Zahl zurück
-SQRTPI			= WURZELPI			##	Gibt die Wurzel aus der mit Pi (pi) multiplizierten Zahl zurück
-SUBTOTAL		= TEILERGEBNIS			##	Gibt ein Teilergebnis in einer Liste oder Datenbank zurück
-SUM			= SUMME				##	Addiert die zugehörigen Argumente
-SUMIF			= SUMMEWENN			##	Addiert Zahlen, die mit den Suchkriterien übereinstimmen
-SUMIFS			= SUMMEWENNS			##	Die Zellen, die mehrere Kriterien erfüllen, werden in einem Bereich hinzugefügt
-SUMPRODUCT		= SUMMENPRODUKT			##	Gibt die Summe der Produkte zusammengehöriger Matrixkomponenten zurück
-SUMSQ			= QUADRATESUMME			##	Gibt die Summe der quadrierten Argumente zurück
-SUMX2MY2		= SUMMEX2MY2			##	Gibt die Summe der Differenzen der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMX2PY2		= SUMMEX2PY2			##	Gibt die Summe der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMXMY2			= SUMMEXMY2			##	Gibt die Summe der quadrierten Differenzen für zusammengehörige Komponenten zweier Matrizen zurück
-TAN			= TAN				##	Gibt den Tangens einer Zahl zurück
-TANH			= TANHYP			##	Gibt den hyperbolischen Tangens einer Zahl zurück
-TRUNC			= KÜRZEN			##	Schneidet die Kommastellen einer Zahl ab und gibt als Ergebnis eine ganze Zahl zurück
-
+AVEDEV = MITTELABW
+AVERAGE = MITTELWERT
+AVERAGEA = MITTELWERTA
+AVERAGEIF = MITTELWERTWENN
+AVERAGEIFS = MITTELWERTWENNS
+BETA.DIST = BETA.VERT
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.VERT
+BINOM.DIST.RANGE = BINOM.VERT.BEREICH
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHIQU.VERT
+CHISQ.DIST.RT = CHIQU.VERT.RE
+CHISQ.INV = CHIQU.INV
+CHISQ.INV.RT = CHIQU.INV.RE
+CHISQ.TEST = CHIQU.TEST
+CONFIDENCE.NORM = KONFIDENZ.NORM
+CONFIDENCE.T = KONFIDENZ.T
+CORREL = KORREL
+COUNT = ANZAHL
+COUNTA = ANZAHL2
+COUNTBLANK = ANZAHLLEEREZELLEN
+COUNTIF = ZÄHLENWENN
+COUNTIFS = ZÄHLENWENNS
+COVARIANCE.P = KOVARIANZ.P
+COVARIANCE.S = KOVARIANZ.S
+DEVSQ = SUMQUADABW
+EXPON.DIST = EXPON.VERT
+F.DIST = F.VERT
+F.DIST.RT = F.VERT.RE
+F.INV = F.INV
+F.INV.RT = F.INV.RE
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.KONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SAISONALITÄT
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEAR
+FREQUENCY = HÄUFIGKEIT
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.VERT
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.GENAU
+GAUSS = GAUSS
+GEOMEAN = GEOMITTEL
+GROWTH = VARIATION
+HARMEAN = HARMITTEL
+HYPGEOM.DIST = HYPGEOM.VERT
+INTERCEPT = ACHSENABSCHNITT
+KURT = KURT
+LARGE = KGRÖSSTE
+LINEST = RGP
+LOGEST = RKP
+LOGNORM.DIST = LOGNORM.VERT
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXWENNS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINWENNS
+MODE.MULT = MODUS.VIELF
+MODE.SNGL = MODUS.EINF
+NEGBINOM.DIST = NEGBINOM.VERT
+NORM.DIST = NORM.VERT
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.VERT
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = QUANTIL.EXKL
+PERCENTILE.INC = QUANTIL.INKL
+PERCENTRANK.EXC = QUANTILSRANG.EXKL
+PERCENTRANK.INC = QUANTILSRANG.INKL
+PERMUT = VARIATIONEN
+PERMUTATIONA = VARIATIONEN2
+PHI = PHI
+POISSON.DIST = POISSON.VERT
+PROB = WAHRSCHBEREICH
+QUARTILE.EXC = QUARTILE.EXKL
+QUARTILE.INC = QUARTILE.INKL
+RANK.AVG = RANG.MITTELW
+RANK.EQ = RANG.GLEICH
+RSQ = BESTIMMTHEITSMASS
+SKEW = SCHIEFE
+SKEW.P = SCHIEFE.P
+SLOPE = STEIGUNG
+SMALL = KKLEINSTE
+STANDARDIZE = STANDARDISIERUNG
+STDEV.P = STABW.N
+STDEV.S = STABW.S
+STDEVA = STABWA
+STDEVPA = STABWNA
+STEYX = STFEHLERYX
+T.DIST = T.VERT
+T.DIST.2T = T.VERT.2S
+T.DIST.RT = T.VERT.RE
+T.INV = T.INV
+T.INV.2T = T.INV.2S
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = GESTUTZTMITTEL
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARIANZA
+VARPA = VARIANZENA
+WEIBULL.DIST = WEIBULL.VERT
+Z.TEST = G.TEST
 
 ##
-##	Statistical functions				Statistische Funktionen
+## Textfunktionen (Text Functions)
 ##
-AVEDEV			= MITTELABW			##	Gibt die durchschnittliche absolute Abweichung einer Reihe von Merkmalsausprägungen und ihrem Mittelwert zurück
-AVERAGE			= MITTELWERT			##	Gibt den Mittelwert der zugehörigen Argumente zurück
-AVERAGEA		= MITTELWERTA			##	Gibt den Mittelwert der zugehörigen Argumente, die Zahlen, Text und Wahrheitswerte enthalten, zurück
-AVERAGEIF		= MITTELWERTWENN		##	Der Durchschnittswert (arithmetisches Mittel) für alle Zellen in einem Bereich, die einem angegebenen Kriterium entsprechen, wird zurückgegeben
-AVERAGEIFS		= MITTELWERTWENNS		##	Gibt den Durchschnittswert (arithmetisches Mittel) aller Zellen zurück, die mehreren Kriterien entsprechen
-BETADIST		= BETAVERT			##	Gibt die Werte der kumulierten Betaverteilungsfunktion zurück
-BETAINV			= BETAINV			##	Gibt das Quantil der angegebenen Betaverteilung zurück
-BINOMDIST		= BINOMVERT			##	Gibt Wahrscheinlichkeiten einer binomialverteilten Zufallsvariablen zurück
-CHIDIST			= CHIVERT			##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer Chi-Quadrat-verteilten Zufallsgröße zurück
-CHIINV			= CHIINV			##	Gibt Quantile der Verteilungsfunktion (1-Alpha) der Chi-Quadrat-Verteilung zurück
-CHITEST			= CHITEST			##	Gibt die Teststatistik eines Unabhängigkeitstests zurück
-CONFIDENCE		= KONFIDENZ			##	Ermöglicht die Berechnung des 1-Alpha Konfidenzintervalls für den Erwartungswert einer Zufallsvariablen
-CORREL			= KORREL			##	Gibt den Korrelationskoeffizienten zweier Reihen von Merkmalsausprägungen zurück
-COUNT			= ANZAHL			##	Gibt die Anzahl der Zahlen in der Liste mit Argumenten an
-COUNTA			= ANZAHL2			##	Gibt die Anzahl der Werte in der Liste mit Argumenten an
-COUNTBLANK		= ANZAHLLEEREZELLEN		##	Gibt die Anzahl der leeren Zellen in einem Bereich an
-COUNTIF			= ZÄHLENWENN			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit den Suchkriterien übereinstimmen
-COUNTIFS		= ZÄHLENWENNS			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit mehreren Suchkriterien übereinstimmen
-COVAR			= KOVAR				##	Gibt die Kovarianz zurück, den Mittelwert der für alle Datenpunktpaare gebildeten Produkte der Abweichungen
-CRITBINOM		= KRITBINOM			##	Gibt den kleinsten Wert zurück, für den die kumulierten Wahrscheinlichkeiten der Binomialverteilung kleiner oder gleich einer Grenzwahrscheinlichkeit sind
-DEVSQ			= SUMQUADABW			##	Gibt die Summe der quadrierten Abweichungen der Datenpunkte von ihrem Stichprobenmittelwert zurück
-EXPONDIST		= EXPONVERT			##	Gibt Wahrscheinlichkeiten einer exponential verteilten Zufallsvariablen zurück
-FDIST			= FVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer F-verteilten Zufallsvariablen zurück
-FINV			= FINV				##	Gibt Quantile der F-Verteilung zurück
-FISHER			= FISHER			##	Gibt die Fisher-Transformation zurück
-FISHERINV		= FISHERINV			##	Gibt die Umkehrung der Fisher-Transformation zurück
-FORECAST		= PROGNOSE			##	Gibt einen Wert zurück, der sich aus einem linearen Trend ergibt
-FREQUENCY		= HÄUFIGKEIT			##	Gibt eine Häufigkeitsverteilung als vertikale Matrix zurück
-FTEST			= FTEST				##	Gibt die Teststatistik eines F-Tests zurück
-GAMMADIST		= GAMMAVERT			##	Gibt Wahrscheinlichkeiten einer gammaverteilten Zufallsvariablen zurück
-GAMMAINV		= GAMMAINV			##	Gibt Quantile der Gammaverteilung zurück
-GAMMALN			= GAMMALN			##	Gibt den natürlichen Logarithmus der Gammafunktion zurück, Γ(x)
-GEOMEAN			= GEOMITTEL			##	Gibt das geometrische Mittel zurück
-GROWTH			= VARIATION			##	Gibt Werte zurück, die sich aus einem exponentiellen Trend ergeben
-HARMEAN			= HARMITTEL			##	Gibt das harmonische Mittel zurück
-HYPGEOMDIST		= HYPGEOMVERT			##	Gibt Wahrscheinlichkeiten einer hypergeometrisch-verteilten Zufallsvariablen zurück
-INTERCEPT		= ACHSENABSCHNITT		##	Gibt den Schnittpunkt der Regressionsgeraden zurück
-KURT			= KURT				##	Gibt die Kurtosis (Exzess) einer Datengruppe zurück
-LARGE			= KGRÖSSTE			##	Gibt den k-größten Wert einer Datengruppe zurück
-LINEST			= RGP				##	Gibt die Parameter eines linearen Trends zurück
-LOGEST			= RKP				##	Gibt die Parameter eines exponentiellen Trends zurück
-LOGINV			= LOGINV			##	Gibt Quantile der Lognormalverteilung zurück
-LOGNORMDIST		= LOGNORMVERT			##	Gibt Werte der Verteilungsfunktion einer lognormalverteilten Zufallsvariablen zurück
-MAX			= MAX				##	Gibt den Maximalwert einer Liste mit Argumenten zurück
-MAXA			= MAXA				##	Gibt den Maximalwert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MEDIAN			= MEDIAN			##	Gibt den Median der angegebenen Zahlen zurück
-MIN			= MIN				##	Gibt den Minimalwert einer Liste mit Argumenten zurück
-MINA			= MINA				##	Gibt den kleinsten Wert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MODE			= MODALWERT			##	Gibt den am häufigsten vorkommenden Wert in einer Datengruppe zurück
-NEGBINOMDIST		= NEGBINOMVERT			##	Gibt Wahrscheinlichkeiten einer negativen, binominal verteilten Zufallsvariablen zurück
-NORMDIST		= NORMVERT			##	Gibt Wahrscheinlichkeiten einer normal verteilten Zufallsvariablen zurück
-NORMINV			= NORMINV			##	Gibt Quantile der Normalverteilung zurück
-NORMSDIST		= STANDNORMVERT			##	Gibt Werte der Verteilungsfunktion einer standardnormalverteilten Zufallsvariablen zurück
-NORMSINV		= STANDNORMINV			##	Gibt Quantile der Standardnormalverteilung zurück
-PEARSON			= PEARSON			##	Gibt den Pearsonschen Korrelationskoeffizienten zurück
-PERCENTILE		= QUANTIL			##	Gibt das Alpha-Quantil einer Gruppe von Daten zurück
-PERCENTRANK		= QUANTILSRANG			##	Gibt den prozentualen Rang (Alpha) eines Werts in einer Datengruppe zurück
-PERMUT			= VARIATIONEN			##	Gibt die Anzahl der Möglichkeiten zurück, um k Elemente aus einer Menge von n Elementen ohne Zurücklegen zu ziehen
-POISSON			= POISSON			##	Gibt Wahrscheinlichkeiten einer poissonverteilten Zufallsvariablen zurück
-PROB			= WAHRSCHBEREICH		##	Gibt die Wahrscheinlichkeit für ein von zwei Werten eingeschlossenes Intervall zurück
-QUARTILE		= QUARTILE			##	Gibt die Quartile der Datengruppe zurück
-RANK			= RANG				##	Gibt den Rang zurück, den eine Zahl innerhalb einer Liste von Zahlen einnimmt
-RSQ			= BESTIMMTHEITSMASS		##	Gibt das Quadrat des Pearsonschen Korrelationskoeffizienten zurück
-SKEW			= SCHIEFE			##	Gibt die Schiefe einer Verteilung zurück
-SLOPE			= STEIGUNG			##	Gibt die Steigung der Regressionsgeraden zurück
-SMALL			= KKLEINSTE			##	Gibt den k-kleinsten Wert einer Datengruppe zurück
-STANDARDIZE		= STANDARDISIERUNG		##	Gibt den standardisierten Wert zurück
-STDEV			= STABW				##	Schätzt die Standardabweichung ausgehend von einer Stichprobe
-STDEVA			= STABWA			##	Schätzt die Standardabweichung ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-STDEVP			= STABWN			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit
-STDEVPA			= STABWNA			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-STEYX			= STFEHLERYX			##	Gibt den Standardfehler der geschätzten y-Werte für alle x-Werte der Regression zurück
-TDIST			= TVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer (Student) t-verteilten Zufallsvariablen zurück
-TINV			= TINV				##	Gibt Quantile der t-Verteilung zurück
-TREND			= TREND				##	Gibt Werte zurück, die sich aus einem linearen Trend ergeben
-TRIMMEAN		= GESTUTZTMITTEL		##	Gibt den Mittelwert einer Datengruppe zurück, ohne die Randwerte zu berücksichtigen
-TTEST			= TTEST				##	Gibt die Teststatistik eines Student'schen t-Tests zurück
-VAR			= VARIANZ			##	Schätzt die Varianz ausgehend von einer Stichprobe
-VARA			= VARIANZA			##	Schätzt die Varianz ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-VARP			= VARIANZEN			##	Berechnet die Varianz ausgehend von der Grundgesamtheit
-VARPA			= VARIANZENA			##	Berechnet die Varianz ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-WEIBULL			= WEIBULL			##	Gibt Wahrscheinlichkeiten einer weibullverteilten Zufallsvariablen zurück
-ZTEST			= GTEST				##	Gibt den einseitigen Wahrscheinlichkeitswert für einen Gausstest (Normalverteilung) zurück
-
+BAHTTEXT = BAHTTEXT
+CHAR = ZEICHEN
+CLEAN = SÄUBERN
+CODE = CODE
+CONCAT = TEXTKETTE
+DOLLAR = DM
+EXACT = IDENTISCH
+FIND = FINDEN
+FIXED = FEST
+ISTHAIDIGIT = ISTTHAIZAHLENWORT
+LEFT = LINKS
+LEN = LÄNGE
+LOWER = KLEIN
+MID = TEIL
+NUMBERVALUE = ZAHLENWERT
+PROPER = GROSS2
+REPLACE = ERSETZEN
+REPT = WIEDERHOLEN
+RIGHT = RECHTS
+SEARCH = SUCHEN
+SUBSTITUTE = WECHSELN
+T = T
+TEXT = TEXT
+TEXTJOIN = TEXTVERKETTEN
+THAIDIGIT = THAIZAHLENWORT
+THAINUMSOUND = THAIZAHLSOUND
+THAINUMSTRING = THAILANDSKNUMSTRENG
+THAISTRINGLENGTH = THAIZEICHENFOLGENLÄNGE
+TRIM = GLÄTTEN
+UNICHAR = UNIZEICHEN
+UNICODE = UNICODE
+UPPER = GROSS
+VALUE = WERT
 
 ##
-##	Text functions					Textfunktionen
+## Webfunktionen (Web Functions)
 ##
-ASC			= ASC				##	Konvertiert DB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in SB-Text
-BAHTTEXT		= BAHTTEXT			##	Wandelt eine Zahl in Text im Währungsformat ß (Baht) um
-CHAR			= ZEICHEN			##	Gibt das der Codezahl entsprechende Zeichen zurück
-CLEAN			= SÄUBERN			##	Löscht alle nicht druckbaren Zeichen aus einem Text
-CODE			= CODE				##	Gibt die Codezahl des ersten Zeichens in einem Text zurück
-CONCATENATE		= VERKETTEN			##	Verknüpft mehrere Textelemente zu einem Textelement
-DOLLAR			= DM				##	Wandelt eine Zahl in Text im Währungsformat € (Euro) um
-EXACT			= IDENTISCH			##	Prüft, ob zwei Textwerte identisch sind
-FIND			= FINDEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FINDB			= FINDENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FIXED			= FEST				##	Formatiert eine Zahl als Text mit einer festen Anzahl von Dezimalstellen
-JIS			= JIS				##	Konvertiert SB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in DB-Text
-LEFT			= LINKS				##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEFTB			= LINKSB			##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEN			= LÄNGE				##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LENB			= LÄNGEB			##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LOWER			= KLEIN				##	Wandelt Text in Kleinbuchstaben um
-MID			= TEIL				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-MIDB			= TEILB				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-PHONETIC		= PHONETIC			##	Extrahiert die phonetischen (Furigana-)Zeichen aus einer Textzeichenfolge
-PROPER			= GROSS2			##	Wandelt den ersten Buchstaben aller Wörter eines Textwerts in Großbuchstaben um
-REPLACE			= ERSETZEN			##	Ersetzt Zeichen in Text
-REPLACEB		= ERSETZENB			##	Ersetzt Zeichen in Text
-REPT			= WIEDERHOLEN			##	Wiederholt einen Text so oft wie angegeben
-RIGHT			= RECHTS			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-RIGHTB			= RECHTSB			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-SEARCH			= SUCHEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SEARCHB			= SUCHENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SUBSTITUTE		= WECHSELN			##	Ersetzt in einer Zeichenfolge neuen Text gegen alten
-T			= T				##	Wandelt die zugehörigen Argumente in Text um
-TEXT			= TEXT				##	Formatiert eine Zahl und wandelt sie in Text um
-TRIM			= GLÄTTEN			##	Entfernt Leerzeichen aus Text
-UPPER			= GROSS				##	Wandelt Text in Großbuchstaben um
-VALUE			= WERT				##	Wandelt ein Textargument in eine Zahl um
+ENCODEURL = URLCODIEREN
+FILTERXML = XMLFILTERN
+WEBSERVICE = WEBDIENST
+
+##
+## Kompatibilitätsfunktionen (Compatibility Functions)
+##
+BETADIST = BETAVERT
+BETAINV = BETAINV
+BINOMDIST = BINOMVERT
+CEILING = OBERGRENZE
+CHIDIST = CHIVERT
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = VERKETTEN
+CONFIDENCE = KONFIDENZ
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXPONVERT
+FDIST = FVERT
+FINV = FINV
+FLOOR = UNTERGRENZE
+FORECAST = SCHÄTZER
+FTEST = FTEST
+GAMMADIST = GAMMAVERT
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMVERT
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMVERT
+MODE = MODALWERT
+NEGBINOMDIST = NEGBINOMVERT
+NORMDIST = NORMVERT
+NORMINV = NORMINV
+NORMSDIST = STANDNORMVERT
+NORMSINV = STANDNORMINV
+PERCENTILE = QUANTIL
+PERCENTRANK = QUANTILSRANG
+POISSON = POISSON
+QUARTILE = QUARTILE
+RANK = RANG
+STDEV = STABW
+STDEVP = STABWN
+TDIST = TVERT
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANZ
+VARP = VARIANZEN
+WEIBULL = WEIBULL
+ZTEST = GTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config
index 5b9b9488d..fe044efaf 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Español (Spanish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= $	##	I'm surprised that the Excel Documentation suggests $ rather than €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #¡NULO!
-DIV0	= #¡DIV/0!
-VALUE	= #¡VALOR!
-REF	= #¡REF!
-NAME	= #¿NOMBRE?
-NUM	= #¡NÚM!
-NA	= #N/A
+NULL = #¡NULO!
+DIV0 = #¡DIV/0!
+VALUE = #¡VALOR!
+REF = #¡REF!
+NAME = #¿NOMBRE?
+NUM = #¡NUM!
+NA
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
index ac1ac86a5..88012aa12 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
@@ -1,416 +1,538 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Español (Spanish)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions				Funciones de complementos y automatización
+## Funciones de cubo (Cube Functions)
 ##
-GETPIVOTDATA		= IMPORTARDATOSDINAMICOS		##	Devuelve los datos almacenados en un informe de tabla dinámica.
-
+CUBEKPIMEMBER = MIEMBROKPICUBO
+CUBEMEMBER = MIEMBROCUBO
+CUBEMEMBERPROPERTY = PROPIEDADMIEMBROCUBO
+CUBERANKEDMEMBER = MIEMBRORANGOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = RECUENTOCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
 
 ##
-##	Cube functions						Funciones de cubo
+## Funciones de base de datos (Database Functions)
 ##
-CUBEKPIMEMBER		= MIEMBROKPICUBO			##	Devuelve un nombre, propiedad y medida de indicador de rendimiento clave (KPI) y muestra el nombre y la propiedad en la celda. Un KPI es una medida cuantificable, como los beneficios brutos mensuales o la facturación trimestral por empleado, que se usa para supervisar el rendimiento de una organización.
-CUBEMEMBER		= MIEMBROCUBO				##	Devuelve un miembro o tupla en una jerarquía de cubo. Se usa para validar la existencia del miembro o la tupla en el cubo.
-CUBEMEMBERPROPERTY	= PROPIEDADMIEMBROCUBO			##	Devuelve el valor de una propiedad de miembro del cubo Se usa para validar la existencia de un nombre de miembro en el cubo y para devolver la propiedad especificada para este miembro.
-CUBERANKEDMEMBER	= MIEMBRORANGOCUBO			##	Devuelve el miembro n, o clasificado, de un conjunto. Se usa para devolver uno o más elementos de un conjunto, por ejemplo, el representante con mejores ventas o los diez mejores alumnos.
-CUBESET			= CONJUNTOCUBO				##	Define un conjunto calculado de miembros o tuplas mediante el envío de una expresión de conjunto al cubo en el servidor, lo que crea el conjunto y, después, devuelve dicho conjunto a Microsoft Office Excel.
-CUBESETCOUNT		= RECUENTOCONJUNTOCUBO			##	Devuelve el número de elementos de un conjunto.
-CUBEVALUE		= VALORCUBO				##	Devuelve un valor agregado de un cubo.
-
+DAVERAGE = BDPROMEDIO
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTARA
+DGET = BDEXTRAER
+DMAX = BDMAX
+DMIN = BDMIN
+DPRODUCT = BDPRODUCTO
+DSTDEV = BDDESVEST
+DSTDEVP = BDDESVESTP
+DSUM = BDSUMA
+DVAR = BDVAR
+DVARP = BDVARP
 
 ##
-##	Database functions					Funciones de base de datos
+## Funciones de fecha y hora (Date & Time Functions)
 ##
-DAVERAGE		= BDPROMEDIO				##	Devuelve el promedio de las entradas seleccionadas en la base de datos.
-DCOUNT			= BDCONTAR				##	Cuenta el número de celdas que contienen números en una base de datos.
-DCOUNTA			= BDCONTARA				##	Cuenta el número de celdas no vacías en una base de datos.
-DGET			= BDEXTRAER				##	Extrae de una base de datos un único registro que cumple los criterios especificados.
-DMAX			= BDMAX					##	Devuelve el valor máximo de las entradas seleccionadas de la base de datos.
-DMIN			= BDMIN					##	Devuelve el valor mínimo de las entradas seleccionadas de la base de datos.
-DPRODUCT		= BDPRODUCTO				##	Multiplica los valores de un campo concreto de registros de una base de datos que cumplen los criterios especificados.
-DSTDEV			= BDDESVEST				##	Calcula la desviación estándar a partir de una muestra de entradas seleccionadas en la base de datos.
-DSTDEVP			= BDDESVESTP				##	Calcula la desviación estándar en función de la población total de las entradas seleccionadas de la base de datos.
-DSUM			= BDSUMA				##	Suma los números de la columna de campo de los registros de la base de datos que cumplen los criterios.
-DVAR			= BDVAR					##	Calcula la varianza a partir de una muestra de entradas seleccionadas de la base de datos.
-DVARP			= BDVARP				##	Calcula la varianza a partir de la población total de entradas seleccionadas de la base de datos.
-
+DATE = FECHA
+DATEDIF = SIFECHA
+DATESTRING = CADENA.FECHA
+DATEVALUE = FECHANUMERO
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = FECHA.MES
+EOMONTH = FIN.MES
+HOUR = HORA
+ISOWEEKNUM = ISO.NUM.DE.SEMANA
+MINUTE = MINUTO
+MONTH = MES
+NETWORKDAYS = DIAS.LAB
+NETWORKDAYS.INTL = DIAS.LAB.INTL
+NOW = AHORA
+SECOND = SEGUNDO
+THAIDAYOFWEEK = DIASEMTAI
+THAIMONTHOFYEAR = MESAÑOTAI
+THAIYEAR = AÑOTAI
+TIME = NSHORA
+TIMEVALUE = HORANUMERO
+TODAY = HOY
+WEEKDAY = DIASEM
+WEEKNUM = NUM.DE.SEMANA
+WORKDAY = DIA.LAB
+WORKDAY.INTL = DIA.LAB.INTL
+YEAR = AÑO
+YEARFRAC = FRAC.AÑO
 
 ##
-##	Date and time functions					Funciones de fecha y hora
+## Funciones de ingeniería (Engineering Functions)
 ##
-DATE			= FECHA					##	Devuelve el número de serie correspondiente a una fecha determinada.
-DATEVALUE		= FECHANUMERO				##	Convierte una fecha con formato de texto en un valor de número de serie.
-DAY			= DIA					##	Convierte un número de serie en un valor de día del mes.
-DAYS360			= DIAS360				##	Calcula el número de días entre dos fechas a partir de un año de 360 días.
-EDATE			= FECHA.MES				##	Devuelve el número de serie de la fecha equivalente al número indicado de meses anteriores o posteriores a la fecha inicial.
-EOMONTH			= FIN.MES				##	Devuelve el número de serie correspondiente al último día del mes anterior o posterior a un número de meses especificado.
-HOUR			= HORA					##	Convierte un número de serie en un valor de hora.
-MINUTE			= MINUTO				##	Convierte un número de serie en un valor de minuto.
-MONTH			= MES					##	Convierte un número de serie en un valor de mes.
-NETWORKDAYS		= DIAS.LAB				##	Devuelve el número de todos los días laborables existentes entre dos fechas.
-NOW			= AHORA					##	Devuelve el número de serie correspondiente a la fecha y hora actuales.
-SECOND			= SEGUNDO				##	Convierte un número de serie en un valor de segundo.
-TIME			= HORA					##	Devuelve el número de serie correspondiente a una hora determinada.
-TIMEVALUE		= HORANUMERO				##	Convierte una hora con formato de texto en un valor de número de serie.
-TODAY			= HOY					##	Devuelve el número de serie correspondiente al día actual.
-WEEKDAY			= DIASEM				##	Convierte un número de serie en un valor de día de la semana.
-WEEKNUM			= NUM.DE.SEMANA				##	Convierte un número de serie en un número que representa el lugar numérico correspondiente a una semana de un año.
-WORKDAY			= DIA.LAB				##	Devuelve el número de serie de la fecha que tiene lugar antes o después de un número determinado de días laborables.
-YEAR			= AÑO					##	Convierte un número de serie en un valor de año.
-YEARFRAC		= FRAC.AÑO				##	Devuelve la fracción de año que representa el número total de días existentes entre el valor de fecha_inicial y el de fecha_final.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.A.DEC
+BIN2HEX = BIN.A.HEX
+BIN2OCT = BIN.A.OCT
+BITAND = BIT.Y
+BITLSHIFT = BIT.DESPLIZQDA
+BITOR = BIT.O
+BITRSHIFT = BIT.DESPLDCHA
+BITXOR = BIT.XO
+COMPLEX = COMPLEJO
+CONVERT = CONVERTIR
+DEC2BIN = DEC.A.BIN
+DEC2HEX = DEC.A.HEX
+DEC2OCT = DEC.A.OCT
+DELTA = DELTA
+ERF = FUN.ERROR
+ERF.PRECISE = FUN.ERROR.EXACTO
+ERFC = FUN.ERROR.COMPL
+ERFC.PRECISE = FUN.ERROR.COMPL.EXACTO
+GESTEP = MAYOR.O.IGUAL
+HEX2BIN = HEX.A.BIN
+HEX2DEC = HEX.A.DEC
+HEX2OCT = HEX.A.OCT
+IMABS = IM.ABS
+IMAGINARY = IMAGINARIO
+IMARGUMENT = IM.ANGULO
+IMCONJUGATE = IM.CONJUGADA
+IMCOS = IM.COS
+IMCOSH = IM.COSH
+IMCOT = IM.COT
+IMCSC = IM.CSC
+IMCSCH = IM.CSCH
+IMDIV = IM.DIV
+IMEXP = IM.EXP
+IMLN = IM.LN
+IMLOG10 = IM.LOG10
+IMLOG2 = IM.LOG2
+IMPOWER = IM.POT
+IMPRODUCT = IM.PRODUCT
+IMREAL = IM.REAL
+IMSEC = IM.SEC
+IMSECH = IM.SECH
+IMSIN = IM.SENO
+IMSINH = IM.SENOH
+IMSQRT = IM.RAIZ2
+IMSUB = IM.SUSTR
+IMSUM = IM.SUM
+IMTAN = IM.TAN
+OCT2BIN = OCT.A.BIN
+OCT2DEC = OCT.A.DEC
+OCT2HEX = OCT.A.HEX
 
 ##
-##	Engineering functions					Funciones de ingeniería
+## Funciones financieras (Financial Functions)
 ##
-BESSELI			= BESSELI				##	Devuelve la función Bessel In(x) modificada.
-BESSELJ			= BESSELJ				##	Devuelve la función Bessel Jn(x).
-BESSELK			= BESSELK				##	Devuelve la función Bessel Kn(x) modificada.
-BESSELY			= BESSELY				##	Devuelve la función Bessel Yn(x).
-BIN2DEC			= BIN.A.DEC				##	Convierte un número binario en decimal.
-BIN2HEX			= BIN.A.HEX				##	Convierte un número binario en hexadecimal.
-BIN2OCT			= BIN.A.OCT				##	Convierte un número binario en octal.
-COMPLEX			= COMPLEJO				##	Convierte coeficientes reales e imaginarios en un número complejo.
-CONVERT			= CONVERTIR				##	Convierte un número de un sistema de medida a otro.
-DEC2BIN			= DEC.A.BIN				##	Convierte un número decimal en binario.
-DEC2HEX			= DEC.A.HEX				##	Convierte un número decimal en hexadecimal.
-DEC2OCT			= DEC.A.OCT				##	Convierte un número decimal en octal.
-DELTA			= DELTA					##	Comprueba si dos valores son iguales.
-ERF			= FUN.ERROR				##	Devuelve la función de error.
-ERFC			= FUN.ERROR.COMPL			##	Devuelve la función de error complementario.
-GESTEP			= MAYOR.O.IGUAL				##	Comprueba si un número es mayor que un valor de umbral.
-HEX2BIN			= HEX.A.BIN				##	Convierte un número hexadecimal en binario.
-HEX2DEC			= HEX.A.DEC				##	Convierte un número hexadecimal en decimal.
-HEX2OCT			= HEX.A.OCT				##	Convierte un número hexadecimal en octal.
-IMABS			= IM.ABS				##	Devuelve el valor absoluto (módulo) de un número complejo.
-IMAGINARY		= IMAGINARIO				##	Devuelve el coeficiente imaginario de un número complejo.
-IMARGUMENT		= IM.ANGULO				##	Devuelve el argumento theta, un ángulo expresado en radianes.
-IMCONJUGATE		= IM.CONJUGADA				##	Devuelve la conjugada compleja de un número complejo.
-IMCOS			= IM.COS				##	Devuelve el coseno de un número complejo.
-IMDIV			= IM.DIV				##	Devuelve el cociente de dos números complejos.
-IMEXP			= IM.EXP				##	Devuelve el valor exponencial de un número complejo.
-IMLN			= IM.LN					##	Devuelve el logaritmo natural (neperiano) de un número complejo.
-IMLOG10			= IM.LOG10				##	Devuelve el logaritmo en base 10 de un número complejo.
-IMLOG2			= IM.LOG2				##	Devuelve el logaritmo en base 2 de un número complejo.
-IMPOWER			= IM.POT				##	Devuelve un número complejo elevado a una potencia entera.
-IMPRODUCT		= IM.PRODUCT				##	Devuelve el producto de números complejos.
-IMREAL			= IM.REAL				##	Devuelve el coeficiente real de un número complejo.
-IMSIN			= IM.SENO				##	Devuelve el seno de un número complejo.
-IMSQRT			= IM.RAIZ2				##	Devuelve la raíz cuadrada de un número complejo.
-IMSUB			= IM.SUSTR				##	Devuelve la diferencia entre dos números complejos.
-IMSUM			= IM.SUM				##	Devuelve la suma de números complejos.
-OCT2BIN			= OCT.A.BIN				##	Convierte un número octal en binario.
-OCT2DEC			= OCT.A.DEC				##	Convierte un número octal en decimal.
-OCT2HEX			= OCT.A.HEX				##	Convierte un número octal en hexadecimal.
-
+ACCRINT = INT.ACUM
+ACCRINTM = INT.ACUM.V
+AMORDEGRC = AMORTIZ.PROGRE
+AMORLINC = AMORTIZ.LIN
+COUPDAYBS = CUPON.DIAS.L1
+COUPDAYS = CUPON.DIAS
+COUPDAYSNC = CUPON.DIAS.L2
+COUPNCD = CUPON.FECHA.L2
+COUPNUM = CUPON.NUM
+COUPPCD = CUPON.FECHA.L1
+CUMIPMT = PAGO.INT.ENTRE
+CUMPRINC = PAGO.PRINC.ENTRE
+DB = DB
+DDB = DDB
+DISC = TASA.DESC
+DOLLARDE = MONEDA.DEC
+DOLLARFR = MONEDA.FRAC
+DURATION = DURACION
+EFFECT = INT.EFECTIVO
+FV = VF
+FVSCHEDULE = VF.PLAN
+INTRATE = TASA.INT
+IPMT = PAGOINT
+IRR = TIR
+ISPMT = INT.PAGO.DIR
+MDURATION = DURACION.MODIF
+MIRR = TIRM
+NOMINAL = TASA.NOMINAL
+NPER = NPER
+NPV = VNA
+ODDFPRICE = PRECIO.PER.IRREGULAR.1
+ODDFYIELD = RENDTO.PER.IRREGULAR.1
+ODDLPRICE = PRECIO.PER.IRREGULAR.2
+ODDLYIELD = RENDTO.PER.IRREGULAR.2
+PDURATION = P.DURACION
+PMT = PAGO
+PPMT = PAGOPRIN
+PRICE = PRECIO
+PRICEDISC = PRECIO.DESCUENTO
+PRICEMAT = PRECIO.VENCIMIENTO
+PV = VA
+RATE = TASA
+RECEIVED = CANTIDAD.RECIBIDA
+RRI = RRI
+SLN = SLN
+SYD = SYD
+TBILLEQ = LETRA.DE.TEST.EQV.A.BONO
+TBILLPRICE = LETRA.DE.TES.PRECIO
+TBILLYIELD = LETRA.DE.TES.RENDTO
+VDB = DVS
+XIRR = TIR.NO.PER
+XNPV = VNA.NO.PER
+YIELD = RENDTO
+YIELDDISC = RENDTO.DESC
+YIELDMAT = RENDTO.VENCTO
 
 ##
-##	Financial functions					Funciones financieras
+## Funciones de información (Information Functions)
 ##
-ACCRINT			= INT.ACUM				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés periódicos.
-ACCRINTM		= INT.ACUM.V				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés al vencimiento.
-AMORDEGRC		= AMORTIZ.PROGRE			##	Devuelve la amortización de cada período contable mediante el uso de un coeficiente de amortización.
-AMORLINC		= AMORTIZ.LIN				##	Devuelve la amortización de cada uno de los períodos contables.
-COUPDAYBS		= CUPON.DIAS.L1				##	Devuelve el número de días desde el principio del período de un cupón hasta la fecha de liquidación.
-COUPDAYS		= CUPON.DIAS				##	Devuelve el número de días del período (entre dos cupones) donde se encuentra la fecha de liquidación.
-COUPDAYSNC		= CUPON.DIAS.L2				##	Devuelve el número de días desde la fecha de liquidación hasta la fecha del próximo cupón.
-COUPNCD			= CUPON.FECHA.L2			##	Devuelve la fecha del próximo cupón después de la fecha de liquidación.
-COUPNUM			= CUPON.NUM				##	Devuelve el número de pagos de cupón entre la fecha de liquidación y la fecha de vencimiento.
-COUPPCD			= CUPON.FECHA.L1			##	Devuelve la fecha de cupón anterior a la fecha de liquidación.
-CUMIPMT			= PAGO.INT.ENTRE			##	Devuelve el interés acumulado pagado entre dos períodos.
-CUMPRINC		= PAGO.PRINC.ENTRE			##	Devuelve el capital acumulado pagado de un préstamo entre dos períodos.
-DB			= DB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización de saldo fijo.
-DDB			= DDB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización por doble disminución de saldo u otro método que se especifique.
-DISC			= TASA.DESC				##	Devuelve la tasa de descuento de un valor bursátil.
-DOLLARDE		= MONEDA.DEC				##	Convierte una cotización de un valor bursátil expresada en forma fraccionaria en una cotización de un valor bursátil expresada en forma decimal.
-DOLLARFR		= MONEDA.FRAC				##	Convierte una cotización de un valor bursátil expresada en forma decimal en una cotización de un valor bursátil expresada en forma fraccionaria.
-DURATION		= DURACION				##	Devuelve la duración anual de un valor bursátil con pagos de interés periódico.
-EFFECT			= INT.EFECTIVO				##	Devuelve la tasa de interés anual efectiva.
-FV			= VF					##	Devuelve el valor futuro de una inversión.
-FVSCHEDULE		= VF.PLAN				##	Devuelve el valor futuro de un capital inicial después de aplicar una serie de tasas de interés compuesto.
-INTRATE			= TASA.INT				##	Devuelve la tasa de interés para la inversión total de un valor bursátil.
-IPMT			= PAGOINT				##	Devuelve el pago de intereses de una inversión durante un período determinado.
-IRR			= TIR					##	Devuelve la tasa interna de retorno para una serie de flujos de efectivo periódicos.
-ISPMT			= INT.PAGO.DIR				##	Calcula el interés pagado durante un período específico de una inversión.
-MDURATION		= DURACION.MODIF			##	Devuelve la duración de Macauley modificada de un valor bursátil con un valor nominal supuesto de 100 $.
-MIRR			= TIRM					##	Devuelve la tasa interna de retorno donde se financian flujos de efectivo positivos y negativos a tasas diferentes.
-NOMINAL			= TASA.NOMINAL				##	Devuelve la tasa nominal de interés anual.
-NPER			= NPER					##	Devuelve el número de períodos de una inversión.
-NPV			= VNA					##	Devuelve el valor neto actual de una inversión en función de una serie de flujos periódicos de efectivo y una tasa de descuento.
-ODDFPRICE		= PRECIO.PER.IRREGULAR.1		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un primer período impar.
-ODDFYIELD		= RENDTO.PER.IRREGULAR.1		##	Devuelve el rendimiento de un valor bursátil con un primer período impar.
-ODDLPRICE		= PRECIO.PER.IRREGULAR.2		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un último período impar.
-ODDLYIELD		= RENDTO.PER.IRREGULAR.2		##	Devuelve el rendimiento de un valor bursátil con un último período impar.
-PMT			= PAGO					##	Devuelve el pago periódico de una anualidad.
-PPMT			= PAGOPRIN				##	Devuelve el pago de capital de una inversión durante un período determinado.
-PRICE			= PRECIO				##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga una tasa de interés periódico.
-PRICEDISC		= PRECIO.DESCUENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con descuento.
-PRICEMAT		= PRECIO.VENCIMIENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga interés a su vencimiento.
-PV			= VALACT				##	Devuelve el valor actual de una inversión.
-RATE			= TASA					##	Devuelve la tasa de interés por período de una anualidad.
-RECEIVED		= CANTIDAD.RECIBIDA			##	Devuelve la cantidad recibida al vencimiento de un valor bursátil completamente invertido.
-SLN			= SLN					##	Devuelve la amortización por método directo de un bien en un período dado.
-SYD			= SYD					##	Devuelve la amortización por suma de dígitos de los años de un bien durante un período especificado.
-TBILLEQ			= LETRA.DE.TES.EQV.A.BONO		##	Devuelve el rendimiento de un bono equivalente a una letra del Tesoro (de EE.UU.)
-TBILLPRICE		= LETRA.DE.TES.PRECIO			##	Devuelve el precio por un valor nominal de 100 $ de una letra del Tesoro (de EE.UU.)
-TBILLYIELD		= LETRA.DE.TES.RENDTO			##	Devuelve el rendimiento de una letra del Tesoro (de EE.UU.)
-VDB			= DVS					##	Devuelve la amortización de un bien durante un período específico o parcial a través del método de cálculo del saldo en disminución.
-XIRR			= TIR.NO.PER				##	Devuelve la tasa interna de retorno para un flujo de efectivo que no es necesariamente periódico.
-XNPV			= VNA.NO.PER				##	Devuelve el valor neto actual para un flujo de efectivo que no es necesariamente periódico.
-YIELD			= RENDTO				##	Devuelve el rendimiento de un valor bursátil que paga intereses periódicos.
-YIELDDISC		= RENDTO.DESC				##	Devuelve el rendimiento anual de un valor bursátil con descuento; por ejemplo, una letra del Tesoro (de EE.UU.)
-YIELDMAT		= RENDTO.VENCTO				##	Devuelve el rendimiento anual de un valor bursátil que paga intereses al vencimiento.
-
+CELL = CELDA
+ERROR.TYPE = TIPO.DE.ERROR
+INFO = INFO
+ISBLANK = ESBLANCO
+ISERR = ESERR
+ISERROR = ESERROR
+ISEVEN = ES.PAR
+ISFORMULA = ESFORMULA
+ISLOGICAL = ESLOGICO
+ISNA = ESNOD
+ISNONTEXT = ESNOTEXTO
+ISNUMBER = ESNUMERO
+ISODD = ES.IMPAR
+ISREF = ESREF
+ISTEXT = ESTEXTO
+N = N
+NA = NOD
+SHEET = HOJA
+SHEETS = HOJAS
+TYPE = TIPO
 
 ##
-##	Information functions					Funciones de información
+## Funciones lógicas (Logical Functions)
 ##
-CELL			= CELDA					##	Devuelve información acerca del formato, la ubicación o el contenido de una celda.
-ERROR.TYPE		= TIPO.DE.ERROR				##	Devuelve un número que corresponde a un tipo de error.
-INFO			= INFO					##	Devuelve información acerca del entorno operativo en uso.
-ISBLANK			= ESBLANCO				##	Devuelve VERDADERO si el valor está en blanco.
-ISERR			= ESERR					##	Devuelve VERDADERO si el valor es cualquier valor de error excepto #N/A.
-ISERROR			= ESERROR				##	Devuelve VERDADERO si el valor es cualquier valor de error.
-ISEVEN			= ES.PAR				##	Devuelve VERDADERO si el número es par.
-ISLOGICAL		= ESLOGICO				##	Devuelve VERDADERO si el valor es un valor lógico.
-ISNA			= ESNOD					##	Devuelve VERDADERO si el valor es el valor de error #N/A.
-ISNONTEXT		= ESNOTEXTO				##	Devuelve VERDADERO si el valor no es texto.
-ISNUMBER		= ESNUMERO				##	Devuelve VERDADERO si el valor es un número.
-ISODD			= ES.IMPAR				##	Devuelve VERDADERO si el número es impar.
-ISREF			= ESREF					##	Devuelve VERDADERO si el valor es una referencia.
-ISTEXT			= ESTEXTO				##	Devuelve VERDADERO si el valor es texto.
-N			= N					##	Devuelve un valor convertido en un número.
-NA			= ND					##	Devuelve el valor de error #N/A.
-TYPE			= TIPO					##	Devuelve un número que indica el tipo de datos de un valor.
-
+AND = Y
+FALSE = FALSO
+IF = SI
+IFERROR = SI.ERROR
+IFNA = SI.ND
+IFS = SI.CONJUNTO
+NOT = NO
+OR = O
+SWITCH = CAMBIAR
+TRUE = VERDADERO
+XOR = XO
 
 ##
-##	Logical functions					Funciones lógicas
+## Funciones de búsqueda y referencia (Lookup & Reference Functions)
 ##
-AND			= Y					##	Devuelve VERDADERO si todos sus argumentos son VERDADERO.
-FALSE			= FALSO					##	Devuelve el valor lógico FALSO.
-IF			= SI					##	Especifica una prueba lógica que realizar.
-IFERROR			= SI.ERROR				##	Devuelve un valor que se especifica si una fórmula lo evalúa como un error; de lo contrario, devuelve el resultado de la fórmula.
-NOT			= NO					##	Invierte el valor lógico del argumento.
-OR			= O					##	Devuelve VERDADERO si cualquier argumento es VERDADERO.
-TRUE			= VERDADERO				##	Devuelve el valor lógico VERDADERO.
-
+ADDRESS = DIRECCION
+AREAS = AREAS
+CHOOSE = ELEGIR
+COLUMN = COLUMNA
+COLUMNS = COLUMNAS
+FORMULATEXT = FORMULATEXTO
+GETPIVOTDATA = IMPORTARDATOSDINAMICOS
+HLOOKUP = BUSCARH
+HYPERLINK = HIPERVINCULO
+INDEX = INDICE
+INDIRECT = INDIRECTO
+LOOKUP = BUSCAR
+MATCH = COINCIDIR
+OFFSET = DESREF
+ROW = FILA
+ROWS = FILAS
+RTD = RDTR
+TRANSPOSE = TRANSPONER
+VLOOKUP = BUSCARV
+*RC = FC
 
 ##
-##	Lookup and reference functions				Funciones de búsqueda y referencia
+## Funciones matemáticas y trigonométricas (Math & Trig Functions)
 ##
-ADDRESS			= DIRECCION				##	Devuelve una referencia como texto a una sola celda de una hoja de cálculo.
-AREAS			= AREAS					##	Devuelve el número de áreas de una referencia.
-CHOOSE			= ELEGIR				##	Elige un valor de una lista de valores.
-COLUMN			= COLUMNA				##	Devuelve el número de columna de una referencia.
-COLUMNS			= COLUMNAS				##	Devuelve el número de columnas de una referencia.
-HLOOKUP			= BUSCARH				##	Busca en la fila superior de una matriz y devuelve el valor de la celda indicada.
-HYPERLINK		= HIPERVINCULO				##	Crea un acceso directo o un salto que abre un documento almacenado en un servidor de red, en una intranet o en Internet.
-INDEX			= INDICE				##	Usa un índice para elegir un valor de una referencia o matriz.
-INDIRECT		= INDIRECTO				##	Devuelve una referencia indicada por un valor de texto.
-LOOKUP			= BUSCAR				##	Busca valores de un vector o una matriz.
-MATCH			= COINCIDIR				##	Busca valores de una referencia o matriz.
-OFFSET			= DESREF				##	Devuelve un desplazamiento de referencia respecto a una referencia dada.
-ROW			= FILA					##	Devuelve el número de fila de una referencia.
-ROWS			= FILAS					##	Devuelve el número de filas de una referencia.
-RTD			= RDTR					##	Recupera datos en tiempo real desde un programa compatible con la automatización COM (automatización: modo de trabajar con los objetos de una aplicación desde otra aplicación o herramienta de entorno. La automatización, antes denominada automatización OLE, es un estándar de la industria y una función del Modelo de objetos componentes (COM).).
-TRANSPOSE		= TRANSPONER				##	Devuelve la transposición de una matriz.
-VLOOKUP			= BUSCARV				##	Busca en la primera columna de una matriz y se mueve en horizontal por la fila para devolver el valor de una celda.
-
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = NUMERO.ARABE
+ASIN = ASENO
+ASINH = ASENOH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = MULTIPLO.SUPERIOR.MAT
+CEILING.PRECISE = MULTIPLO.SUPERIOR.EXACTO
+COMBIN = COMBINAT
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = CONV.DECIMAL
+DEGREES = GRADOS
+ECMA.CEILING = MULTIPLO.SUPERIOR.ECMA
+EVEN = REDONDEA.PAR
+EXP = EXP
+FACT = FACT
+FACTDOUBLE = FACT.DOBLE
+FLOOR.MATH = MULTIPLO.INFERIOR.MAT
+FLOOR.PRECISE = MULTIPLO.INFERIOR.EXACTO
+GCD = M.C.D
+INT = ENTERO
+ISO.CEILING = MULTIPLO.SUPERIOR.ISO
+LCM = M.C.M
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERSA
+MMULT = MMULT
+MOD = RESIDUO
+MROUND = REDOND.MULT
+MULTINOMIAL = MULTINOMIAL
+MUNIT = M.UNIDAD
+ODD = REDONDEA.IMPAR
+PI = PI
+POWER = POTENCIA
+PRODUCT = PRODUCTO
+QUOTIENT = COCIENTE
+RADIANS = RADIANES
+RAND = ALEATORIO
+RANDBETWEEN = ALEATORIO.ENTRE
+ROMAN = NUMERO.ROMANO
+ROUND = REDONDEAR
+ROUNDBAHTDOWN = REDONDEAR.BAHT.MAS
+ROUNDBAHTUP = REDONDEAR.BAHT.MENOS
+ROUNDDOWN = REDONDEAR.MENOS
+ROUNDUP = REDONDEAR.MAS
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMA.SERIES
+SIGN = SIGNO
+SIN = SENO
+SINH = SENOH
+SQRT = RAIZ
+SQRTPI = RAIZ2PI
+SUBTOTAL = SUBTOTALES
+SUM = SUMA
+SUMIF = SUMAR.SI
+SUMIFS = SUMAR.SI.CONJUNTO
+SUMPRODUCT = SUMAPRODUCTO
+SUMSQ = SUMA.CUADRADOS
+SUMX2MY2 = SUMAX2MENOSY2
+SUMX2PY2 = SUMAX2MASY2
+SUMXMY2 = SUMAXMENOSY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
 
 ##
-##	Math and trigonometry functions				Funciones matemáticas y trigonométricas
+## Funciones estadísticas (Statistical Functions)
 ##
-ABS			= ABS					##	Devuelve el valor absoluto de un número.
-ACOS			= ACOS					##	Devuelve el arcocoseno de un número.
-ACOSH			= ACOSH					##	Devuelve el coseno hiperbólico inverso de un número.
-ASIN			= ASENO					##	Devuelve el arcoseno de un número.
-ASINH			= ASENOH				##	Devuelve el seno hiperbólico inverso de un número.
-ATAN			= ATAN					##	Devuelve la arcotangente de un número.
-ATAN2			= ATAN2					##	Devuelve la arcotangente de las coordenadas "x" e "y".
-ATANH			= ATANH					##	Devuelve la tangente hiperbólica inversa de un número.
-CEILING			= MULTIPLO.SUPERIOR			##	Redondea un número al entero más próximo o al múltiplo significativo más cercano.
-COMBIN			= COMBINAT				##	Devuelve el número de combinaciones para un número determinado de objetos.
-COS			= COS					##	Devuelve el coseno de un número.
-COSH			= COSH					##	Devuelve el coseno hiperbólico de un número.
-DEGREES			= GRADOS				##	Convierte radianes en grados.
-EVEN			= REDONDEA.PAR				##	Redondea un número hasta el entero par más próximo.
-EXP			= EXP					##	Devuelve e elevado a la potencia de un número dado.
-FACT			= FACT					##	Devuelve el factorial de un número.
-FACTDOUBLE		= FACT.DOBLE				##	Devuelve el factorial doble de un número.
-FLOOR			= MULTIPLO.INFERIOR			##	Redondea un número hacia abajo, en dirección hacia cero.
-GCD			= M.C.D					##	Devuelve el máximo común divisor.
-INT			= ENTERO				##	Redondea un número hacia abajo hasta el entero más próximo.
-LCM			= M.C.M					##	Devuelve el mínimo común múltiplo.
-LN			= LN					##	Devuelve el logaritmo natural (neperiano) de un número.
-LOG			= LOG					##	Devuelve el logaritmo de un número en una base especificada.
-LOG10			= LOG10					##	Devuelve el logaritmo en base 10 de un número.
-MDETERM			= MDETERM				##	Devuelve la determinante matricial de una matriz.
-MINVERSE		= MINVERSA				##	Devuelve la matriz inversa de una matriz.
-MMULT			= MMULT					##	Devuelve el producto de matriz de dos matrices.
-MOD			= RESIDUO				##	Devuelve el resto de la división.
-MROUND			= REDOND.MULT				##	Devuelve un número redondeado al múltiplo deseado.
-MULTINOMIAL		= MULTINOMIAL				##	Devuelve el polinomio de un conjunto de números.
-ODD			= REDONDEA.IMPAR			##	Redondea un número hacia arriba hasta el entero impar más próximo.
-PI			= PI					##	Devuelve el valor de pi.
-POWER			= POTENCIA				##	Devuelve el resultado de elevar un número a una potencia.
-PRODUCT			= PRODUCTO				##	Multiplica sus argumentos.
-QUOTIENT		= COCIENTE				##	Devuelve la parte entera de una división.
-RADIANS			= RADIANES				##	Convierte grados en radianes.
-RAND			= ALEATORIO				##	Devuelve un número aleatorio entre 0 y 1.
-RANDBETWEEN		= ALEATORIO.ENTRE			##	Devuelve un número aleatorio entre los números que especifique.
-ROMAN			= NUMERO.ROMANO				##	Convierte un número arábigo en número romano, con formato de texto.
-ROUND			= REDONDEAR				##	Redondea un número al número de decimales especificado.
-ROUNDDOWN		= REDONDEAR.MENOS			##	Redondea un número hacia abajo, en dirección hacia cero.
-ROUNDUP			= REDONDEAR.MAS				##	Redondea un número hacia arriba, en dirección contraria a cero.
-SERIESSUM		= SUMA.SERIES				##	Devuelve la suma de una serie de potencias en función de la fórmula.
-SIGN			= SIGNO					##	Devuelve el signo de un número.
-SIN			= SENO					##	Devuelve el seno de un ángulo determinado.
-SINH			= SENOH					##	Devuelve el seno hiperbólico de un número.
-SQRT			= RAIZ					##	Devuelve la raíz cuadrada positiva de un número.
-SQRTPI			= RAIZ2PI				##	Devuelve la raíz cuadrada de un número multiplicado por PI (número * pi).
-SUBTOTAL		= SUBTOTALES				##	Devuelve un subtotal en una lista o base de datos.
-SUM			= SUMA					##	Suma sus argumentos.
-SUMIF			= SUMAR.SI				##	Suma las celdas especificadas que cumplen unos criterios determinados.
-SUMIFS			= SUMAR.SI.CONJUNTO			##	Suma las celdas de un rango que cumplen varios criterios.
-SUMPRODUCT		= SUMAPRODUCTO				##	Devuelve la suma de los productos de los correspondientes componentes de matriz.
-SUMSQ			= SUMA.CUADRADOS			##	Devuelve la suma de los cuadrados de los argumentos.
-SUMX2MY2		= SUMAX2MENOSY2				##	Devuelve la suma de la diferencia de los cuadrados de los valores correspondientes de dos matrices.
-SUMX2PY2		= SUMAX2MASY2				##	Devuelve la suma de la suma de los cuadrados de los valores correspondientes de dos matrices.
-SUMXMY2			= SUMAXMENOSY2				##	Devuelve la suma de los cuadrados de las diferencias de los valores correspondientes de dos matrices.
-TAN			= TAN					##	Devuelve la tangente de un número.
-TANH			= TANH					##	Devuelve la tangente hiperbólica de un número.
-TRUNC			= TRUNCAR				##	Trunca un número a un entero.
-
+AVEDEV = DESVPROM
+AVERAGE = PROMEDIO
+AVERAGEA = PROMEDIOA
+AVERAGEIF = PROMEDIO.SI
+AVERAGEIFS = PROMEDIO.SI.CONJUNTO
+BETA.DIST = DISTR.BETA.N
+BETA.INV = INV.BETA.N
+BINOM.DIST = DISTR.BINOM.N
+BINOM.DIST.RANGE = DISTR.BINOM.SERIE
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DISTR.CHICUAD
+CHISQ.DIST.RT = DISTR.CHICUAD.CD
+CHISQ.INV = INV.CHICUAD
+CHISQ.INV.RT = INV.CHICUAD.CD
+CHISQ.TEST = PRUEBA.CHICUAD
+CONFIDENCE.NORM = INTERVALO.CONFIANZA.NORM
+CONFIDENCE.T = INTERVALO.CONFIANZA.T
+CORREL = COEF.DE.CORREL
+COUNT = CONTAR
+COUNTA = CONTARA
+COUNTBLANK = CONTAR.BLANCO
+COUNTIF = CONTAR.SI
+COUNTIFS = CONTAR.SI.CONJUNTO
+COVARIANCE.P = COVARIANCE.P
+COVARIANCE.S = COVARIANZA.M
+DEVSQ = DESVIA2
+EXPON.DIST = DISTR.EXP.N
+F.DIST = DISTR.F.N
+F.DIST.RT = DISTR.F.CD
+F.INV = INV.F
+F.INV.RT = INV.F.CD
+F.TEST = PRUEBA.F.N
+FISHER = FISHER
+FISHERINV = PRUEBA.FISHER.INV
+FORECAST.ETS = PRONOSTICO.ETS
+FORECAST.ETS.CONFINT = PRONOSTICO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PRONOSTICO.ETS.ESTACIONALIDAD
+FORECAST.ETS.STAT = PRONOSTICO.ETS.STAT
+FORECAST.LINEAR = PRONOSTICO.LINEAL
+FREQUENCY = FRECUENCIA
+GAMMA = GAMMA
+GAMMA.DIST = DISTR.GAMMA.N
+GAMMA.INV = INV.GAMMA
+GAMMALN = GAMMA.LN
+GAMMALN.PRECISE = GAMMA.LN.EXACTO
+GAUSS = GAUSS
+GEOMEAN = MEDIA.GEOM
+GROWTH = CRECIMIENTO
+HARMEAN = MEDIA.ARMO
+HYPGEOM.DIST = DISTR.HIPERGEOM.N
+INTERCEPT = INTERSECCION.EJE
+KURT = CURTOSIS
+LARGE = K.ESIMO.MAYOR
+LINEST = ESTIMACION.LINEAL
+LOGEST = ESTIMACION.LOGARITMICA
+LOGNORM.DIST = DISTR.LOGNORM
+LOGNORM.INV = INV.LOGNORM
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.SI.CONJUNTO
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.SI.CONJUNTO
+MODE.MULT = MODA.VARIOS
+MODE.SNGL = MODA.UNO
+NEGBINOM.DIST = NEGBINOM.DIST
+NORM.DIST = DISTR.NORM.N
+NORM.INV = INV.NORM
+NORM.S.DIST = DISTR.NORM.ESTAND.N
+NORM.S.INV = INV.NORM.ESTAND
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = RANGO.PERCENTIL.EXC
+PERCENTRANK.INC = RANGO.PERCENTIL.INC
+PERMUT = PERMUTACIONES
+PERMUTATIONA = PERMUTACIONES.A
+PHI = FI
+POISSON.DIST = POISSON.DIST
+PROB = PROBABILIDAD
+QUARTILE.EXC = CUARTIL.EXC
+QUARTILE.INC = CUARTIL.INC
+RANK.AVG = JERARQUIA.MEDIA
+RANK.EQ = JERARQUIA.EQV
+RSQ = COEFICIENTE.R2
+SKEW = COEFICIENTE.ASIMETRIA
+SKEW.P = COEFICIENTE.ASIMETRIA.P
+SLOPE = PENDIENTE
+SMALL = K.ESIMO.MENOR
+STANDARDIZE = NORMALIZACION
+STDEV.P = DESVEST.P
+STDEV.S = DESVEST.M
+STDEVA = DESVESTA
+STDEVPA = DESVESTPA
+STEYX = ERROR.TIPICO.XY
+T.DIST = DISTR.T.N
+T.DIST.2T = DISTR.T.2C
+T.DIST.RT = DISTR.T.CD
+T.INV = INV.T
+T.INV.2T = INV.T.2C
+T.TEST = PRUEBA.T.N
+TREND = TENDENCIA
+TRIMMEAN = MEDIA.ACOTADA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DISTR.WEIBULL
+Z.TEST = PRUEBA.Z.N
 
 ##
-##	Statistical functions					Funciones estadísticas
+## Funciones de texto (Text Functions)
 ##
-AVEDEV			= DESVPROM				##	Devuelve el promedio de las desviaciones absolutas de la media de los puntos de datos.
-AVERAGE			= PROMEDIO				##	Devuelve el promedio de sus argumentos.
-AVERAGEA		= PROMEDIOA				##	Devuelve el promedio de sus argumentos, incluidos números, texto y valores lógicos.
-AVERAGEIF		= PROMEDIO.SI				##	Devuelve el promedio (media aritmética) de todas las celdas de un rango que cumplen unos criterios determinados.
-AVERAGEIFS		= PROMEDIO.SI.CONJUNTO			##	Devuelve el promedio (media aritmética) de todas las celdas que cumplen múltiples criterios.
-BETADIST		= DISTR.BETA				##	Devuelve la función de distribución beta acumulativa.
-BETAINV			= DISTR.BETA.INV			##	Devuelve la función inversa de la función de distribución acumulativa de una distribución beta especificada.
-BINOMDIST		= DISTR.BINOM				##	Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial.
-CHIDIST			= DISTR.CHI				##	Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHIINV			= PRUEBA.CHI.INV			##	Devuelve la función inversa de la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHITEST			= PRUEBA.CHI				##	Devuelve la prueba de independencia.
-CONFIDENCE		= INTERVALO.CONFIANZA			##	Devuelve el intervalo de confianza de la media de una población.
-CORREL			= COEF.DE.CORREL			##	Devuelve el coeficiente de correlación entre dos conjuntos de datos.
-COUNT			= CONTAR				##	Cuenta cuántos números hay en la lista de argumentos.
-COUNTA			= CONTARA				##	Cuenta cuántos valores hay en la lista de argumentos.
-COUNTBLANK		= CONTAR.BLANCO				##	Cuenta el número de celdas en blanco de un rango.
-COUNTIF			= CONTAR.SI				##	Cuenta el número de celdas, dentro del rango, que cumplen el criterio especificado.
-COUNTIFS		= CONTAR.SI.CONJUNTO			##	Cuenta el número de celdas, dentro del rango, que cumplen varios criterios.
-COVAR			= COVAR					##	Devuelve la covarianza, que es el promedio de los productos de las desviaciones para cada pareja de puntos de datos.
-CRITBINOM		= BINOM.CRIT				##	Devuelve el menor valor cuya distribución binomial acumulativa es menor o igual a un valor de criterio.
-DEVSQ			= DESVIA2				##	Devuelve la suma de los cuadrados de las desviaciones.
-EXPONDIST		= DISTR.EXP				##	Devuelve la distribución exponencial.
-FDIST			= DISTR.F				##	Devuelve la distribución de probabilidad F.
-FINV			= DISTR.F.INV				##	Devuelve la función inversa de la distribución de probabilidad F.
-FISHER			= FISHER				##	Devuelve la transformación Fisher.
-FISHERINV		= PRUEBA.FISHER.INV			##	Devuelve la función inversa de la transformación Fisher.
-FORECAST		= PRONOSTICO				##	Devuelve un valor en una tendencia lineal.
-FREQUENCY		= FRECUENCIA				##	Devuelve una distribución de frecuencia como una matriz vertical.
-FTEST			= PRUEBA.F				##	Devuelve el resultado de una prueba F.
-GAMMADIST		= DISTR.GAMMA				##	Devuelve la distribución gamma.
-GAMMAINV		= DISTR.GAMMA.INV			##	Devuelve la función inversa de la distribución gamma acumulativa.
-GAMMALN			= GAMMA.LN				##	Devuelve el logaritmo natural de la función gamma, G(x).
-GEOMEAN			= MEDIA.GEOM				##	Devuelve la media geométrica.
-GROWTH			= CRECIMIENTO				##	Devuelve valores en una tendencia exponencial.
-HARMEAN			= MEDIA.ARMO				##	Devuelve la media armónica.
-HYPGEOMDIST		= DISTR.HIPERGEOM			##	Devuelve la distribución hipergeométrica.
-INTERCEPT		= INTERSECCION.EJE			##	Devuelve la intersección de la línea de regresión lineal.
-KURT			= CURTOSIS				##	Devuelve la curtosis de un conjunto de datos.
-LARGE			= K.ESIMO.MAYOR				##	Devuelve el k-ésimo mayor valor de un conjunto de datos.
-LINEST			= ESTIMACION.LINEAL			##	Devuelve los parámetros de una tendencia lineal.
-LOGEST			= ESTIMACION.LOGARITMICA		##	Devuelve los parámetros de una tendencia exponencial.
-LOGINV			= DISTR.LOG.INV				##	Devuelve la función inversa de la distribución logarítmico-normal.
-LOGNORMDIST		= DISTR.LOG.NORM			##	Devuelve la distribución logarítmico-normal acumulativa.
-MAX			= MAX					##	Devuelve el valor máximo de una lista de argumentos.
-MAXA			= MAXA					##	Devuelve el valor máximo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MEDIAN			= MEDIANA				##	Devuelve la mediana de los números dados.
-MIN			= MIN					##	Devuelve el valor mínimo de una lista de argumentos.
-MINA			= MINA					##	Devuelve el valor mínimo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MODE			= MODA					##	Devuelve el valor más común de un conjunto de datos.
-NEGBINOMDIST		= NEGBINOMDIST				##	Devuelve la distribución binomial negativa.
-NORMDIST		= DISTR.NORM				##	Devuelve la distribución normal acumulativa.
-NORMINV			= DISTR.NORM.INV			##	Devuelve la función inversa de la distribución normal acumulativa.
-NORMSDIST		= DISTR.NORM.ESTAND			##	Devuelve la distribución normal estándar acumulativa.
-NORMSINV		= DISTR.NORM.ESTAND.INV			##	Devuelve la función inversa de la distribución normal estándar acumulativa.
-PEARSON			= PEARSON				##	Devuelve el coeficiente de momento de correlación de producto Pearson.
-PERCENTILE		= PERCENTIL				##	Devuelve el k-ésimo percentil de los valores de un rango.
-PERCENTRANK		= RANGO.PERCENTIL			##	Devuelve el rango porcentual de un valor de un conjunto de datos.
-PERMUT			= PERMUTACIONES				##	Devuelve el número de permutaciones de un número determinado de objetos.
-POISSON			= POISSON				##	Devuelve la distribución de Poisson.
-PROB			= PROBABILIDAD				##	Devuelve la probabilidad de que los valores de un rango se encuentren entre dos límites.
-QUARTILE		= CUARTIL				##	Devuelve el cuartil de un conjunto de datos.
-RANK			= JERARQUIA				##	Devuelve la jerarquía de un número en una lista de números.
-RSQ			= COEFICIENTE.R2			##	Devuelve el cuadrado del coeficiente de momento de correlación de producto Pearson.
-SKEW			= COEFICIENTE.ASIMETRIA			##	Devuelve la asimetría de una distribución.
-SLOPE			= PENDIENTE				##	Devuelve la pendiente de la línea de regresión lineal.
-SMALL			= K.ESIMO.MENOR				##	Devuelve el k-ésimo menor valor de un conjunto de datos.
-STANDARDIZE		= NORMALIZACION				##	Devuelve un valor normalizado.
-STDEV			= DESVEST				##	Calcula la desviación estándar a partir de una muestra.
-STDEVA			= DESVESTA				##	Calcula la desviación estándar a partir de una muestra, incluidos números, texto y valores lógicos.
-STDEVP			= DESVESTP				##	Calcula la desviación estándar en función de toda la población.
-STDEVPA			= DESVESTPA				##	Calcula la desviación estándar en función de toda la población, incluidos números, texto y valores lógicos.
-STEYX			= ERROR.TIPICO.XY			##	Devuelve el error estándar del valor de "y" previsto para cada "x" de la regresión.
-TDIST			= DISTR.T				##	Devuelve la distribución de t de Student.
-TINV			= DISTR.T.INV				##	Devuelve la función inversa de la distribución de t de Student.
-TREND			= TENDENCIA				##	Devuelve valores en una tendencia lineal.
-TRIMMEAN		= MEDIA.ACOTADA				##	Devuelve la media del interior de un conjunto de datos.
-TTEST			= PRUEBA.T				##	Devuelve la probabilidad asociada a una prueba t de Student.
-VAR			= VAR					##	Calcula la varianza en función de una muestra.
-VARA			= VARA					##	Calcula la varianza en función de una muestra, incluidos números, texto y valores lógicos.
-VARP			= VARP					##	Calcula la varianza en función de toda la población.
-VARPA			= VARPA					##	Calcula la varianza en función de toda la población, incluidos números, texto y valores lógicos.
-WEIBULL			= DIST.WEIBULL				##	Devuelve la distribución de Weibull.
-ZTEST			= PRUEBA.Z				##	Devuelve el valor de una probabilidad de una cola de una prueba z.
-
+BAHTTEXT = TEXTOBAHT
+CHAR = CARACTER
+CLEAN = LIMPIAR
+CODE = CODIGO
+CONCAT = CONCAT
+DOLLAR = MONEDA
+EXACT = IGUAL
+FIND = ENCONTRAR
+FIXED = DECIMAL
+ISTHAIDIGIT = ESDIGITOTAI
+LEFT = IZQUIERDA
+LEN = LARGO
+LOWER = MINUSC
+MID = EXTRAE
+NUMBERSTRING = CADENA.NUMERO
+NUMBERVALUE = VALOR.NUMERO
+PHONETIC = FONETICO
+PROPER = NOMPROPIO
+REPLACE = REEMPLAZAR
+REPT = REPETIR
+RIGHT = DERECHA
+SEARCH = HALLAR
+SUBSTITUTE = SUSTITUIR
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRCADENAS
+THAIDIGIT = DIGITOTAI
+THAINUMSOUND = SONNUMTAI
+THAINUMSTRING = CADENANUMTAI
+THAISTRINGLENGTH = LONGCADENATAI
+TRIM = ESPACIOS
+UNICHAR = UNICAR
+UNICODE = UNICODE
+UPPER = MAYUSC
+VALUE = VALOR
 
 ##
-##	Text functions						Funciones de texto
+## Funciones web (Web Functions)
 ##
-ASC			= ASC					##	Convierte las letras inglesas o katakana de ancho completo (de dos bytes) dentro de una cadena de caracteres en caracteres de ancho medio (de un byte).
-BAHTTEXT		= TEXTOBAHT				##	Convierte un número en texto, con el formato de moneda ß (Baht).
-CHAR			= CARACTER				##	Devuelve el carácter especificado por el número de código.
-CLEAN			= LIMPIAR				##	Quita del texto todos los caracteres no imprimibles.
-CODE			= CODIGO				##	Devuelve un código numérico del primer carácter de una cadena de texto.
-CONCATENATE		= CONCATENAR				##	Concatena varios elementos de texto en uno solo.
-DOLLAR			= MONEDA				##	Convierte un número en texto, con el formato de moneda $ (dólar).
-EXACT			= IGUAL					##	Comprueba si dos valores de texto son idénticos.
-FIND			= ENCONTRAR				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FINDB			= ENCONTRARB				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FIXED			= DECIMAL				##	Da formato a un número como texto con un número fijo de decimales.
-JIS			= JIS					##	Convierte las letras inglesas o katakana de ancho medio (de un byte) dentro de una cadena de caracteres en caracteres de ancho completo (de dos bytes).
-LEFT			= IZQUIERDA				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEFTB			= IZQUIERDAB				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEN			= LARGO					##	Devuelve el número de caracteres de una cadena de texto.
-LENB			= LARGOB				##	Devuelve el número de caracteres de una cadena de texto.
-LOWER			= MINUSC				##	Pone el texto en minúsculas.
-MID			= EXTRAE				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-MIDB			= EXTRAEB				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-PHONETIC		= FONETICO				##	Extrae los caracteres fonéticos (furigana) de una cadena de texto.
-PROPER			= NOMPROPIO				##	Pone en mayúscula la primera letra de cada palabra de un valor de texto.
-REPLACE			= REEMPLAZAR				##	Reemplaza caracteres de texto.
-REPLACEB		= REEMPLAZARB				##	Reemplaza caracteres de texto.
-REPT			= REPETIR				##	Repite el texto un número determinado de veces.
-RIGHT			= DERECHA				##	Devuelve los caracteres del lado derecho de un valor de texto.
-RIGHTB			= DERECHAB				##	Devuelve los caracteres del lado derecho de un valor de texto.
-SEARCH			= HALLAR				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SEARCHB			= HALLARB				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SUBSTITUTE		= SUSTITUIR				##	Sustituye texto nuevo por texto antiguo en una cadena de texto.
-T			= T					##	Convierte sus argumentos a texto.
-TEXT			= TEXTO					##	Da formato a un número y lo convierte en texto.
-TRIM			= ESPACIOS				##	Quita los espacios del texto.
-UPPER			= MAYUSC				##	Pone el texto en mayúsculas.
-VALUE			= VALOR					##	Convierte un argumento de texto en un número.
+ENCODEURL = URLCODIF
+FILTERXML = XMLFILTRO
+WEBSERVICE = SERVICIOWEB
+
+##
+## Funciones de compatibilidad (Compatibility Functions)
+##
+BETADIST = DISTR.BETA
+BETAINV = DISTR.BETA.INV
+BINOMDIST = DISTR.BINOM
+CEILING = MULTIPLO.SUPERIOR
+CHIDIST = DISTR.CHI
+CHIINV = PRUEBA.CHI.INV
+CHITEST = PRUEBA.CHI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INTERVALO.CONFIANZA
+COVAR = COVAR
+CRITBINOM = BINOM.CRIT
+EXPONDIST = DISTR.EXP
+FDIST = DISTR.F
+FINV = DISTR.F.INV
+FLOOR = MULTIPLO.INFERIOR
+FORECAST = PRONOSTICO
+FTEST = PRUEBA.F
+GAMMADIST = DISTR.GAMMA
+GAMMAINV = DISTR.GAMMA.INV
+HYPGEOMDIST = DISTR.HIPERGEOM
+LOGINV = DISTR.LOG.INV
+LOGNORMDIST = DISTR.LOG.NORM
+MODE = MODA
+NEGBINOMDIST = NEGBINOMDIST
+NORMDIST = DISTR.NORM
+NORMINV = DISTR.NORM.INV
+NORMSDIST = DISTR.NORM.ESTAND
+NORMSINV = DISTR.NORM.ESTAND.INV
+PERCENTILE = PERCENTIL
+PERCENTRANK = RANGO.PERCENTIL
+POISSON = POISSON
+QUARTILE = CUARTIL
+RANK = JERARQUIA
+STDEV = DESVEST
+STDEVP = DESVESTP
+TDIST = DISTR.T
+TINV = DISTR.T.INV
+TTEST = PRUEBA.T
+VAR = VAR
+VARP = VARP
+WEIBULL = DIST.WEIBULL
+ZTEST = PRUEBA.Z
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config
index 22aaf58b9..5388f9399 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Suomi (Finnish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= $	#	Symbol not known, should it be a € (Euro)?
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #TYHJÄ!
-DIV0	= #JAKO/0!
-VALUE	= #ARVO!
-REF	= #VIITTAUS!
-NAME	= #NIMI?
-NUM	= #LUKU!
-NA	= #PUUTTUU
+NULL = #TYHJÄ!
+DIV0 = #JAKO/0!
+VALUE = #ARVO!
+REF = #VIITTAUS!
+NAME = #NIMI?
+NUM = #LUKU!
+NA = #PUUTTUU!
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
index 289e0eaca..18f7c8c8b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
@@ -1,416 +1,538 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Suomi (Finnish)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Apuohjelma- ja automaatiofunktiot
+## Kuutiofunktiot (Cube Functions)
 ##
-GETPIVOTDATA		= NOUDA.PIVOT.TIEDOT		##	Palauttaa pivot-taulukkoraporttiin tallennettuja tietoja.
-
+CUBEKPIMEMBER = KUUTIOKPIJÄSEN
+CUBEMEMBER = KUUTIONJÄSEN
+CUBEMEMBERPROPERTY = KUUTIONJÄSENENOMINAISUUS
+CUBERANKEDMEMBER = KUUTIONLUOKITELTUJÄSEN
+CUBESET = KUUTIOJOUKKO
+CUBESETCOUNT = KUUTIOJOUKKOJENMÄÄRÄ
+CUBEVALUE = KUUTIONARVO
 
 ##
-##	Cube functions					Kuutiofunktiot
+## Tietokantafunktiot (Database Functions)
 ##
-CUBEKPIMEMBER		= KUUTIOKPIJÄSEN		##	Palauttaa suorituskykyilmaisimen (KPI) nimen, ominaisuuden sekä mitan ja näyttää nimen sekä ominaisuuden solussa. KPI on mitattavissa oleva suure, kuten kuukauden bruttotuotto tai vuosineljänneksen työntekijäkohtainen liikevaihto, joiden avulla tarkkaillaan organisaation suorituskykyä.
-CUBEMEMBER		= KUUTIONJÄSEN			##	Palauttaa kuutiohierarkian jäsenen tai monikon. Tällä funktiolla voit tarkistaa, että jäsen tai monikko on olemassa kuutiossa.
-CUBEMEMBERPROPERTY	= KUUTIONJÄSENENOMINAISUUS	##	Palauttaa kuution jäsenominaisuuden arvon. Tällä funktiolla voit tarkistaa, että nimi on olemassa kuutiossa, ja palauttaa tämän jäsenen määritetyn ominaisuuden.
-CUBERANKEDMEMBER	= KUUTIONLUOKITELTUJÄSEN	##	Palauttaa joukon n:nnen jäsenen. Tällä funktiolla voit palauttaa joukosta elementtejä, kuten parhaan myyjän tai 10 parasta opiskelijaa.
-CUBESET			= KUUTIOJOUKKO			##	Määrittää lasketun jäsen- tai monikkojoukon lähettämällä joukon lausekkeita palvelimessa olevalle kuutiolle. Palvelin luo joukon ja palauttaa sen Microsoft Office Excelille.
-CUBESETCOUNT		= KUUTIOJOUKKOJENMÄÄRÄ		##	Palauttaa joukon kohteiden määrän.
-CUBEVALUE		= KUUTIONARVO			##	Palauttaa koostetun arvon kuutiosta.
-
+DAVERAGE = TKESKIARVO
+DCOUNT = TLASKE
+DCOUNTA = TLASKEA
+DGET = TNOUDA
+DMAX = TMAKS
+DMIN = TMIN
+DPRODUCT = TTULO
+DSTDEV = TKESKIHAJONTA
+DSTDEVP = TKESKIHAJONTAP
+DSUM = TSUMMA
+DVAR = TVARIANSSI
+DVARP = TVARIANSSIP
 
 ##
-##	Database functions				Tietokantafunktiot
+## Päivämäärä- ja aikafunktiot (Date & Time Functions)
 ##
-DAVERAGE		= TKESKIARVO			##	Palauttaa valittujen tietokantamerkintöjen keskiarvon.
-DCOUNT			= TLASKE			##	Laskee tietokannan lukuja sisältävien solujen määrän.
-DCOUNTA			= TLASKEA			##	Laskee tietokannan tietoja sisältävien solujen määrän.
-DGET			= TNOUDA			##	Hakee määritettyjä ehtoja vastaavan tietueen tietokannasta.
-DMAX			= TMAKS				##	Palauttaa suurimman arvon tietokannasta valittujen arvojen joukosta.
-DMIN			= TMIN				##	Palauttaa pienimmän arvon tietokannasta valittujen arvojen joukosta.
-DPRODUCT		= TTULO				##	Kertoo määritetyn ehdon täyttävien tietokannan tietueiden tietyssä kentässä olevat arvot.
-DSTDEV			= TKESKIHAJONTA			##	Laskee keskihajonnan tietokannasta valituista arvoista muodostuvan otoksen perusteella.
-DSTDEVP			= TKESKIHAJONTAP		##	Laskee keskihajonnan tietokannasta valittujen arvojen koko populaation perusteella.
-DSUM			= TSUMMA			##	Lisää luvut määritetyn ehdon täyttävien tietokannan tietueiden kenttäsarakkeeseen.
-DVAR			= TVARIANSSI			##	Laskee varianssin tietokannasta valittujen arvojen otoksen perusteella.
-DVARP			= TVARIANSSIP			##	Laskee varianssin tietokannasta valittujen arvojen koko populaation perusteella.
-
+DATE = PÄIVÄYS
+DATEDIF = PVMERO
+DATESTRING = PVMMERKKIJONO
+DATEVALUE = PÄIVÄYSARVO
+DAY = PÄIVÄ
+DAYS = PÄIVÄT
+DAYS360 = PÄIVÄT360
+EDATE = PÄIVÄ.KUUKAUSI
+EOMONTH = KUUKAUSI.LOPPU
+HOUR = TUNNIT
+ISOWEEKNUM = VIIKKO.ISO.NRO
+MINUTE = MINUUTIT
+MONTH = KUUKAUSI
+NETWORKDAYS = TYÖPÄIVÄT
+NETWORKDAYS.INTL = TYÖPÄIVÄT.KANSVÄL
+NOW = NYT
+SECOND = SEKUNNIT
+THAIDAYOFWEEK = THAI.VIIKONPÄIVÄ
+THAIMONTHOFYEAR = THAI.KUUKAUSI
+THAIYEAR = THAI.VUOSI
+TIME = AIKA
+TIMEVALUE = AIKA_ARVO
+TODAY = TÄMÄ.PÄIVÄ
+WEEKDAY = VIIKONPÄIVÄ
+WEEKNUM = VIIKKO.NRO
+WORKDAY = TYÖPÄIVÄ
+WORKDAY.INTL = TYÖPÄIVÄ.KANSVÄL
+YEAR = VUOSI
+YEARFRAC = VUOSI.OSA
 
 ##
-##	Date and time functions				Päivämäärä- ja aikafunktiot
+## Tekniset funktiot (Engineering Functions)
 ##
-DATE			= PÄIVÄYS			##	Palauttaa annetun päivämäärän järjestysluvun.
-DATEVALUE		= PÄIVÄYSARVO			##	Muuntaa tekstimuodossa olevan päivämäärän järjestysluvuksi.
-DAY			= PÄIVÄ				##	Muuntaa järjestysluvun kuukauden päiväksi.
-DAYS360			= PÄIVÄT360			##	Laskee kahden päivämäärän välisten päivien määrän käyttäen perustana 360-päiväistä vuotta.
-EDATE			= PÄIVÄ.KUUKAUSI		##	Palauttaa järjestyslukuna päivämäärän, joka poikkeaa aloituspäivän päivämäärästä annetun kuukausimäärän verran joko eteen- tai taaksepäin.
-EOMONTH			= KUUKAUSI.LOPPU		##	Palauttaa järjestyslukuna sen kuukauden viimeisen päivämäärän, joka poikkeaa annetun kuukausimäärän verran eteen- tai taaksepäin.
-HOUR			= TUNNIT			##	Muuntaa järjestysluvun tunneiksi.
-MINUTE			= MINUUTIT			##	Muuntaa järjestysluvun minuuteiksi.
-MONTH			= KUUKAUSI			##	Muuntaa järjestysluvun kuukausiksi.
-NETWORKDAYS		= TYÖPÄIVÄT			##	Palauttaa kahden päivämäärän välissä olevien täysien työpäivien määrän.
-NOW			= NYT				##	Palauttaa kuluvan päivämäärän ja ajan järjestysnumeron.
-SECOND			= SEKUNNIT			##	Muuntaa järjestysluvun sekunneiksi.
-TIME			= AIKA				##	Palauttaa annetun kellonajan järjestysluvun.
-TIMEVALUE		= AIKA_ARVO			##	Muuntaa tekstimuodossa olevan kellonajan järjestysluvuksi.
-TODAY			= TÄMÄ.PÄIVÄ			##	Palauttaa kuluvan päivän päivämäärän järjestysluvun.
-WEEKDAY			= VIIKONPÄIVÄ			##	Muuntaa järjestysluvun viikonpäiväksi.
-WEEKNUM			= VIIKKO.NRO			##	Muuntaa järjestysluvun luvuksi, joka ilmaisee viikon järjestysluvun vuoden alusta laskettuna.
-WORKDAY			= TYÖPÄIVÄ			##	Palauttaa järjestysluvun päivämäärälle, joka sijaitsee annettujen työpäivien verran eteen tai taaksepäin.
-YEAR			= VUOSI				##	Muuntaa järjestysluvun vuosiksi.
-YEARFRAC		= VUOSI.OSA			##	Palauttaa määritettyjen päivämäärien (aloituspäivä ja lopetuspäivä) välisen osan vuodesta.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINDES
+BIN2HEX = BINHEKSA
+BIN2OCT = BINOKT
+BITAND = BITTI.JA
+BITLSHIFT = BITTI.SIIRTO.V
+BITOR = BITTI.TAI
+BITRSHIFT = BITTI.SIIRTO.O
+BITXOR = BITTI.EHDOTON.TAI
+COMPLEX = KOMPLEKSI
+CONVERT = MUUNNA
+DEC2BIN = DESBIN
+DEC2HEX = DESHEKSA
+DEC2OCT = DESOKT
+DELTA = SAMA.ARVO
+ERF = VIRHEFUNKTIO
+ERF.PRECISE = VIRHEFUNKTIO.TARKKA
+ERFC = VIRHEFUNKTIO.KOMPLEMENTTI
+ERFC.PRECISE = VIRHEFUNKTIO.KOMPLEMENTTI.TARKKA
+GESTEP = RAJA
+HEX2BIN = HEKSABIN
+HEX2DEC = HEKSADES
+HEX2OCT = HEKSAOKT
+IMABS = KOMPLEKSI.ABS
+IMAGINARY = KOMPLEKSI.IMAG
+IMARGUMENT = KOMPLEKSI.ARG
+IMCONJUGATE = KOMPLEKSI.KONJ
+IMCOS = KOMPLEKSI.COS
+IMCOSH = IMCOSH
+IMCOT = KOMPLEKSI.COT
+IMCSC = KOMPLEKSI.KOSEK
+IMCSCH = KOMPLEKSI.KOSEKH
+IMDIV = KOMPLEKSI.OSAM
+IMEXP = KOMPLEKSI.EKSP
+IMLN = KOMPLEKSI.LN
+IMLOG10 = KOMPLEKSI.LOG10
+IMLOG2 = KOMPLEKSI.LOG2
+IMPOWER = KOMPLEKSI.POT
+IMPRODUCT = KOMPLEKSI.TULO
+IMREAL = KOMPLEKSI.REAALI
+IMSEC = KOMPLEKSI.SEK
+IMSECH = KOMPLEKSI.SEKH
+IMSIN = KOMPLEKSI.SIN
+IMSINH = KOMPLEKSI.SINH
+IMSQRT = KOMPLEKSI.NELIÖJ
+IMSUB = KOMPLEKSI.EROTUS
+IMSUM = KOMPLEKSI.SUM
+IMTAN = KOMPLEKSI.TAN
+OCT2BIN = OKTBIN
+OCT2DEC = OKTDES
+OCT2HEX = OKTHEKSA
 
 ##
-##	Engineering functions				Tekniset funktiot
+## Rahoitusfunktiot (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Palauttaa muunnetun Bessel-funktion In(x).
-BESSELJ			= BESSELJ			##	Palauttaa Bessel-funktion Jn(x).
-BESSELK			= BESSELK			##	Palauttaa muunnetun Bessel-funktion Kn(x).
-BESSELY			= BESSELY			##	Palauttaa Bessel-funktion Yn(x).
-BIN2DEC			= BINDES			##	Muuntaa binaariluvun desimaaliluvuksi.
-BIN2HEX			= BINHEKSA			##	Muuntaa binaariluvun heksadesimaaliluvuksi.
-BIN2OCT			= BINOKT			##	Muuntaa binaariluvun oktaaliluvuksi.
-COMPLEX			= KOMPLEKSI			##	Muuntaa reaali- ja imaginaariosien kertoimet kompleksiluvuksi.
-CONVERT			= MUUNNA			##	Muuntaa luvun toisen mittajärjestelmän mukaiseksi.
-DEC2BIN			= DESBIN			##	Muuntaa desimaaliluvun binaariluvuksi.
-DEC2HEX			= DESHEKSA			##	Muuntaa kymmenjärjestelmän luvun heksadesimaaliluvuksi.
-DEC2OCT			= DESOKT			##	Muuntaa kymmenjärjestelmän luvun oktaaliluvuksi.
-DELTA			= SAMA.ARVO			##	Tarkistaa, ovatko kaksi arvoa yhtä suuria.
-ERF			= VIRHEFUNKTIO			##	Palauttaa virhefunktion.
-ERFC			= VIRHEFUNKTIO.KOMPLEMENTTI	##	Palauttaa komplementtivirhefunktion.
-GESTEP			= RAJA				##	Testaa, onko luku suurempi kuin kynnysarvo.
-HEX2BIN			= HEKSABIN			##	Muuntaa heksadesimaaliluvun binaariluvuksi.
-HEX2DEC			= HEKSADES			##	Muuntaa heksadesimaaliluvun desimaaliluvuksi.
-HEX2OCT			= HEKSAOKT			##	Muuntaa heksadesimaaliluvun oktaaliluvuksi.
-IMABS			= KOMPLEKSI.ITSEISARVO		##	Palauttaa kompleksiluvun itseisarvon (moduluksen).
-IMAGINARY		= KOMPLEKSI.IMAG		##	Palauttaa kompleksiluvun imaginaariosan kertoimen.
-IMARGUMENT		= KOMPLEKSI.ARG			##	Palauttaa theeta-argumentin, joka on radiaaneina annettu kulma.
-IMCONJUGATE		= KOMPLEKSI.KONJ		##	Palauttaa kompleksiluvun konjugaattiluvun.
-IMCOS			= KOMPLEKSI.COS			##	Palauttaa kompleksiluvun kosinin.
-IMDIV			= KOMPLEKSI.OSAM		##	Palauttaa kahden kompleksiluvun osamäärän.
-IMEXP			= KOMPLEKSI.EKSP		##	Palauttaa kompleksiluvun eksponentin.
-IMLN			= KOMPLEKSI.LN			##	Palauttaa kompleksiluvun luonnollisen logaritmin.
-IMLOG10			= KOMPLEKSI.LOG10		##	Palauttaa kompleksiluvun kymmenkantaisen logaritmin.
-IMLOG2			= KOMPLEKSI.LOG2		##	Palauttaa kompleksiluvun kaksikantaisen logaritmin.
-IMPOWER			= KOMPLEKSI.POT			##	Palauttaa kokonaislukupotenssiin korotetun kompleksiluvun.
-IMPRODUCT		= KOMPLEKSI.TULO		##	Palauttaa kompleksilukujen tulon.
-IMREAL			= KOMPLEKSI.REAALI		##	Palauttaa kompleksiluvun reaaliosan kertoimen.
-IMSIN			= KOMPLEKSI.SIN			##	Palauttaa kompleksiluvun sinin.
-IMSQRT			= KOMPLEKSI.NELIÖJ		##	Palauttaa kompleksiluvun neliöjuuren.
-IMSUB			= KOMPLEKSI.EROTUS		##	Palauttaa kahden kompleksiluvun erotuksen.
-IMSUM			= KOMPLEKSI.SUM			##	Palauttaa kompleksilukujen summan.
-OCT2BIN			= OKTBIN			##	Muuntaa oktaaliluvun binaariluvuksi.
-OCT2DEC			= OKTDES			##	Muuntaa oktaaliluvun desimaaliluvuksi.
-OCT2HEX			= OKTHEKSA			##	Muuntaa oktaaliluvun heksadesimaaliluvuksi.
-
+ACCRINT = KERTYNYT.KORKO
+ACCRINTM = KERTYNYT.KORKO.LOPUSSA
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KORKOPÄIVÄT.ALUSTA
+COUPDAYS = KORKOPÄIVÄT
+COUPDAYSNC = KORKOPÄIVÄT.SEURAAVA
+COUPNCD = KORKOPÄIVÄ.SEURAAVA
+COUPNUM = KORKOPÄIVÄ.JAKSOT
+COUPPCD = KORKOPÄIVÄ.EDELLINEN
+CUMIPMT = MAKSETTU.KORKO
+CUMPRINC = MAKSETTU.LYHENNYS
+DB = DB
+DDB = DDB
+DISC = DISKONTTOKORKO
+DOLLARDE = VALUUTTA.DES
+DOLLARFR = VALUUTTA.MURTO
+DURATION = KESTO
+EFFECT = KORKO.EFEKT
+FV = TULEVA.ARVO
+FVSCHEDULE = TULEVA.ARVO.ERIKORKO
+INTRATE = KORKO.ARVOPAPERI
+IPMT = IPMT
+IRR = SISÄINEN.KORKO
+ISPMT = ISPMT
+MDURATION = KESTO.MUUNN
+MIRR = MSISÄINEN
+NOMINAL = KORKO.VUOSI
+NPER = NJAKSO
+NPV = NNA
+ODDFPRICE = PARITON.ENS.NIMELLISARVO
+ODDFYIELD = PARITON.ENS.TUOTTO
+ODDLPRICE = PARITON.VIIM.NIMELLISARVO
+ODDLYIELD = PARITON.VIIM.TUOTTO
+PDURATION = KESTO.JAKSO
+PMT = MAKSU
+PPMT = PPMT
+PRICE = HINTA
+PRICEDISC = HINTA.DISK
+PRICEMAT = HINTA.LUNASTUS
+PV = NA
+RATE = KORKO
+RECEIVED = SAATU.HINTA
+RRI = TOT.ROI
+SLN = STP
+SYD = VUOSIPOISTO
+TBILLEQ = OBLIG.TUOTTOPROS
+TBILLPRICE = OBLIG.HINTA
+TBILLYIELD = OBLIG.TUOTTO
+VDB = VDB
+XIRR = SISÄINEN.KORKO.JAKSOTON
+XNPV = NNA.JAKSOTON
+YIELD = TUOTTO
+YIELDDISC = TUOTTO.DISK
+YIELDMAT = TUOTTO.ERÄP
 
 ##
-##	Financial functions				Rahoitusfunktiot
+## Tietofunktiot (Information Functions)
 ##
-ACCRINT			= KERTYNYT.KORKO		##	Laskee arvopaperille kertyneen koron, kun korko kertyy säännöllisin väliajoin.
-ACCRINTM		= KERTYNYT.KORKO.LOPUSSA	##	Laskee arvopaperille kertyneen koron, kun korko maksetaan eräpäivänä.
-AMORDEGRC		= AMORDEGRC			##	Laskee kunkin laskentakauden poiston poistokerrointa käyttämällä.
-AMORLINC		= AMORLINC			##	Palauttaa kunkin laskentakauden poiston.
-COUPDAYBS		= KORKOPÄIVÄT.ALUSTA		##	Palauttaa koronmaksukauden aloituspäivän ja tilityspäivän välisen ajanjakson päivien määrän.
-COUPDAYS		= KORKOPÄIVÄT			##	Palauttaa päivien määrän koronmaksukaudelta, johon tilityspäivä kuuluu.
-COUPDAYSNC		= KORKOPÄIVÄT.SEURAAVA		##	Palauttaa tilityspäivän ja seuraavan koronmaksupäivän välisen ajanjakson päivien määrän.
-COUPNCD			= KORKOMAKSU.SEURAAVA		##	Palauttaa tilityspäivän jälkeisen seuraavan koronmaksupäivän.
-COUPNUM			= KORKOPÄIVÄJAKSOT		##	Palauttaa arvopaperin ostopäivän ja erääntymispäivän välisten koronmaksupäivien määrän.
-COUPPCD			= KORKOPÄIVÄ.EDELLINEN		##	Palauttaa tilityspäivää edeltävän koronmaksupäivän.
-CUMIPMT			= MAKSETTU.KORKO		##	Palauttaa kahden jakson välisenä aikana kertyneen koron.
-CUMPRINC		= MAKSETTU.LYHENNYS		##	Palauttaa lainalle kahden jakson välisenä aikana kertyneen lyhennyksen.
-DB			= DB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-DDB			= DDB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DDB-menetelmän (Double-Declining Balance) tai jonkin muun määrittämäsi menetelmän mukaan.
-DISC			= DISKONTTOKORKO		##	Palauttaa arvopaperin diskonttokoron.
-DOLLARDE		= VALUUTTA.DES			##	Muuntaa murtolukuna ilmoitetun valuuttamäärän desimaaliluvuksi.
-DOLLARFR		= VALUUTTA.MURTO		##	Muuntaa desimaalilukuna ilmaistun valuuttamäärän murtoluvuksi.
-DURATION		= KESTO				##	Palauttaa keston arvopaperille, jonka koronmaksu tapahtuu säännöllisesti.
-EFFECT			= KORKO.EFEKT			##	Palauttaa todellisen vuosikoron.
-FV			= TULEVA.ARVO			##	Palauttaa sijoituksen tulevan arvon.
-FVSCHEDULE		= TULEVA.ARVO.ERIKORKO		##	Palauttaa pääoman tulevan arvon, kun pääomalle on kertynyt korkoa vaihtelevasti.
-INTRATE			= KORKO.ARVOPAPERI		##	Palauttaa arvopaperin korkokannan täysin sijoitetulle arvopaperille.
-IPMT			= IPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona kertyvän koron.
-IRR			= SISÄINEN.KORKO		##	Laskee sisäisen korkokannan kassavirrasta muodostuvalle sarjalle.
-ISPMT			= ONMAKSU			##	Laskee sijoituksen maksetun koron tietyllä jaksolla.
-MDURATION		= KESTO.MUUNN			##	Palauttaa muunnetun Macauley-keston arvopaperille, jonka oletettu nimellisarvo on 100 euroa.
-MIRR			= MSISÄINEN			##	Palauttaa sisäisen korkokannan, kun positiivisten ja negatiivisten kassavirtojen rahoituskorko on erilainen.
-NOMINAL			= KORKO.VUOSI			##	Palauttaa vuosittaisen nimelliskoron.
-NPER			= NJAKSO			##	Palauttaa sijoituksen jaksojen määrän.
-NPV			= NNA				##	Palauttaa sijoituksen nykyarvon toistuvista kassavirroista muodostuvan sarjan ja diskonttokoron perusteella.
-ODDFPRICE		= PARITON.ENS.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDFYIELD		= PARITON.ENS.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDLPRICE		= PARITON.VIIM.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa viimeinen jakso on pariton.
-ODDLYIELD		= PARITON.VIIM.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa viimeinen jakso on pariton.
-PMT			= MAKSU				##	Palauttaa annuiteetin kausittaisen maksuerän.
-PPMT			= PPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona maksettavan lyhennyksen.
-PRICE			= HINTA				##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-PRICEDISC		= HINTA.DISK			##	Palauttaa diskontatun arvopaperin hinnan 100 euron nimellisarvoa kohden.
-PRICEMAT		= HINTA.LUNASTUS		##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan erääntymispäivänä.
-PV			= NA				##	Palauttaa sijoituksen nykyarvon.
-RATE			= KORKO				##	Palauttaa annuiteetin kausittaisen korkokannan.
-RECEIVED		= SAATU.HINTA			##	Palauttaa arvopaperin tuoton erääntymispäivänä kokonaan maksetulle sijoitukselle.
-SLN			= STP				##	Palauttaa sijoituksen tasapoiston yhdeltä jaksolta.
-SYD			= VUOSIPOISTO			##	Palauttaa sijoituksen vuosipoiston annettuna kautena amerikkalaisen SYD-menetelmän (Sum-of-Year's Digits) avulla.
-TBILLEQ			= OBLIG.TUOTTOPROS		##	Palauttaa valtion obligaation tuoton vastaavana joukkovelkakirjan tuottona.
-TBILLPRICE		= OBLIG.HINTA			##	Palauttaa obligaation hinnan 100 euron nimellisarvoa kohden.
-TBILLYIELD		= OBLIG.TUOTTO			##	Palauttaa obligaation tuoton.
-VDB			= VDB				##	Palauttaa annetun kauden tai kauden osan kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-XIRR			= SISÄINEN.KORKO.JAKSOTON	##	Palauttaa sisäisen korkokannan kassavirtojen sarjoille, jotka eivät välttämättä ole säännöllisiä.
-XNPV			= NNA.JAKSOTON			##	Palauttaa nettonykyarvon kassavirtasarjalle, joka ei välttämättä ole kausittainen.
-YIELD			= TUOTTO			##	Palauttaa tuoton arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-YIELDDISC		= TUOTTO.DISK			##	Palauttaa diskontatun arvopaperin, kuten obligaation, vuosittaisen tuoton.
-YIELDMAT		= TUOTTO.ERÄP			##	Palauttaa erääntymispäivänään korkoa tuottavan arvopaperin vuosittaisen tuoton.
-
+CELL = SOLU
+ERROR.TYPE = VIRHEEN.LAJI
+INFO = KUVAUS
+ISBLANK = ONTYHJÄ
+ISERR = ONVIRH
+ISERROR = ONVIRHE
+ISEVEN = ONPARILLINEN
+ISFORMULA = ONKAAVA
+ISLOGICAL = ONTOTUUS
+ISNA = ONPUUTTUU
+ISNONTEXT = ONEI_TEKSTI
+ISNUMBER = ONLUKU
+ISODD = ONPARITON
+ISREF = ONVIITT
+ISTEXT = ONTEKSTI
+N = N
+NA = PUUTTUU
+SHEET = TAULUKKO
+SHEETS = TAULUKOT
+TYPE = TYYPPI
 
 ##
-##	Information functions				Erikoisfunktiot
+## Loogiset funktiot (Logical Functions)
 ##
-CELL			= SOLU				##	Palauttaa tietoja solun muotoilusta, sijainnista ja sisällöstä.
-ERROR.TYPE		= VIRHEEN.LAJI			##	Palauttaa virhetyyppiä vastaavan luvun.
-INFO			= KUVAUS			##	Palauttaa tietoja nykyisestä käyttöympäristöstä.
-ISBLANK			= ONTYHJÄ			##	Palauttaa arvon TOSI, jos arvo on tyhjä.
-ISERR			= ONVIRH			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo paitsi arvo #PUUTTUU!.
-ISERROR			= ONVIRHE			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo.
-ISEVEN			= ONPARILLINEN			##	Palauttaa arvon TOSI, jos arvo on parillinen.
-ISLOGICAL		= ONTOTUUS			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa looginen arvo.
-ISNA			= ONPUUTTUU			##	Palauttaa arvon TOSI, jos virhearvo on #PUUTTUU!.
-ISNONTEXT		= ONEI_TEKSTI			##	Palauttaa arvon TOSI, jos arvo ei ole teksti.
-ISNUMBER		= ONLUKU			##	Palauttaa arvon TOSI, jos arvo on luku.
-ISODD			= ONPARITON			##	Palauttaa arvon TOSI, jos arvo on pariton.
-ISREF			= ONVIITT			##	Palauttaa arvon TOSI, jos arvo on viittaus.
-ISTEXT			= ONTEKSTI			##	Palauttaa arvon TOSI, jos arvo on teksti.
-N			= N				##	Palauttaa arvon luvuksi muunnettuna.
-NA			= PUUTTUU			##	Palauttaa virhearvon #PUUTTUU!.
-TYPE			= TYYPPI			##	Palauttaa luvun, joka ilmaisee arvon tietotyypin.
-
+AND = JA
+FALSE = EPÄTOSI
+IF = JOS
+IFERROR = JOSVIRHE
+IFNA = JOSPUUTTUU
+IFS = JOSS
+NOT = EI
+OR = TAI
+SWITCH = MUUTA
+TRUE = TOSI
+XOR = EHDOTON.TAI
 
 ##
-##	Logical functions				Loogiset funktiot
+## Haku- ja viitefunktiot (Lookup & Reference Functions)
 ##
-AND			= JA				##	Palauttaa arvon TOSI, jos kaikkien argumenttien arvo on TOSI.
-FALSE			= EPÄTOSI			##	Palauttaa totuusarvon EPÄTOSI.
-IF			= JOS				##	Määrittää suoritettavan loogisen testin.
-IFERROR			= JOSVIRHE			##	Palauttaa määrittämäsi arvon, jos kaavan tulos on virhe; muussa tapauksessa palauttaa kaavan tuloksen.
-NOT			= EI				##	Kääntää argumentin loogisen arvon.
-OR			= TAI				##	Palauttaa arvon TOSI, jos minkä tahansa argumentin arvo on TOSI.
-TRUE			= TOSI				##	Palauttaa totuusarvon TOSI.
-
+ADDRESS = OSOITE
+AREAS = ALUEET
+CHOOSE = VALITSE.INDEKSI
+COLUMN = SARAKE
+COLUMNS = SARAKKEET
+FORMULATEXT = KAAVA.TEKSTI
+GETPIVOTDATA = NOUDA.PIVOT.TIEDOT
+HLOOKUP = VHAKU
+HYPERLINK = HYPERLINKKI
+INDEX = INDEKSI
+INDIRECT = EPÄSUORA
+LOOKUP = HAKU
+MATCH = VASTINE
+OFFSET = SIIRTYMÄ
+ROW = RIVI
+ROWS = RIVIT
+RTD = RTD
+TRANSPOSE = TRANSPONOI
+VLOOKUP = PHAKU
+*RC = RS
 
 ##
-##	Lookup and reference functions			Haku- ja viitefunktiot
+## Matemaattiset ja trigonometriset funktiot (Math & Trig Functions)
 ##
-ADDRESS			= OSOITE			##	Palauttaa laskentataulukon soluun osoittavan viittauksen tekstinä.
-AREAS			= ALUEET			##	Palauttaa viittauksessa olevien alueiden määrän.
-CHOOSE			= VALITSE.INDEKSI		##	Valitsee arvon arvoluettelosta.
-COLUMN			= SARAKE			##	Palauttaa viittauksen sarakenumeron.
-COLUMNS			= SARAKKEET			##	Palauttaa viittauksessa olevien sarakkeiden määrän.
-HLOOKUP			= VHAKU				##	Suorittaa haun matriisin ylimmältä riviltä ja palauttaa määritetyn solun arvon.
-HYPERLINK		= HYPERLINKKI			##	Luo pikakuvakkeen tai tekstin, joka avaa verkkopalvelimeen, intranetiin tai Internetiin tallennetun tiedoston.
-INDEX			= INDEKSI			##	Valitsee arvon viittauksesta tai matriisista indeksin mukaan.
-INDIRECT		= EPÄSUORA			##	Palauttaa tekstiarvona ilmaistun viittauksen.
-LOOKUP			= HAKU				##	Etsii arvoja vektorista tai matriisista.
-MATCH			= VASTINE			##	Etsii arvoja viittauksesta tai matriisista.
-OFFSET			= SIIRTYMÄ			##	Palauttaa annetun viittauksen siirtymän.
-ROW			= RIVI				##	Palauttaa viittauksen rivinumeron.
-ROWS			= RIVIT				##	Palauttaa viittauksessa olevien rivien määrän.
-RTD			= RTD				##	Noutaa COM-automaatiota (automaatio: Tapa käsitellä sovelluksen objekteja toisesta sovelluksesta tai kehitystyökalusta. Automaatio, jota aiemmin kutsuttiin OLE-automaatioksi, on teollisuusstandardi ja COM-mallin (Component Object Model) ominaisuus.) tukevasta ohjelmasta reaaliaikaisia tietoja.
-TRANSPOSE		= TRANSPONOI			##	Palauttaa matriisin käänteismatriisin.
-VLOOKUP			= PHAKU				##	Suorittaa haun matriisin ensimmäisestä sarakkeesta ja palauttaa rivillä olevan solun arvon.
-
+ABS = ITSEISARVO
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = KOOSTE
+ARABIC = ARABIA
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = PERUS
+CEILING.MATH = PYÖRISTÄ.KERR.YLÖS.MATEMAATTINEN
+CEILING.PRECISE = PYÖRISTÄ.KERR.YLÖS.TARKKA
+COMBIN = KOMBINAATIO
+COMBINA = KOMBINAATIOA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = KOSEK
+CSCH = KOSEKH
+DECIMAL = DESIMAALI
+DEGREES = ASTEET
+ECMA.CEILING = ECMA.PYÖRISTÄ.KERR.YLÖS
+EVEN = PARILLINEN
+EXP = EKSPONENTTI
+FACT = KERTOMA
+FACTDOUBLE = KERTOMA.OSA
+FLOOR.MATH = PYÖRISTÄ.KERR.ALAS.MATEMAATTINEN
+FLOOR.PRECISE = PYÖRISTÄ.KERR.ALAS.TARKKA
+GCD = SUURIN.YHT.TEKIJÄ
+INT = KOKONAISLUKU
+ISO.CEILING = ISO.PYÖRISTÄ.KERR.YLÖS
+LCM = PIENIN.YHT.JAETTAVA
+LN = LUONNLOG
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MKÄÄNTEINEN
+MMULT = MKERRO
+MOD = JAKOJ
+MROUND = PYÖRISTÄ.KERR
+MULTINOMIAL = MULTINOMI
+MUNIT = YKSIKKÖM
+ODD = PARITON
+PI = PII
+POWER = POTENSSI
+PRODUCT = TULO
+QUOTIENT = OSAMÄÄRÄ
+RADIANS = RADIAANIT
+RAND = SATUNNAISLUKU
+RANDBETWEEN = SATUNNAISLUKU.VÄLILTÄ
+ROMAN = ROMAN
+ROUND = PYÖRISTÄ
+ROUNDBAHTDOWN = PYÖRISTÄ.BAHT.ALAS
+ROUNDBAHTUP = PYÖRISTÄ.BAHT.YLÖS
+ROUNDDOWN = PYÖRISTÄ.DES.ALAS
+ROUNDUP = PYÖRISTÄ.DES.YLÖS
+SEC = SEK
+SECH = SEKH
+SERIESSUM = SARJA.SUMMA
+SIGN = ETUMERKKI
+SIN = SIN
+SINH = SINH
+SQRT = NELIÖJUURI
+SQRTPI = NELIÖJUURI.PII
+SUBTOTAL = VÄLISUMMA
+SUM = SUMMA
+SUMIF = SUMMA.JOS
+SUMIFS = SUMMA.JOS.JOUKKO
+SUMPRODUCT = TULOJEN.SUMMA
+SUMSQ = NELIÖSUMMA
+SUMX2MY2 = NELIÖSUMMIEN.EROTUS
+SUMX2PY2 = NELIÖSUMMIEN.SUMMA
+SUMXMY2 = EROTUSTEN.NELIÖSUMMA
+TAN = TAN
+TANH = TANH
+TRUNC = KATKAISE
 
 ##
-##	Math and trigonometry functions			Matemaattiset ja trigonometriset funktiot
+## Tilastolliset funktiot (Statistical Functions)
 ##
-ABS			= ITSEISARVO			##	Palauttaa luvun itseisarvon.
-ACOS			= ACOS				##	Palauttaa luvun arkuskosinin.
-ACOSH			= ACOSH				##	Palauttaa luvun käänteisen hyperbolisen kosinin.
-ASIN			= ASIN				##	Palauttaa luvun arkussinin.
-ASINH			= ASINH				##	Palauttaa luvun käänteisen hyperbolisen sinin.
-ATAN			= ATAN				##	Palauttaa luvun arkustangentin.
-ATAN2			= ATAN2				##	Palauttaa arkustangentin x- ja y-koordinaatin perusteella.
-ATANH			= ATANH				##	Palauttaa luvun käänteisen hyperbolisen tangentin.
-CEILING			= PYÖRISTÄ.KERR.YLÖS		##	Pyöristää luvun lähimpään kokonaislukuun tai tarkkuusargumentin lähimpään kerrannaiseen.
-COMBIN			= KOMBINAATIO			##	Palauttaa mahdollisten kombinaatioiden määrän annetulle objektien määrälle.
-COS			= COS				##	Palauttaa luvun kosinin.
-COSH			= COSH				##	Palauttaa luvun hyperbolisen kosinin.
-DEGREES			= ASTEET			##	Muuntaa radiaanit asteiksi.
-EVEN			= PARILLINEN			##	Pyöristää luvun ylöspäin lähimpään parilliseen kokonaislukuun.
-EXP			= EKSPONENTTI			##	Palauttaa e:n korotettuna annetun luvun osoittamaan potenssiin.
-FACT			= KERTOMA			##	Palauttaa luvun kertoman.
-FACTDOUBLE		= KERTOMA.OSA			##	Palauttaa luvun osakertoman.
-FLOOR			= PYÖRISTÄ.KERR.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-GCD			= SUURIN.YHT.TEKIJÄ		##	Palauttaa suurimman yhteisen tekijän.
-INT			= KOKONAISLUKU			##	Pyöristää luvun alaspäin lähimpään kokonaislukuun.
-LCM			= PIENIN.YHT.JAETTAVA		##	Palauttaa pienimmän yhteisen tekijän.
-LN			= LUONNLOG			##	Palauttaa luvun luonnollisen logaritmin.
-LOG			= LOG				##	Laskee luvun logaritmin käyttämällä annettua kantalukua.
-LOG10			= LOG10				##	Palauttaa luvun kymmenkantaisen logaritmin.
-MDETERM			= MDETERM			##	Palauttaa matriisin matriisideterminantin.
-MINVERSE		= MKÄÄNTEINEN			##	Palauttaa matriisin käänteismatriisin.
-MMULT			= MKERRO			##	Palauttaa kahden matriisin tulon.
-MOD			= JAKOJ				##	Palauttaa jakolaskun jäännöksen.
-MROUND			= PYÖRISTÄ.KERR			##	Palauttaa luvun pyöristettynä annetun luvun kerrannaiseen.
-MULTINOMIAL		= MULTINOMI			##	Palauttaa lukujoukon multinomin.
-ODD			= PARITON			##	Pyöristää luvun ylöspäin lähimpään parittomaan kokonaislukuun.
-PI			= PII				##	Palauttaa piin arvon.
-POWER			= POTENSSI			##	Palauttaa luvun korotettuna haluttuun potenssiin.
-PRODUCT			= TULO				##	Kertoo annetut argumentit.
-QUOTIENT		= OSAMÄÄRÄ			##	Palauttaa osamäärän kokonaislukuosan.
-RADIANS			= RADIAANIT			##	Muuntaa asteet radiaaneiksi.
-RAND			= SATUNNAISLUKU			##	Palauttaa satunnaisluvun väliltä 0–1.
-RANDBETWEEN		= SATUNNAISLUKU.VÄLILTÄ		##	Palauttaa satunnaisluvun määritettyjen lukujen väliltä.
-ROMAN			= ROMAN				##	Muuntaa arabialaisen numeron tekstimuotoiseksi roomalaiseksi numeroksi.
-ROUND			= PYÖRISTÄ			##	Pyöristää luvun annettuun määrään desimaaleja.
-ROUNDDOWN		= PYÖRISTÄ.DES.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-ROUNDUP			= PYÖRISTÄ.DES.YLÖS		##	Pyöristää luvun ylöspäin (poispäin nollasta).
-SERIESSUM		= SARJA.SUMMA			##	Palauttaa kaavaan perustuvan potenssisarjan arvon.
-SIGN			= ETUMERKKI			##	Palauttaa luvun etumerkin.
-SIN			= SIN				##	Palauttaa annetun kulman sinin.
-SINH			= SINH				##	Palauttaa luvun hyperbolisen sinin.
-SQRT			= NELIÖJUURI			##	Palauttaa positiivisen neliöjuuren.
-SQRTPI			= NELIÖJUURI.PII		##	Palauttaa tulon (luku * pii) neliöjuuren.
-SUBTOTAL		= VÄLISUMMA			##	Palauttaa luettelon tai tietokannan välisumman.
-SUM			= SUMMA				##	Laskee yhteen annetut argumentit.
-SUMIF			= SUMMA.JOS			##	Laskee ehdot täyttävien solujen summan.
-SUMIFS			= SUMMA.JOS.JOUKKO		##	Laskee yhteen solualueen useita ehtoja vastaavat solut.
-SUMPRODUCT		= TULOJEN.SUMMA			##	Palauttaa matriisin toisiaan vastaavien osien tulojen summan.
-SUMSQ			= NELIÖSUMMA			##	Palauttaa argumenttien neliöiden summan.
-SUMX2MY2		= NELIÖSUMMIEN.EROTUS		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen laskettujen neliösummien erotuksen.
-SUMX2PY2		= NELIÖSUMMIEN.SUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen neliösummien summan.
-SUMXMY2			= EROTUSTEN.NELIÖSUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen erotusten neliösumman.
-TAN			= TAN				##	Palauttaa luvun tangentin.
-TANH			= TANH				##	Palauttaa luvun hyperbolisen tangentin.
-TRUNC			= KATKAISE			##	Katkaisee luvun kokonaisluvuksi.
-
+AVEDEV = KESKIPOIKKEAMA
+AVERAGE = KESKIARVO
+AVERAGEA = KESKIARVOA
+AVERAGEIF = KESKIARVO.JOS
+AVERAGEIFS = KESKIARVO.JOS.JOUKKO
+BETA.DIST = BEETA.JAKAUMA
+BETA.INV = BEETA.KÄÄNT
+BINOM.DIST = BINOMI.JAKAUMA
+BINOM.DIST.RANGE = BINOMI.JAKAUMA.ALUE
+BINOM.INV = BINOMIJAKAUMA.KÄÄNT
+CHISQ.DIST = CHINELIÖ.JAKAUMA
+CHISQ.DIST.RT = CHINELIÖ.JAKAUMA.OH
+CHISQ.INV = CHINELIÖ.KÄÄNT
+CHISQ.INV.RT = CHINELIÖ.KÄÄNT.OH
+CHISQ.TEST = CHINELIÖ.TESTI
+CONFIDENCE.NORM = LUOTTAMUSVÄLI.NORM
+CONFIDENCE.T = LUOTTAMUSVÄLI.T
+CORREL = KORRELAATIO
+COUNT = LASKE
+COUNTA = LASKE.A
+COUNTBLANK = LASKE.TYHJÄT
+COUNTIF = LASKE.JOS
+COUNTIFS = LASKE.JOS.JOUKKO
+COVARIANCE.P = KOVARIANSSI.P
+COVARIANCE.S = KOVARIANSSI.S
+DEVSQ = OIKAISTU.NELIÖSUMMA
+EXPON.DIST = EKSPONENTIAALI.JAKAUMA
+F.DIST = F.JAKAUMA
+F.DIST.RT = F.JAKAUMA.OH
+F.INV = F.KÄÄNT
+F.INV.RT = F.KÄÄNT.OH
+F.TEST = F.TESTI
+FISHER = FISHER
+FISHERINV = FISHER.KÄÄNT
+FORECAST.ETS = ENNUSTE.ETS
+FORECAST.ETS.CONFINT = ENNUSTE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = ENNUSTE.ETS.KAUSIVAIHTELU
+FORECAST.ETS.STAT = ENNUSTE.ETS.STAT
+FORECAST.LINEAR = ENNUSTE.LINEAARINEN
+FREQUENCY = TAAJUUS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.JAKAUMA
+GAMMA.INV = GAMMA.JAKAUMA.KÄÄNT
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.TARKKA
+GAUSS = GAUSS
+GEOMEAN = KESKIARVO.GEOM
+GROWTH = KASVU
+HARMEAN = KESKIARVO.HARM
+HYPGEOM.DIST = HYPERGEOM_JAKAUMA
+INTERCEPT = LEIKKAUSPISTE
+KURT = KURT
+LARGE = SUURI
+LINEST = LINREGR
+LOGEST = LOGREGR
+LOGNORM.DIST = LOGNORM_JAKAUMA
+LOGNORM.INV = LOGNORM.KÄÄNT
+MAX = MAKS
+MAXA = MAKSA
+MAXIFS = MAKS.JOS
+MEDIAN = MEDIAANI
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.JOS
+MODE.MULT = MOODI.USEA
+MODE.SNGL = MOODI.YKSI
+NEGBINOM.DIST = BINOMI.JAKAUMA.NEG
+NORM.DIST = NORMAALI.JAKAUMA
+NORM.INV = NORMAALI.JAKAUMA.KÄÄNT
+NORM.S.DIST = NORM_JAKAUMA.NORMIT
+NORM.S.INV = NORM_JAKAUMA.KÄÄNT
+PEARSON = PEARSON
+PERCENTILE.EXC = PROSENTTIPISTE.ULK
+PERCENTILE.INC = PROSENTTIPISTE.SIS
+PERCENTRANK.EXC = PROSENTTIJÄRJESTYS.ULK
+PERCENTRANK.INC = PROSENTTIJÄRJESTYS.SIS
+PERMUT = PERMUTAATIO
+PERMUTATIONA = PERMUTAATIOA
+PHI = FII
+POISSON.DIST = POISSON.JAKAUMA
+PROB = TODENNÄKÖISYYS
+QUARTILE.EXC = NELJÄNNES.ULK
+QUARTILE.INC = NELJÄNNES.SIS
+RANK.AVG = ARVON.MUKAAN.KESKIARVO
+RANK.EQ = ARVON.MUKAAN.TASAN
+RSQ = PEARSON.NELIÖ
+SKEW = JAKAUMAN.VINOUS
+SKEW.P = JAKAUMAN.VINOUS.POP
+SLOPE = KULMAKERROIN
+SMALL = PIENI
+STANDARDIZE = NORMITA
+STDEV.P = KESKIHAJONTA.P
+STDEV.S = KESKIHAJONTA.S
+STDEVA = KESKIHAJONTAA
+STDEVPA = KESKIHAJONTAPA
+STEYX = KESKIVIRHE
+T.DIST = T.JAKAUMA
+T.DIST.2T = T.JAKAUMA.2S
+T.DIST.RT = T.JAKAUMA.OH
+T.INV = T.KÄÄNT
+T.INV.2T = T.KÄÄNT.2S
+T.TEST = T.TESTI
+TREND = SUUNTAUS
+TRIMMEAN = KESKIARVO.TASATTU
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.JAKAUMA
+Z.TEST = Z.TESTI
 
 ##
-##	Statistical functions				Tilastolliset funktiot
+## Tekstifunktiot (Text Functions)
 ##
-AVEDEV			= KESKIPOIKKEAMA		##	Palauttaa hajontojen itseisarvojen keskiarvon.
-AVERAGE			= KESKIARVO			##	Palauttaa argumenttien keskiarvon.
-AVERAGEA		= KESKIARVOA			##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, keskiarvon.
-AVERAGEIF		= KESKIARVO.JOS			##	Palauttaa alueen niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka täyttävät annetut ehdot.
-AVERAGEIFS		= KESKIARVO.JOS.JOUKKO		##	Palauttaa niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka vastaavat useita ehtoja.
-BETADIST		= BEETAJAKAUMA			##	Palauttaa kumulatiivisen beetajakaumafunktion arvon.
-BETAINV			= BEETAJAKAUMA.KÄÄNT		##	Palauttaa määritetyn beetajakauman käänteisen kumulatiivisen jakaumafunktion arvon.
-BINOMDIST		= BINOMIJAKAUMA			##	Palauttaa yksittäisen termin binomijakaumatodennäköisyyden.
-CHIDIST			= CHIJAKAUMA			##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden.
-CHIINV			= CHIJAKAUMA.KÄÄNT		##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden käänteisarvon.
-CHITEST			= CHITESTI			##	Palauttaa riippumattomuustestin tuloksen.
-CONFIDENCE		= LUOTTAMUSVÄLI			##	Palauttaa luottamusvälin populaation keskiarvolle.
-CORREL			= KORRELAATIO			##	Palauttaa kahden arvojoukon korrelaatiokertoimen.
-COUNT			= LASKE				##	Laskee argumenttiluettelossa olevien lukujen määrän.
-COUNTA			= LASKE.A			##	Laskee argumenttiluettelossa olevien arvojen määrän.
-COUNTBLANK		= LASKE.TYHJÄT			##	Laskee alueella olevien tyhjien solujen määrän.
-COUNTIF			= LASKE.JOS			##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa annettuja ehtoja.
-COUNTIFS		= LASKE.JOS.JOUKKO		##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa useita ehtoja.
-COVAR			= KOVARIANSSI			##	Palauttaa kovarianssin, joka on keskiarvo havaintoaineiston kunkin pisteparin poikkeamien tuloista.
-CRITBINOM		= BINOMIJAKAUMA.KRIT		##	Palauttaa pienimmän arvon, jossa binomijakauman kertymäfunktion arvo on pienempi tai yhtä suuri kuin vertailuarvo.
-DEVSQ			= OIKAISTU.NELIÖSUMMA		##	Palauttaa keskipoikkeamien neliösumman.
-EXPONDIST		= EKSPONENTIAALIJAKAUMA		##	Palauttaa eksponentiaalijakauman.
-FDIST			= FJAKAUMA			##	Palauttaa F-todennäköisyysjakauman.
-FINV			= FJAKAUMA.KÄÄNT		##	Palauttaa F-todennäköisyysjakauman käänteisfunktion.
-FISHER			= FISHER			##	Palauttaa Fisher-muunnoksen.
-FISHERINV		= FISHER.KÄÄNT			##	Palauttaa käänteisen Fisher-muunnoksen.
-FORECAST		= ENNUSTE			##	Palauttaa lineaarisen trendin arvon.
-FREQUENCY		= TAAJUUS			##	Palauttaa frekvenssijakautuman pystysuuntaisena matriisina.
-FTEST			= FTESTI			##	Palauttaa F-testin tuloksen.
-GAMMADIST		= GAMMAJAKAUMA			##	Palauttaa gammajakauman.
-GAMMAINV		= GAMMAJAKAUMA.KÄÄNT		##	Palauttaa käänteisen gammajakauman kertymäfunktion.
-GAMMALN			= GAMMALN			##	Palauttaa gammafunktion luonnollisen logaritmin G(x).
-GEOMEAN			= KESKIARVO.GEOM		##	Palauttaa geometrisen keskiarvon.
-GROWTH			= KASVU				##	Palauttaa eksponentiaalisen trendin arvon.
-HARMEAN			= KESKIARVO.HARM		##	Palauttaa harmonisen keskiarvon.
-HYPGEOMDIST		= HYPERGEOM.JAKAUMA		##	Palauttaa hypergeometrisen jakauman.
-INTERCEPT		= LEIKKAUSPISTE			##	Palauttaa lineaarisen regressiosuoran leikkauspisteen.
-KURT			= KURT				##	Palauttaa tietoalueen vinous-arvon eli huipukkuuden.
-LARGE			= SUURI				##	Palauttaa tietojoukon k:nneksi suurimman arvon.
-LINEST			= LINREGR			##	Palauttaa lineaarisen trendin parametrit.
-LOGEST			= LOGREGR			##	Palauttaa eksponentiaalisen trendin parametrit.
-LOGINV			= LOGNORM.JAKAUMA.KÄÄNT		##	Palauttaa lognormeeratun jakauman käänteisfunktion.
-LOGNORMDIST		= LOGNORM.JAKAUMA		##	Palauttaa lognormaalisen jakauman kertymäfunktion.
-MAX			= MAKS				##	Palauttaa suurimman arvon argumenttiluettelosta.
-MAXA			= MAKSA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, suurimman arvon.
-MEDIAN			= MEDIAANI			##	Palauttaa annettujen lukujen mediaanin.
-MIN			= MIN				##	Palauttaa pienimmän arvon argumenttiluettelosta.
-MINA			= MINA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, pienimmän arvon.
-MODE			= MOODI				##	Palauttaa tietojoukossa useimmin esiintyvän arvon.
-NEGBINOMDIST		= BINOMIJAKAUMA.NEG		##	Palauttaa negatiivisen binomijakauman.
-NORMDIST		= NORM.JAKAUMA			##	Palauttaa normaalijakauman kertymäfunktion.
-NORMINV			= NORM.JAKAUMA.KÄÄNT		##	Palauttaa käänteisen normaalijakauman kertymäfunktion.
-NORMSDIST		= NORM.JAKAUMA.NORMIT		##	Palauttaa normitetun normaalijakauman kertymäfunktion.
-NORMSINV		= NORM.JAKAUMA.NORMIT.KÄÄNT	##	Palauttaa normitetun normaalijakauman kertymäfunktion käänteisarvon.
-PEARSON			= PEARSON			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen.
-PERCENTILE		= PROSENTTIPISTE		##	Palauttaa alueen arvojen k:nnen prosenttipisteen.
-PERCENTRANK		= PROSENTTIJÄRJESTYS		##	Palauttaa tietojoukon arvon prosentuaalisen järjestysluvun.
-PERMUT			= PERMUTAATIO			##	Palauttaa mahdollisten permutaatioiden määrän annetulle objektien määrälle.
-POISSON			= POISSON			##	Palauttaa Poissonin todennäköisyysjakauman.
-PROB			= TODENNÄKÖISYYS		##	Palauttaa todennäköisyyden sille, että arvot ovat tietyltä väliltä.
-QUARTILE		= NELJÄNNES			##	Palauttaa tietoalueen neljänneksen.
-RANK			= ARVON.MUKAAN			##	Palauttaa luvun paikan lukuarvoluettelossa.
-RSQ			= PEARSON.NELIÖ			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen neliön.
-SKEW			= JAKAUMAN.VINOUS		##	Palauttaa jakauman vinouden.
-SLOPE			= KULMAKERROIN			##	Palauttaa lineaarisen regressiosuoran kulmakertoimen.
-SMALL			= PIENI				##	Palauttaa tietojoukon k:nneksi pienimmän arvon.
-STANDARDIZE		= NORMITA			##	Palauttaa normitetun arvon.
-STDEV			= KESKIHAJONTA			##	Laskee populaation keskihajonnan otoksen perusteella.
-STDEVA			= KESKIHAJONTAA			##	Laskee populaation keskihajonnan otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-STDEVP			= KESKIHAJONTAP			##	Laskee normaalijakautuman koko populaation perusteella.
-STDEVPA			= KESKIHAJONTAPA		##	Laskee populaation keskihajonnan koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-STEYX			= KESKIVIRHE			##	Palauttaa regression kutakin x-arvoa vastaavan ennustetun y-arvon keskivirheen.
-TDIST			= TJAKAUMA			##	Palauttaa t-jakautuman.
-TINV			= TJAKAUMA.KÄÄNT		##	Palauttaa käänteisen t-jakauman.
-TREND			= SUUNTAUS			##	Palauttaa lineaarisen trendin arvoja.
-TRIMMEAN		= KESKIARVO.TASATTU		##	Palauttaa tietojoukon tasatun keskiarvon.
-TTEST			= TTESTI			##	Palauttaa t-testiin liittyvän todennäköisyyden.
-VAR			= VAR				##	Arvioi populaation varianssia otoksen perusteella.
-VARA			= VARA				##	Laskee populaation varianssin otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-VARP			= VARP				##	Laskee varianssin koko populaation perusteella.
-VARPA			= VARPA				##	Laskee populaation varianssin koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-WEIBULL			= WEIBULL			##	Palauttaa Weibullin jakauman.
-ZTEST			= ZTESTI			##	Palauttaa z-testin yksisuuntaisen todennäköisyysarvon.
-
+BAHTTEXT = BAHTTEKSTI
+CHAR = MERKKI
+CLEAN = SIIVOA
+CODE = KOODI
+CONCAT = YHDISTÄ
+DOLLAR = VALUUTTA
+EXACT = VERTAA
+FIND = ETSI
+FIXED = KIINTEÄ
+ISTHAIDIGIT = ON.THAI.NUMERO
+LEFT = VASEN
+LEN = PITUUS
+LOWER = PIENET
+MID = POIMI.TEKSTI
+NUMBERSTRING = NROMERKKIJONO
+NUMBERVALUE = NROARVO
+PHONETIC = FONEETTINEN
+PROPER = ERISNIMI
+REPLACE = KORVAA
+REPT = TOISTA
+RIGHT = OIKEA
+SEARCH = KÄY.LÄPI
+SUBSTITUTE = VAIHDA
+T = T
+TEXT = TEKSTI
+TEXTJOIN = TEKSTI.YHDISTÄ
+THAIDIGIT = THAI.NUMERO
+THAINUMSOUND = THAI.LUKU.ÄÄNI
+THAINUMSTRING = THAI.LUKU.MERKKIJONO
+THAISTRINGLENGTH = THAI.MERKKIJONON.PITUUS
+TRIM = POISTA.VÄLIT
+UNICHAR = UNICODEMERKKI
+UNICODE = UNICODE
+UPPER = ISOT
+VALUE = ARVO
 
 ##
-##	Text functions					Tekstifunktiot
+## Verkkofunktiot (Web Functions)
 ##
-ASC			= ASC				##	Muuntaa merkkijonossa olevat englanninkieliset DBCS- tai katakana-merkit SBCS-merkeiksi.
-BAHTTEXT		= BAHTTEKSTI			##	Muuntaa luvun tekstiksi ß (baht) -valuuttamuotoa käyttämällä.
-CHAR			= MERKKI			##	Palauttaa koodin lukua vastaavan merkin.
-CLEAN			= SIIVOA			##	Poistaa tekstistä kaikki tulostumattomat merkit.
-CODE			= KOODI				##	Palauttaa tekstimerkkijonon ensimmäisen merkin numerokoodin.
-CONCATENATE		= KETJUTA			##	Yhdistää useat merkkijonot yhdeksi merkkijonoksi.
-DOLLAR			= VALUUTTA			##	Muuntaa luvun tekstiksi $ (dollari) -valuuttamuotoa käyttämällä.
-EXACT			= VERTAA			##	Tarkistaa, ovatko kaksi tekstiarvoa samanlaiset.
-FIND			= ETSI				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FINDB			= ETSIB				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FIXED			= KIINTEÄ			##	Muotoilee luvun tekstiksi, jossa on kiinteä määrä desimaaleja.
-JIS			= JIS				##	Muuntaa merkkijonossa olevat englanninkieliset SBCS- tai katakana-merkit DBCS-merkeiksi.
-LEFT			= VASEN				##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEFTB			= VASENB			##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEN			= PITUUS			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LENB			= PITUUSB			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LOWER			= PIENET			##	Muuntaa tekstin pieniksi kirjaimiksi.
-MID			= POIMI.TEKSTI			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-MIDB			= POIMI.TEKSTIB			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-PHONETIC		= FONEETTINEN			##	Hakee foneettiset (furigana) merkit merkkijonosta.
-PROPER			= ERISNIMI			##	Muuttaa merkkijonon kunkin sanan ensimmäisen kirjaimen isoksi.
-REPLACE			= KORVAA			##	Korvaa tekstissä olevat merkit.
-REPLACEB		= KORVAAB			##	Korvaa tekstissä olevat merkit.
-REPT			= TOISTA			##	Toistaa tekstin annetun määrän kertoja.
-RIGHT			= OIKEA				##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-RIGHTB			= OIKEAB			##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-SEARCH			= KÄY.LÄPI			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SEARCHB			= KÄY.LÄPIB			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SUBSTITUTE		= VAIHDA			##	Korvaa merkkijonossa olevan tekstin toisella.
-T			= T				##	Muuntaa argumentit tekstiksi.
-TEXT			= TEKSTI			##	Muotoilee luvun ja muuntaa sen tekstiksi.
-TRIM			= POISTA.VÄLIT			##	Poistaa välilyönnit tekstistä.
-UPPER			= ISOT				##	Muuntaa tekstin isoiksi kirjaimiksi.
-VALUE			= ARVO				##	Muuntaa tekstiargumentin luvuksi.
+ENCODEURL = URLKOODAUS
+FILTERXML = SUODATA.XML
+WEBSERVICE = VERKKOPALVELU
+
+##
+## Yhteensopivuusfunktiot (Compatibility Functions)
+##
+BETADIST = BEETAJAKAUMA
+BETAINV = BEETAJAKAUMA.KÄÄNT
+BINOMDIST = BINOMIJAKAUMA
+CEILING = PYÖRISTÄ.KERR.YLÖS
+CHIDIST = CHIJAKAUMA
+CHIINV = CHIJAKAUMA.KÄÄNT
+CHITEST = CHITESTI
+CONCATENATE = KETJUTA
+CONFIDENCE = LUOTTAMUSVÄLI
+COVAR = KOVARIANSSI
+CRITBINOM = BINOMIJAKAUMA.KRIT
+EXPONDIST = EKSPONENTIAALIJAKAUMA
+FDIST = FJAKAUMA
+FINV = FJAKAUMA.KÄÄNT
+FLOOR = PYÖRISTÄ.KERR.ALAS
+FORECAST = ENNUSTE
+FTEST = FTESTI
+GAMMADIST = GAMMAJAKAUMA
+GAMMAINV = GAMMAJAKAUMA.KÄÄNT
+HYPGEOMDIST = HYPERGEOM.JAKAUMA
+LOGINV = LOGNORM.JAKAUMA.KÄÄNT
+LOGNORMDIST = LOGNORM.JAKAUMA
+MODE = MOODI
+NEGBINOMDIST = BINOMIJAKAUMA.NEG
+NORMDIST = NORM.JAKAUMA
+NORMINV = NORM.JAKAUMA.KÄÄNT
+NORMSDIST = NORM.JAKAUMA.NORMIT
+NORMSINV = NORM.JAKAUMA.NORMIT.KÄÄNT
+PERCENTILE = PROSENTTIPISTE
+PERCENTRANK = PROSENTTIJÄRJESTYS
+POISSON = POISSON
+QUARTILE = NELJÄNNES
+RANK = ARVON.MUKAAN
+STDEV = KESKIHAJONTA
+STDEVP = KESKIHAJONTAP
+TDIST = TJAKAUMA
+TINV = TJAKAUMA.KÄÄNT
+TTEST = TTESTI
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = ZTESTI
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config
index 81895986f..bdac4121c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Français (French)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NUL!
-DIV0	= #DIV/0!
-VALUE	= #VALEUR!
-REF	= #REF!
-NAME	= #NOM?
-NUM	= #NOMBRE!
-NA	= #N/A
+NULL = #NUL!
+DIV0
+VALUE = #VALEUR!
+REF
+NAME = #NOM?
+NUM = #NOMBRE!
+NA
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
index 7f40d5fde..621cb0db3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
@@ -1,416 +1,525 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Français (French)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Fonctions de complément et d’automatisation
+## Fonctions Cube (Cube Functions)
 ##
-GETPIVOTDATA		= LIREDONNEESTABCROISDYNAMIQUE	##	Renvoie les données stockées dans un rapport de tableau croisé dynamique.
-
+CUBEKPIMEMBER = MEMBREKPICUBE
+CUBEMEMBER = MEMBRECUBE
+CUBEMEMBERPROPERTY = PROPRIETEMEMBRECUBE
+CUBERANKEDMEMBER = RANGMEMBRECUBE
+CUBESET = JEUCUBE
+CUBESETCOUNT = NBJEUCUBE
+CUBEVALUE = VALEURCUBE
 
 ##
-##	Cube functions					Fonctions Cube
+## Fonctions de base de données (Database Functions)
 ##
-CUBEKPIMEMBER		= MEMBREKPICUBE			##	Renvoie un nom, une propriété et une mesure d’indicateur de performance clé et affiche le nom et la propriété dans la cellule. Un indicateur de performance clé est une mesure quantifiable, telle que la marge bénéficiaire brute mensuelle ou la rotation trimestrielle du personnel, utilisée pour évaluer les performances d’une entreprise.
-CUBEMEMBER		= MEMBRECUBE			##	Renvoie un membre ou un uplet dans une hiérarchie de cubes. Utilisez cette fonction pour valider l’existence du membre ou de l’uplet dans le cube.
-CUBEMEMBERPROPERTY	= PROPRIETEMEMBRECUBE		##	Renvoie la valeur d’une propriété de membre du cube. Utilisez cette fonction pour valider l’existence d’un nom de membre dans le cube et pour renvoyer la propriété spécifiée pour ce membre.
-CUBERANKEDMEMBER	= RANGMEMBRECUBE		##	Renvoie le nième membre ou le membre placé à un certain rang dans un ensemble. Utilisez cette fonction pour renvoyer un ou plusieurs éléments d’un ensemble, tels que les meilleurs vendeurs ou les 10 meilleurs étudiants.
-CUBESET			= JEUCUBE			##	Définit un ensemble calculé de membres ou d’uplets en envoyant une expression définie au cube sur le serveur qui crée l’ensemble et le renvoie à Microsoft Office Excel.
-CUBESETCOUNT		= NBJEUCUBE			##	Renvoie le nombre d’éléments dans un jeu.
-CUBEVALUE		= VALEURCUBE			##	Renvoie une valeur d’agrégation issue d’un cube.
-
+DAVERAGE = BDMOYENNE
+DCOUNT = BDNB
+DCOUNTA = BDNBVAL
+DGET = BDLIRE
+DMAX = BDMAX
+DMIN = BDMIN
+DPRODUCT = BDPRODUIT
+DSTDEV = BDECARTYPE
+DSTDEVP = BDECARTYPEP
+DSUM = BDSOMME
+DVAR = BDVAR
+DVARP = BDVARP
 
 ##
-##	Database functions				Fonctions de base de données
+## Fonctions de date et d’heure (Date & Time Functions)
 ##
-DAVERAGE		= BDMOYENNE			##	Renvoie la moyenne des entrées de base de données sélectionnées.
-DCOUNT			= BCOMPTE			##	Compte le nombre de cellules d’une base de données qui contiennent des nombres.
-DCOUNTA			= BDNBVAL			##	Compte les cellules non vides d’une base de données.
-DGET			= BDLIRE			##	Extrait d’une base de données un enregistrement unique répondant aux critères spécifiés.
-DMAX			= BDMAX				##	Renvoie la valeur maximale des entrées de base de données sélectionnées.
-DMIN			= BDMIN				##	Renvoie la valeur minimale des entrées de base de données sélectionnées.
-DPRODUCT		= BDPRODUIT			##	Multiplie les valeurs d’un champ particulier des enregistrements d’une base de données, qui répondent aux critères spécifiés.
-DSTDEV			= BDECARTYPE			##	Calcule l’écart type pour un échantillon d’entrées de base de données sélectionnées.
-DSTDEVP			= BDECARTYPEP			##	Calcule l’écart type pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-DSUM			= BDSOMME			##	Ajoute les nombres dans la colonne de champ des enregistrements de la base de données, qui répondent aux critères.
-DVAR			= BDVAR				##	Calcule la variance pour un échantillon d’entrées de base de données sélectionnées.
-DVARP			= BDVARP			##	Calcule la variance pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-
+DATE = DATE
+DATEVALUE = DATEVAL
+DAY = JOUR
+DAYS = JOURS
+DAYS360 = JOURS360
+EDATE = MOIS.DECALER
+EOMONTH = FIN.MOIS
+HOUR = HEURE
+ISOWEEKNUM = NO.SEMAINE.ISO
+MINUTE = MINUTE
+MONTH = MOIS
+NETWORKDAYS = NB.JOURS.OUVRES
+NETWORKDAYS.INTL = NB.JOURS.OUVRES.INTL
+NOW = MAINTENANT
+SECOND = SECONDE
+TIME = TEMPS
+TIMEVALUE = TEMPSVAL
+TODAY = AUJOURDHUI
+WEEKDAY = JOURSEM
+WEEKNUM = NO.SEMAINE
+WORKDAY = SERIE.JOUR.OUVRE
+WORKDAY.INTL = SERIE.JOUR.OUVRE.INTL
+YEAR = ANNEE
+YEARFRAC = FRACTION.ANNEE
 
 ##
-##	Date and time functions				Fonctions de date et d’heure
+## Fonctions d’ingénierie (Engineering Functions)
 ##
-DATE			= DATE				##	Renvoie le numéro de série d’une date précise.
-DATEVALUE		= DATEVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-DAY			= JOUR				##	Convertit un numéro de série en jour du mois.
-DAYS360			= JOURS360			##	Calcule le nombre de jours qui séparent deux dates sur la base d’une année de 360 jours.
-EDATE			= MOIS.DECALER			##	Renvoie le numéro séquentiel de la date qui représente une date spécifiée (l’argument date_départ), corrigée en plus ou en moins du nombre de mois indiqué.
-EOMONTH			= FIN.MOIS			##	Renvoie le numéro séquentiel de la date du dernier jour du mois précédant ou suivant la date_départ du nombre de mois indiqué.
-HOUR			= HEURE				##	Convertit un numéro de série en heure.
-MINUTE			= MINUTE			##	Convertit un numéro de série en minute.
-MONTH			= MOIS				##	Convertit un numéro de série en mois.
-NETWORKDAYS		= NB.JOURS.OUVRES		##	Renvoie le nombre de jours ouvrés entiers compris entre deux dates.
-NOW			= MAINTENANT			##	Renvoie le numéro de série de la date et de l’heure du jour.
-SECOND			= SECONDE			##	Convertit un numéro de série en seconde.
-TIME			= TEMPS				##	Renvoie le numéro de série d’une heure précise.
-TIMEVALUE		= TEMPSVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-TODAY			= AUJOURDHUI			##	Renvoie le numéro de série de la date du jour.
-WEEKDAY			= JOURSEM			##	Convertit un numéro de série en jour de la semaine.
-WEEKNUM			= NO.SEMAINE			##	Convertit un numéro de série en un numéro représentant l’ordre de la semaine dans l’année.
-WORKDAY			= SERIE.JOUR.OUVRE		##	Renvoie le numéro de série de la date avant ou après le nombre de jours ouvrés spécifiés.
-YEAR			= ANNEE				##	Convertit un numéro de série en année.
-YEARFRAC		= FRACTION.ANNEE		##	Renvoie la fraction de l’année représentant le nombre de jours entre la date de début et la date de fin.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINDEC
+BIN2HEX = BINHEX
+BIN2OCT = BINOCT
+BITAND = BITET
+BITLSHIFT = BITDECALG
+BITOR = BITOU
+BITRSHIFT = BITDECALD
+BITXOR = BITOUEXCLUSIF
+COMPLEX = COMPLEXE
+CONVERT = CONVERT
+DEC2BIN = DECBIN
+DEC2HEX = DECHEX
+DEC2OCT = DECOCT
+DELTA = DELTA
+ERF = ERF
+ERF.PRECISE = ERF.PRECIS
+ERFC = ERFC
+ERFC.PRECISE = ERFC.PRECIS
+GESTEP = SUP.SEUIL
+HEX2BIN = HEXBIN
+HEX2DEC = HEXDEC
+HEX2OCT = HEXOCT
+IMABS = COMPLEXE.MODULE
+IMAGINARY = COMPLEXE.IMAGINAIRE
+IMARGUMENT = COMPLEXE.ARGUMENT
+IMCONJUGATE = COMPLEXE.CONJUGUE
+IMCOS = COMPLEXE.COS
+IMCOSH = COMPLEXE.COSH
+IMCOT = COMPLEXE.COT
+IMCSC = COMPLEXE.CSC
+IMCSCH = COMPLEXE.CSCH
+IMDIV = COMPLEXE.DIV
+IMEXP = COMPLEXE.EXP
+IMLN = COMPLEXE.LN
+IMLOG10 = COMPLEXE.LOG10
+IMLOG2 = COMPLEXE.LOG2
+IMPOWER = COMPLEXE.PUISSANCE
+IMPRODUCT = COMPLEXE.PRODUIT
+IMREAL = COMPLEXE.REEL
+IMSEC = COMPLEXE.SEC
+IMSECH = COMPLEXE.SECH
+IMSIN = COMPLEXE.SIN
+IMSINH = COMPLEXE.SINH
+IMSQRT = COMPLEXE.RACINE
+IMSUB = COMPLEXE.DIFFERENCE
+IMSUM = COMPLEXE.SOMME
+IMTAN = COMPLEXE.TAN
+OCT2BIN = OCTBIN
+OCT2DEC = OCTDEC
+OCT2HEX = OCTHEX
 
 ##
-##	Engineering functions				Fonctions d’ingénierie
+## Fonctions financières (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Renvoie la fonction Bessel modifiée In(x).
-BESSELJ			= BESSELJ			##	Renvoie la fonction Bessel Jn(x).
-BESSELK			= BESSELK			##	Renvoie la fonction Bessel modifiée Kn(x).
-BESSELY			= BESSELY			##	Renvoie la fonction Bessel Yn(x).
-BIN2DEC			= BINDEC			##	Convertit un nombre binaire en nombre décimal.
-BIN2HEX			= BINHEX			##	Convertit un nombre binaire en nombre hexadécimal.
-BIN2OCT			= BINOCT			##	Convertit un nombre binaire en nombre octal.
-COMPLEX			= COMPLEXE			##	Convertit des coefficients réel et imaginaire en un nombre complexe.
-CONVERT			= CONVERT			##	Convertit un nombre d’une unité de mesure à une autre.
-DEC2BIN			= DECBIN			##	Convertit un nombre décimal en nombre binaire.
-DEC2HEX			= DECHEX			##	Convertit un nombre décimal en nombre hexadécimal.
-DEC2OCT			= DECOCT			##	Convertit un nombre décimal en nombre octal.
-DELTA			= DELTA				##	Teste l’égalité de deux nombres.
-ERF			= ERF				##	Renvoie la valeur de la fonction d’erreur.
-ERFC			= ERFC				##	Renvoie la valeur de la fonction d’erreur complémentaire.
-GESTEP			= SUP.SEUIL			##	Teste si un nombre est supérieur à une valeur de seuil.
-HEX2BIN			= HEXBIN			##	Convertit un nombre hexadécimal en nombre binaire.
-HEX2DEC			= HEXDEC			##	Convertit un nombre hexadécimal en nombre décimal.
-HEX2OCT			= HEXOCT			##	Convertit un nombre hexadécimal en nombre octal.
-IMABS			= COMPLEXE.MODULE		##	Renvoie la valeur absolue (module) d’un nombre complexe.
-IMAGINARY		= COMPLEXE.IMAGINAIRE		##	Renvoie le coefficient imaginaire d’un nombre complexe.
-IMARGUMENT		= COMPLEXE.ARGUMENT		##	Renvoie l’argument thêta, un angle exprimé en radians.
-IMCONJUGATE		= COMPLEXE.CONJUGUE		##	Renvoie le nombre complexe conjugué d’un nombre complexe.
-IMCOS			= IMCOS				##	Renvoie le cosinus d’un nombre complexe.
-IMDIV			= COMPLEXE.DIV			##	Renvoie le quotient de deux nombres complexes.
-IMEXP			= COMPLEXE.EXP			##	Renvoie la fonction exponentielle d’un nombre complexe.
-IMLN			= COMPLEXE.LN			##	Renvoie le logarithme népérien d’un nombre complexe.
-IMLOG10			= COMPLEXE.LOG10		##	Calcule le logarithme en base 10 d’un nombre complexe.
-IMLOG2			= COMPLEXE.LOG2			##	Calcule le logarithme en base 2 d’un nombre complexe.
-IMPOWER			= COMPLEXE.PUISSANCE		##	Renvoie un nombre complexe élevé à une puissance entière.
-IMPRODUCT		= COMPLEXE.PRODUIT		##	Renvoie le produit de plusieurs nombres complexes.
-IMREAL			= COMPLEXE.REEL			##	Renvoie le coefficient réel d’un nombre complexe.
-IMSIN			= COMPLEXE.SIN			##	Renvoie le sinus d’un nombre complexe.
-IMSQRT			= COMPLEXE.RACINE		##	Renvoie la racine carrée d’un nombre complexe.
-IMSUB			= COMPLEXE.DIFFERENCE		##	Renvoie la différence entre deux nombres complexes.
-IMSUM			= COMPLEXE.SOMME		##	Renvoie la somme de plusieurs nombres complexes.
-OCT2BIN			= OCTBIN			##	Convertit un nombre octal en nombre binaire.
-OCT2DEC			= OCTDEC			##	Convertit un nombre octal en nombre décimal.
-OCT2HEX			= OCTHEX			##	Convertit un nombre octal en nombre hexadécimal.
-
+ACCRINT = INTERET.ACC
+ACCRINTM = INTERET.ACC.MAT
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = NB.JOURS.COUPON.PREC
+COUPDAYS = NB.JOURS.COUPONS
+COUPDAYSNC = NB.JOURS.COUPON.SUIV
+COUPNCD = DATE.COUPON.SUIV
+COUPNUM = NB.COUPONS
+COUPPCD = DATE.COUPON.PREC
+CUMIPMT = CUMUL.INTER
+CUMPRINC = CUMUL.PRINCPER
+DB = DB
+DDB = DDB
+DISC = TAUX.ESCOMPTE
+DOLLARDE = PRIX.DEC
+DOLLARFR = PRIX.FRAC
+DURATION = DUREE
+EFFECT = TAUX.EFFECTIF
+FV = VC
+FVSCHEDULE = VC.PAIEMENTS
+INTRATE = TAUX.INTERET
+IPMT = INTPER
+IRR = TRI
+ISPMT = ISPMT
+MDURATION = DUREE.MODIFIEE
+MIRR = TRIM
+NOMINAL = TAUX.NOMINAL
+NPER = NPM
+NPV = VAN
+ODDFPRICE = PRIX.PCOUPON.IRREG
+ODDFYIELD = REND.PCOUPON.IRREG
+ODDLPRICE = PRIX.DCOUPON.IRREG
+ODDLYIELD = REND.DCOUPON.IRREG
+PDURATION = PDUREE
+PMT = VPM
+PPMT = PRINCPER
+PRICE = PRIX.TITRE
+PRICEDISC = VALEUR.ENCAISSEMENT
+PRICEMAT = PRIX.TITRE.ECHEANCE
+PV = VA
+RATE = TAUX
+RECEIVED = VALEUR.NOMINALE
+RRI = TAUX.INT.EQUIV
+SLN = AMORLIN
+SYD = SYD
+TBILLEQ = TAUX.ESCOMPTE.R
+TBILLPRICE = PRIX.BON.TRESOR
+TBILLYIELD = RENDEMENT.BON.TRESOR
+VDB = VDB
+XIRR = TRI.PAIEMENTS
+XNPV = VAN.PAIEMENTS
+YIELD = RENDEMENT.TITRE
+YIELDDISC = RENDEMENT.SIMPLE
+YIELDMAT = RENDEMENT.TITRE.ECHEANCE
 
 ##
-##	Financial functions				Fonctions financières
+## Fonctions d’information (Information Functions)
 ##
-ACCRINT			= INTERET.ACC			##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu périodiquement.
-ACCRINTM		= INTERET.ACC.MAT		##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu à l’échéance.
-AMORDEGRC		= AMORDEGRC			##	Renvoie l’amortissement correspondant à chaque période comptable en utilisant un coefficient d’amortissement.
-AMORLINC		= AMORLINC			##	Renvoie l’amortissement d’un bien à la fin d’une période fiscale donnée.
-COUPDAYBS		= NB.JOURS.COUPON.PREC		##	Renvoie le nombre de jours entre le début de la période de coupon et la date de liquidation.
-COUPDAYS		= NB.JOURS.COUPONS		##	Renvoie le nombre de jours pour la période du coupon contenant la date de liquidation.
-COUPDAYSNC		= NB.JOURS.COUPON.SUIV		##	Renvoie le nombre de jours entre la date de liquidation et la date du coupon suivant la date de liquidation.
-COUPNCD			= DATE.COUPON.SUIV		##	Renvoie la première date de coupon ultérieure à la date de règlement.
-COUPNUM			= NB.COUPONS			##	Renvoie le nombre de coupons dus entre la date de règlement et la date d’échéance.
-COUPPCD			= DATE.COUPON.PREC		##	Renvoie la date de coupon précédant la date de règlement.
-CUMIPMT			= CUMUL.INTER			##	Renvoie l’intérêt cumulé payé sur un emprunt entre deux périodes.
-CUMPRINC		= CUMUL.PRINCPER		##	Renvoie le montant cumulé des remboursements du capital d’un emprunt effectués entre deux périodes.
-DB			= DB				##	Renvoie l’amortissement d’un bien pour une période spécifiée en utilisant la méthode de l’amortissement dégressif à taux fixe.
-DDB			= DDB				##	Renvoie l’amortissement d’un bien pour toute période spécifiée, en utilisant la méthode de l’amortissement dégressif à taux double ou selon un coefficient à spécifier.
-DISC			= TAUX.ESCOMPTE			##	Calcule le taux d’escompte d’une transaction.
-DOLLARDE		= PRIX.DEC			##	Convertit un prix en euros, exprimé sous forme de fraction, en un prix en euros exprimé sous forme de nombre décimal.
-DOLLARFR		= PRIX.FRAC			##	Convertit un prix en euros, exprimé sous forme de nombre décimal, en un prix en euros exprimé sous forme de fraction.
-DURATION		= DUREE				##	Renvoie la durée, en années, d’un titre dont l’intérêt est perçu périodiquement.
-EFFECT			= TAUX.EFFECTIF			##	Renvoie le taux d’intérêt annuel effectif.
-FV			= VC				##	Renvoie la valeur future d’un investissement.
-FVSCHEDULE		= VC.PAIEMENTS			##	Calcule la valeur future d’un investissement en appliquant une série de taux d’intérêt composites.
-INTRATE			= TAUX.INTERET			##	Affiche le taux d’intérêt d’un titre totalement investi.
-IPMT			= INTPER			##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-IRR			= TRI				##	Calcule le taux de rentabilité interne d’un investissement pour une succession de trésoreries.
-ISPMT			= ISPMT				##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-MDURATION		= DUREE.MODIFIEE		##	Renvoie la durée de Macauley modifiée pour un titre ayant une valeur nominale hypothétique de 100_euros.
-MIRR			= TRIM				##	Calcule le taux de rentabilité interne lorsque les paiements positifs et négatifs sont financés à des taux différents.
-NOMINAL			= TAUX.NOMINAL			##	Calcule le taux d’intérêt nominal annuel.
-NPER			= NPM				##	Renvoie le nombre de versements nécessaires pour rembourser un emprunt.
-NPV			= VAN				##	Calcule la valeur actuelle nette d’un investissement basé sur une série de décaissements et un taux d’escompte.
-ODDFPRICE		= PRIX.PCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDFYIELD		= REND.PCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la première période de coupon est irrégulière.
-ODDLPRICE		= PRIX.DCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDLYIELD		= REND.DCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la dernière période de coupon est irrégulière.
-PMT			= VPM				##	Calcule le paiement périodique d’un investissement donné.
-PPMT			= PRINCPER			##	Calcule, pour une période donnée, la part de remboursement du principal d’un investissement.
-PRICE			= PRIX.TITRE			##	Renvoie le prix d’un titre rapportant des intérêts périodiques, pour une valeur nominale de 100 euros.
-PRICEDISC		= VALEUR.ENCAISSEMENT		##	Renvoie la valeur d’encaissement d’un escompte commercial, pour une valeur nominale de 100 euros.
-PRICEMAT		= PRIX.TITRE.ECHEANCE		##	Renvoie le prix d’un titre dont la valeur nominale est 100 euros et qui rapporte des intérêts à l’échéance.
-PV			= PV				##	Calcule la valeur actuelle d’un investissement.
-RATE			= TAUX				##	Calcule le taux d’intérêt par période pour une annuité.
-RECEIVED		= VALEUR.NOMINALE		##	Renvoie la valeur nominale à échéance d’un effet de commerce.
-SLN			= AMORLIN			##	Calcule l’amortissement linéaire d’un bien pour une période donnée.
-SYD			= SYD				##	Calcule l’amortissement d’un bien pour une période donnée sur la base de la méthode américaine Sum-of-Years Digits (amortissement dégressif à taux décroissant appliqué à une valeur constante).
-TBILLEQ			= TAUX.ESCOMPTE.R		##	Renvoie le taux d’escompte rationnel d’un bon du Trésor.
-TBILLPRICE		= PRIX.BON.TRESOR		##	Renvoie le prix d’un bon du Trésor d’une valeur nominale de 100 euros.
-TBILLYIELD		= RENDEMENT.BON.TRESOR		##	Calcule le taux de rendement d’un bon du Trésor.
-VDB			= VDB				##	Renvoie l’amortissement d’un bien pour une période spécifiée ou partielle en utilisant une méthode de l’amortissement dégressif à taux fixe.
-XIRR			= TRI.PAIEMENTS			##	Calcule le taux de rentabilité interne d’un ensemble de paiements non périodiques.
-XNPV			= VAN.PAIEMENTS			##	Renvoie la valeur actuelle nette d’un ensemble de paiements non périodiques.
-YIELD			= RENDEMENT.TITRE		##	Calcule le rendement d’un titre rapportant des intérêts périodiquement.
-YIELDDISC		= RENDEMENT.SIMPLE		##	Calcule le taux de rendement d’un emprunt à intérêt simple (par exemple, un bon du Trésor).
-YIELDMAT		= RENDEMENT.TITRE.ECHEANCE	##	Renvoie le rendement annuel d’un titre qui rapporte des intérêts à l’échéance.
-
+CELL = CELLULE
+ERROR.TYPE = TYPE.ERREUR
+INFO = INFORMATIONS
+ISBLANK = ESTVIDE
+ISERR = ESTERR
+ISERROR = ESTERREUR
+ISEVEN = EST.PAIR
+ISFORMULA = ESTFORMULE
+ISLOGICAL = ESTLOGIQUE
+ISNA = ESTNA
+ISNONTEXT = ESTNONTEXTE
+ISNUMBER = ESTNUM
+ISODD = EST.IMPAIR
+ISREF = ESTREF
+ISTEXT = ESTTEXTE
+N = N
+NA = NA
+SHEET = FEUILLE
+SHEETS = FEUILLES
+TYPE = TYPE
 
 ##
-##	Information functions				Fonctions d’information
+## Fonctions logiques (Logical Functions)
 ##
-CELL			= CELLULE			##	Renvoie des informations sur la mise en forme, l’emplacement et le contenu d’une cellule.
-ERROR.TYPE		= TYPE.ERREUR			##	Renvoie un nombre correspondant à un type d’erreur.
-INFO			= INFORMATIONS			##	Renvoie des informations sur l’environnement d’exploitation actuel.
-ISBLANK			= ESTVIDE			##	Renvoie VRAI si l’argument valeur est vide.
-ISERR			= ESTERR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur, sauf #N/A.
-ISERROR			= ESTERREUR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur.
-ISEVEN			= EST.PAIR			##	Renvoie VRAI si le chiffre est pair.
-ISLOGICAL		= ESTLOGIQUE			##	Renvoie VRAI si l’argument valeur fait référence à une valeur logique.
-ISNA			= ESTNA				##	Renvoie VRAI si l’argument valeur fait référence à la valeur d’erreur #N/A.
-ISNONTEXT		= ESTNONTEXTE			##	Renvoie VRAI si l’argument valeur ne se présente pas sous forme de texte.
-ISNUMBER		= ESTNUM			##	Renvoie VRAI si l’argument valeur représente un nombre.
-ISODD			= EST.IMPAIR			##	Renvoie VRAI si le chiffre est impair.
-ISREF			= ESTREF			##	Renvoie VRAI si l’argument valeur est une référence.
-ISTEXT			= ESTTEXTE			##	Renvoie VRAI si l’argument valeur se présente sous forme de texte.
-N			= N				##	Renvoie une valeur convertie en nombre.
-NA			= NA				##	Renvoie la valeur d’erreur #N/A.
-TYPE			= TYPE				##	Renvoie un nombre indiquant le type de données d’une valeur.
-
+AND = ET
+FALSE = FAUX
+IF = SI
+IFERROR = SIERREUR
+IFNA = SI.NON.DISP
+IFS = SI.CONDITIONS
+NOT = NON
+OR = OU
+SWITCH = SI.MULTIPLE
+TRUE = VRAI
+XOR = OUX
 
 ##
-##	Logical functions				Fonctions logiques
+## Fonctions de recherche et de référence (Lookup & Reference Functions)
 ##
-AND			= ET				##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= FAUX				##	Renvoie la valeur logique FAUX.
-IF			= SI				##	Spécifie un test logique à effectuer.
-IFERROR			= SIERREUR			##	Renvoie une valeur que vous spécifiez si une formule génère une erreur ; sinon, elle renvoie le résultat de la formule.
-NOT			= NON				##	Inverse la logique de cet argument.
-OR			= OU				##	Renvoie VRAI si un des arguments est VRAI.
-TRUE			= VRAI				##	Renvoie la valeur logique VRAI.
-
+ADDRESS = ADRESSE
+AREAS = ZONES
+CHOOSE = CHOISIR
+COLUMN = COLONNE
+COLUMNS = COLONNES
+FORMULATEXT = FORMULETEXTE
+GETPIVOTDATA = LIREDONNEESTABCROISDYNAMIQUE
+HLOOKUP = RECHERCHEH
+HYPERLINK = LIEN_HYPERTEXTE
+INDEX = INDEX
+INDIRECT = INDIRECT
+LOOKUP = RECHERCHE
+MATCH = EQUIV
+OFFSET = DECALER
+ROW = LIGNE
+ROWS = LIGNES
+RTD = RTD
+TRANSPOSE = TRANSPOSE
+VLOOKUP = RECHERCHEV
+*RC = LC
 
 ##
-##	Lookup and reference functions			Fonctions de recherche et de référence
+## Fonctions mathématiques et trigonométriques (Math & Trig Functions)
 ##
-ADDRESS			= ADRESSE			##	Renvoie une référence sous forme de texte à une seule cellule d’une feuille de calcul.
-AREAS			= ZONES				##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= CHOISIR			##	Choisit une valeur dans une liste.
-COLUMN			= COLONNE			##	Renvoie le numéro de colonne d’une référence.
-COLUMNS			= COLONNES			##	Renvoie le nombre de colonnes dans une référence.
-HLOOKUP			= RECHERCHEH			##	Effectue une recherche dans la première ligne d’une matrice et renvoie la valeur de la cellule indiquée.
-HYPERLINK		= LIEN_HYPERTEXTE		##	Crée un raccourci ou un renvoi qui ouvre un document stocké sur un serveur réseau, sur un réseau Intranet ou sur Internet.
-INDEX			= INDEX				##	Utilise un index pour choisir une valeur provenant d’une référence ou d’une matrice.
-INDIRECT		= INDIRECT			##	Renvoie une référence indiquée par une valeur de texte.
-LOOKUP			= RECHERCHE			##	Recherche des valeurs dans un vecteur ou une matrice.
-MATCH			= EQUIV				##	Recherche des valeurs dans une référence ou une matrice.
-OFFSET			= DECALER			##	Renvoie une référence décalée par rapport à une référence donnée.
-ROW			= LIGNE				##	Renvoie le numéro de ligne d’une référence.
-ROWS			= LIGNES			##	Renvoie le nombre de lignes dans une référence.
-RTD			= RTD				##	Extrait les données en temps réel à partir d’un programme prenant en charge l’automation COM (Automation : utilisation des objets d'une application à partir d'une autre application ou d'un autre outil de développement. Autrefois appelée OLE Automation, Automation est une norme industrielle et une fonctionnalité du modèle d'objet COM (Component Object Model).).
-TRANSPOSE		= TRANSPOSE			##	Renvoie la transposition d’une matrice.
-VLOOKUP			= RECHERCHEV			##	Effectue une recherche dans la première colonne d’une matrice et se déplace sur la ligne pour renvoyer la valeur d’une cellule.
-
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAT
+ARABIC = CHIFFRE.ARABE
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = PLAFOND.MATH
+CEILING.PRECISE = PLAFOND.PRECIS
+COMBIN = COMBIN
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = DEGRES
+ECMA.CEILING = ECMA.PLAFOND
+EVEN = PAIR
+EXP = EXP
+FACT = FACT
+FACTDOUBLE = FACTDOUBLE
+FLOOR.MATH = PLANCHER.MATH
+FLOOR.PRECISE = PLANCHER.PRECIS
+GCD = PGCD
+INT = ENT
+ISO.CEILING = ISO.PLAFOND
+LCM = PPCM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMAT
+MINVERSE = INVERSEMAT
+MMULT = PRODUITMAT
+MOD = MOD
+MROUND = ARRONDI.AU.MULTIPLE
+MULTINOMIAL = MULTINOMIALE
+MUNIT = MATRICE.UNITAIRE
+ODD = IMPAIR
+PI = PI
+POWER = PUISSANCE
+PRODUCT = PRODUIT
+QUOTIENT = QUOTIENT
+RADIANS = RADIANS
+RAND = ALEA
+RANDBETWEEN = ALEA.ENTRE.BORNES
+ROMAN = ROMAIN
+ROUND = ARRONDI
+ROUNDDOWN = ARRONDI.INF
+ROUNDUP = ARRONDI.SUP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMME.SERIES
+SIGN = SIGNE
+SIN = SIN
+SINH = SINH
+SQRT = RACINE
+SQRTPI = RACINE.PI
+SUBTOTAL = SOUS.TOTAL
+SUM = SOMME
+SUMIF = SOMME.SI
+SUMIFS = SOMME.SI.ENS
+SUMPRODUCT = SOMMEPROD
+SUMSQ = SOMME.CARRES
+SUMX2MY2 = SOMME.X2MY2
+SUMX2PY2 = SOMME.X2PY2
+SUMXMY2 = SOMME.XMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRONQUE
 
 ##
-##	Math and trigonometry functions			Fonctions mathématiques et trigonométriques
+## Fonctions statistiques (Statistical Functions)
 ##
-ABS			= ABS				##	Renvoie la valeur absolue d’un nombre.
-ACOS			= ACOS				##	Renvoie l’arccosinus d’un nombre.
-ACOSH			= ACOSH				##	Renvoie le cosinus hyperbolique inverse d’un nombre.
-ASIN			= ASIN				##	Renvoie l’arcsinus d’un nombre.
-ASINH			= ASINH				##	Renvoie le sinus hyperbolique inverse d’un nombre.
-ATAN			= ATAN				##	Renvoie l’arctangente d’un nombre.
-ATAN2			= ATAN2				##	Renvoie l’arctangente des coordonnées x et y.
-ATANH			= ATANH				##	Renvoie la tangente hyperbolique inverse d’un nombre.
-CEILING			= PLAFOND			##	Arrondit un nombre au nombre entier le plus proche ou au multiple le plus proche de l’argument précision en s’éloignant de zéro.
-COMBIN			= COMBIN			##	Renvoie le nombre de combinaisons que l’on peut former avec un nombre donné d’objets.
-COS			= COS				##	Renvoie le cosinus d’un nombre.
-COSH			= COSH				##	Renvoie le cosinus hyperbolique d’un nombre.
-DEGREES			= DEGRES			##	Convertit des radians en degrés.
-EVEN			= PAIR				##	Arrondit un nombre au nombre entier pair le plus proche en s’éloignant de zéro.
-EXP			= EXP				##	Renvoie e élevé à la puissance d’un nombre donné.
-FACT			= FACT				##	Renvoie la factorielle d’un nombre.
-FACTDOUBLE		= FACTDOUBLE			##	Renvoie la factorielle double d’un nombre.
-FLOOR			= PLANCHER			##	Arrondit un nombre en tendant vers 0 (zéro).
-GCD			= PGCD				##	Renvoie le plus grand commun diviseur.
-INT			= ENT				##	Arrondit un nombre à l’entier immédiatement inférieur.
-LCM			= PPCM				##	Renvoie le plus petit commun multiple.
-LN			= LN				##	Renvoie le logarithme népérien d’un nombre.
-LOG			= LOG				##	Renvoie le logarithme d’un nombre dans la base spécifiée.
-LOG10			= LOG10				##	Calcule le logarithme en base 10 d’un nombre.
-MDETERM			= DETERMAT			##	Renvoie le déterminant d’une matrice.
-MINVERSE		= INVERSEMAT			##	Renvoie la matrice inverse d’une matrice.
-MMULT			= PRODUITMAT			##	Renvoie le produit de deux matrices.
-MOD			= MOD				##	Renvoie le reste d’une division.
-MROUND			= ARRONDI.AU.MULTIPLE		##	Donne l’arrondi d’un nombre au multiple spécifié.
-MULTINOMIAL		= MULTINOMIALE			##	Calcule la multinomiale d’un ensemble de nombres.
-ODD			= IMPAIR			##	Renvoie le nombre, arrondi à la valeur du nombre entier impair le plus proche en s’éloignant de zéro.
-PI			= PI				##	Renvoie la valeur de pi.
-POWER			= PUISSANCE			##	Renvoie la valeur du nombre élevé à une puissance.
-PRODUCT			= PRODUIT			##	Multiplie ses arguments.
-QUOTIENT		= QUOTIENT			##	Renvoie la partie entière du résultat d’une division.
-RADIANS			= RADIANS			##	Convertit des degrés en radians.
-RAND			= ALEA				##	Renvoie un nombre aléatoire compris entre 0 et 1.
-RANDBETWEEN		= ALEA.ENTRE.BORNES		##	Renvoie un nombre aléatoire entre les nombres que vous spécifiez.
-ROMAN			= ROMAIN			##	Convertit des chiffres arabes en chiffres romains, sous forme de texte.
-ROUND			= ARRONDI			##	Arrondit un nombre au nombre de chiffres indiqué.
-ROUNDDOWN		= ARRONDI.INF			##	Arrondit un nombre en tendant vers 0 (zéro).
-ROUNDUP			= ARRONDI.SUP			##	Arrondit un nombre à l’entier supérieur, en s’éloignant de zéro.
-SERIESSUM		= SOMME.SERIES			##	Renvoie la somme d’une série géométrique en s’appuyant sur la formule suivante :
-SIGN			= SIGNE				##	Renvoie le signe d’un nombre.
-SIN			= SIN				##	Renvoie le sinus d’un angle donné.
-SINH			= SINH				##	Renvoie le sinus hyperbolique d’un nombre.
-SQRT			= RACINE			##	Renvoie la racine carrée d’un nombre.
-SQRTPI			= RACINE.PI			##	Renvoie la racine carrée de (nombre * pi).
-SUBTOTAL		= SOUS.TOTAL			##	Renvoie un sous-total dans une liste ou une base de données.
-SUM			= SOMME				##	Calcule la somme de ses arguments.
-SUMIF			= SOMME.SI			##	Additionne les cellules spécifiées si elles répondent à un critère donné.
-SUMIFS			= SOMME.SI.ENS			##	Ajoute les cellules d’une plage qui répondent à plusieurs critères.
-SUMPRODUCT		= SOMMEPROD			##	Multiplie les valeurs correspondantes des matrices spécifiées et calcule la somme de ces produits.
-SUMSQ			= SOMME.CARRES			##	Renvoie la somme des carrés des arguments.
-SUMX2MY2		= SOMME.X2MY2			##	Renvoie la somme de la différence des carrés des valeurs correspondantes de deux matrices.
-SUMX2PY2		= SOMME.X2PY2			##	Renvoie la somme de la somme des carrés des valeurs correspondantes de deux matrices.
-SUMXMY2			= SOMME.XMY2			##	Renvoie la somme des carrés des différences entre les valeurs correspondantes de deux matrices.
-TAN			= TAN				##	Renvoie la tangente d’un nombre.
-TANH			= TANH				##	Renvoie la tangente hyperbolique d’un nombre.
-TRUNC			= TRONQUE			##	Renvoie la partie entière d’un nombre.
-
+AVEDEV = ECART.MOYEN
+AVERAGE = MOYENNE
+AVERAGEA = AVERAGEA
+AVERAGEIF = MOYENNE.SI
+AVERAGEIFS = MOYENNE.SI.ENS
+BETA.DIST = LOI.BETA.N
+BETA.INV = BETA.INVERSE.N
+BINOM.DIST = LOI.BINOMIALE.N
+BINOM.DIST.RANGE = LOI.BINOMIALE.SERIE
+BINOM.INV = LOI.BINOMIALE.INVERSE
+CHISQ.DIST = LOI.KHIDEUX.N
+CHISQ.DIST.RT = LOI.KHIDEUX.DROITE
+CHISQ.INV = LOI.KHIDEUX.INVERSE
+CHISQ.INV.RT = LOI.KHIDEUX.INVERSE.DROITE
+CHISQ.TEST = CHISQ.TEST
+CONFIDENCE.NORM = INTERVALLE.CONFIANCE.NORMAL
+CONFIDENCE.T = INTERVALLE.CONFIANCE.STUDENT
+CORREL = COEFFICIENT.CORRELATION
+COUNT = NB
+COUNTA = NBVAL
+COUNTBLANK = NB.VIDE
+COUNTIF = NB.SI
+COUNTIFS = NB.SI.ENS
+COVARIANCE.P = COVARIANCE.PEARSON
+COVARIANCE.S = COVARIANCE.STANDARD
+DEVSQ = SOMME.CARRES.ECARTS
+EXPON.DIST = LOI.EXPONENTIELLE.N
+F.DIST = LOI.F.N
+F.DIST.RT = LOI.F.DROITE
+F.INV = INVERSE.LOI.F.N
+F.INV.RT = INVERSE.LOI.F.DROITE
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHER.INVERSE
+FORECAST.ETS = PREVISION.ETS
+FORECAST.ETS.CONFINT = PREVISION.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISION.ETS.CARACTERESAISONNIER
+FORECAST.ETS.STAT = PREVISION.ETS.STAT
+FORECAST.LINEAR = PREVISION.LINEAIRE
+FREQUENCY = FREQUENCE
+GAMMA = GAMMA
+GAMMA.DIST = LOI.GAMMA.N
+GAMMA.INV = LOI.GAMMA.INVERSE.N
+GAMMALN = LNGAMMA
+GAMMALN.PRECISE = LNGAMMA.PRECIS
+GAUSS = GAUSS
+GEOMEAN = MOYENNE.GEOMETRIQUE
+GROWTH = CROISSANCE
+HARMEAN = MOYENNE.HARMONIQUE
+HYPGEOM.DIST = LOI.HYPERGEOMETRIQUE.N
+INTERCEPT = ORDONNEE.ORIGINE
+KURT = KURTOSIS
+LARGE = GRANDE.VALEUR
+LINEST = DROITEREG
+LOGEST = LOGREG
+LOGNORM.DIST = LOI.LOGNORMALE.N
+LOGNORM.INV = LOI.LOGNORMALE.INVERSE.N
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.SI
+MEDIAN = MEDIANE
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.SI
+MODE.MULT = MODE.MULTIPLE
+MODE.SNGL = MODE.SIMPLE
+NEGBINOM.DIST = LOI.BINOMIALE.NEG.N
+NORM.DIST = LOI.NORMALE.N
+NORM.INV = LOI.NORMALE.INVERSE.N
+NORM.S.DIST = LOI.NORMALE.STANDARD.N
+NORM.S.INV = LOI.NORMALE.STANDARD.INVERSE.N
+PEARSON = PEARSON
+PERCENTILE.EXC = CENTILE.EXCLURE
+PERCENTILE.INC = CENTILE.INCLURE
+PERCENTRANK.EXC = RANG.POURCENTAGE.EXCLURE
+PERCENTRANK.INC = RANG.POURCENTAGE.INCLURE
+PERMUT = PERMUTATION
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = LOI.POISSON.N
+PROB = PROBABILITE
+QUARTILE.EXC = QUARTILE.EXCLURE
+QUARTILE.INC = QUARTILE.INCLURE
+RANK.AVG = MOYENNE.RANG
+RANK.EQ = EQUATION.RANG
+RSQ = COEFFICIENT.DETERMINATION
+SKEW = COEFFICIENT.ASYMETRIE
+SKEW.P = COEFFICIENT.ASYMETRIE.P
+SLOPE = PENTE
+SMALL = PETITE.VALEUR
+STANDARDIZE = CENTREE.REDUITE
+STDEV.P = ECARTYPE.PEARSON
+STDEV.S = ECARTYPE.STANDARD
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = ERREUR.TYPE.XY
+T.DIST = LOI.STUDENT.N
+T.DIST.2T = LOI.STUDENT.BILATERALE
+T.DIST.RT = LOI.STUDENT.DROITE
+T.INV = LOI.STUDENT.INVERSE.N
+T.INV.2T = LOI.STUDENT.INVERSE.BILATERALE
+T.TEST = T.TEST
+TREND = TENDANCE
+TRIMMEAN = MOYENNE.REDUITE
+VAR.P = VAR.P.N
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = LOI.WEIBULL.N
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions				Fonctions statistiques
+## Fonctions de texte (Text Functions)
 ##
-AVEDEV			= ECART.MOYEN			##	Renvoie la moyenne des écarts absolus observés dans la moyenne des points de données.
-AVERAGE			= MOYENNE			##	Renvoie la moyenne de ses arguments.
-AVERAGEA		= AVERAGEA			##	Renvoie la moyenne de ses arguments, nombres, texte et valeurs logiques inclus.
-AVERAGEIF		= MOYENNE.SI			##	Renvoie la moyenne (arithmétique) de toutes les cellules d’une plage qui répondent à des critères donnés.
-AVERAGEIFS		= MOYENNE.SI.ENS		##	Renvoie la moyenne (arithmétique) de toutes les cellules qui répondent à plusieurs critères.
-BETADIST		= LOI.BETA			##	Renvoie la fonction de distribution cumulée.
-BETAINV			= BETA.INVERSE			##	Renvoie l’inverse de la fonction de distribution cumulée pour une distribution bêta spécifiée.
-BINOMDIST		= LOI.BINOMIALE			##	Renvoie la probabilité d’une variable aléatoire discrète suivant la loi binomiale.
-CHIDIST			= LOI.KHIDEUX			##	Renvoie la probabilité unilatérale de la distribution khi-deux.
-CHIINV			= KHIDEUX.INVERSE		##	Renvoie l’inverse de la probabilité unilatérale de la distribution khi-deux.
-CHITEST			= TEST.KHIDEUX			##	Renvoie le test d’indépendance.
-CONFIDENCE		= INTERVALLE.CONFIANCE		##	Renvoie l’intervalle de confiance pour une moyenne de population.
-CORREL			= COEFFICIENT.CORRELATION	##	Renvoie le coefficient de corrélation entre deux séries de données.
-COUNT			= NB				##	Détermine les nombres compris dans la liste des arguments.
-COUNTA			= NBVAL				##	Détermine le nombre de valeurs comprises dans la liste des arguments.
-COUNTBLANK		= NB.VIDE			##	Compte le nombre de cellules vides dans une plage.
-COUNTIF			= NB.SI				##	Compte le nombre de cellules qui répondent à un critère donné dans une plage.
-COUNTIFS		= NB.SI.ENS			##	Compte le nombre de cellules à l’intérieur d’une plage qui répondent à plusieurs critères.
-COVAR			= COVARIANCE			##	Renvoie la covariance, moyenne des produits des écarts pour chaque série d’observations.
-CRITBINOM		= CRITERE.LOI.BINOMIALE		##	Renvoie la plus petite valeur pour laquelle la distribution binomiale cumulée est inférieure ou égale à une valeur de critère.
-DEVSQ			= SOMME.CARRES.ECARTS		##	Renvoie la somme des carrés des écarts.
-EXPONDIST		= LOI.EXPONENTIELLE		##	Renvoie la distribution exponentielle.
-FDIST			= LOI.F				##	Renvoie la distribution de probabilité F.
-FINV			= INVERSE.LOI.F			##	Renvoie l’inverse de la distribution de probabilité F.
-FISHER			= FISHER			##	Renvoie la transformation de Fisher.
-FISHERINV		= FISHER.INVERSE		##	Renvoie l’inverse de la transformation de Fisher.
-FORECAST		= PREVISION			##	Calcule une valeur par rapport à une tendance linéaire.
-FREQUENCY		= FREQUENCE			##	Calcule la fréquence d’apparition des valeurs dans une plage de valeurs, puis renvoie des nombres sous forme de matrice verticale.
-FTEST			= TEST.F			##	Renvoie le résultat d’un test F.
-GAMMADIST		= LOI.GAMMA			##	Renvoie la probabilité d’une variable aléatoire suivant une loi Gamma.
-GAMMAINV		= LOI.GAMMA.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi Gamma.
-GAMMALN			= LNGAMMA			##	Renvoie le logarithme népérien de la fonction Gamma, G(x)
-GEOMEAN			= MOYENNE.GEOMETRIQUE		##	Renvoie la moyenne géométrique.
-GROWTH			= CROISSANCE			##	Calcule des valeurs par rapport à une tendance exponentielle.
-HARMEAN			= MOYENNE.HARMONIQUE		##	Renvoie la moyenne harmonique.
-HYPGEOMDIST		= LOI.HYPERGEOMETRIQUE		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi hypergéométrique.
-INTERCEPT		= ORDONNEE.ORIGINE		##	Renvoie l’ordonnée à l’origine d’une droite de régression linéaire.
-KURT			= KURTOSIS			##	Renvoie le kurtosis d’une série de données.
-LARGE			= GRANDE.VALEUR			##	Renvoie la k-ième plus grande valeur d’une série de données.
-LINEST			= DROITEREG			##	Renvoie les paramètres d’une tendance linéaire.
-LOGEST			= LOGREG			##	Renvoie les paramètres d’une tendance exponentielle.
-LOGINV			= LOI.LOGNORMALE.INVERSE	##	Renvoie l’inverse de la probabilité pour une variable aléatoire suivant la loi lognormale.
-LOGNORMDIST		= LOI.LOGNORMALE		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi lognormale.
-MAX			= MAX				##	Renvoie la valeur maximale contenue dans une liste d’arguments.
-MAXA			= MAXA				##	Renvoie la valeur maximale d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MEDIAN			= MEDIANE			##	Renvoie la valeur médiane des nombres donnés.
-MIN			= MIN				##	Renvoie la valeur minimale contenue dans une liste d’arguments.
-MINA			= MINA				##	Renvoie la plus petite valeur d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MODE			= MODE				##	Renvoie la valeur la plus courante d’une série de données.
-NEGBINOMDIST		= LOI.BINOMIALE.NEG		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi binomiale négative.
-NORMDIST		= LOI.NORMALE			##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale.
-NORMINV			= LOI.NORMALE.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi normale standard.
-NORMSDIST		= LOI.NORMALE.STANDARD		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale standard.
-NORMSINV		= LOI.NORMALE.STANDARD.INVERSE	##	Renvoie l’inverse de la distribution cumulée normale standard.
-PEARSON			= PEARSON			##	Renvoie le coefficient de corrélation d’échantillonnage de Pearson.
-PERCENTILE		= CENTILE			##	Renvoie le k-ième centile des valeurs d’une plage.
-PERCENTRANK		= RANG.POURCENTAGE		##	Renvoie le rang en pourcentage d’une valeur d’une série de données.
-PERMUT			= PERMUTATION			##	Renvoie le nombre de permutations pour un nombre donné d’objets.
-POISSON			= LOI.POISSON			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Poisson.
-PROB			= PROBABILITE			##	Renvoie la probabilité que des valeurs d’une plage soient comprises entre deux limites.
-QUARTILE		= QUARTILE			##	Renvoie le quartile d’une série de données.
-RANK			= RANG				##	Renvoie le rang d’un nombre contenu dans une liste.
-RSQ			= COEFFICIENT.DETERMINATION	##	Renvoie la valeur du coefficient de détermination R^2 d’une régression linéaire.
-SKEW			= COEFFICIENT.ASYMETRIE		##	Renvoie l’asymétrie d’une distribution.
-SLOPE			= PENTE				##	Renvoie la pente d’une droite de régression linéaire.
-SMALL			= PETITE.VALEUR			##	Renvoie la k-ième plus petite valeur d’une série de données.
-STANDARDIZE		= CENTREE.REDUITE		##	Renvoie une valeur centrée réduite.
-STDEV			= ECARTYPE			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population.
-STDEVA			= STDEVA			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques inclus.
-STDEVP			= ECARTYPEP			##	Calcule l’écart type d’une population à partir de la population entière.
-STDEVPA			= STDEVPA			##	Calcule l’écart type d’une population à partir de l’ensemble de la population, nombres, texte et valeurs logiques inclus.
-STEYX			= ERREUR.TYPE.XY		##	Renvoie l’erreur type de la valeur y prévue pour chaque x de la régression.
-TDIST			= LOI.STUDENT			##	Renvoie la probabilité d’une variable aléatoire suivant une loi T de Student.
-TINV			= LOI.STUDENT.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi T de Student.
-TREND			= TENDANCE			##	Renvoie des valeurs par rapport à une tendance linéaire.
-TRIMMEAN		= MOYENNE.REDUITE		##	Renvoie la moyenne de l’intérieur d’une série de données.
-TTEST			= TEST.STUDENT			##	Renvoie la probabilité associée à un test T de Student.
-VAR			= VAR				##	Calcule la variance sur la base d’un échantillon.
-VARA			= VARA				##	Estime la variance d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques incluses.
-VARP			= VAR.P				##	Calcule la variance sur la base de l’ensemble de la population.
-VARPA			= VARPA				##	Calcule la variance d’une population en se basant sur la population entière, nombres, texte et valeurs logiques inclus.
-WEIBULL			= LOI.WEIBULL			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Weibull.
-ZTEST			= TEST.Z			##	Renvoie la valeur de probabilité unilatérale d’un test z.
-
+BAHTTEXT = BAHTTEXT
+CHAR = CAR
+CLEAN = EPURAGE
+CODE = CODE
+CONCAT = CONCAT
+DOLLAR = DEVISE
+EXACT = EXACT
+FIND = TROUVE
+FIXED = CTXT
+LEFT = GAUCHE
+LEN = NBCAR
+LOWER = MINUSCULE
+MID = STXT
+NUMBERVALUE = VALEURNOMBRE
+PHONETIC = PHONETIQUE
+PROPER = NOMPROPRE
+REPLACE = REMPLACER
+REPT = REPT
+RIGHT = DROITE
+SEARCH = CHERCHE
+SUBSTITUTE = SUBSTITUE
+T = T
+TEXT = TEXTE
+TEXTJOIN = JOINDRE.TEXTE
+TRIM = SUPPRESPACE
+UNICHAR = UNICAR
+UNICODE = UNICODE
+UPPER = MAJUSCULE
+VALUE = CNUM
 
 ##
-##	Text functions					Fonctions de texte
+## Fonctions web (Web Functions)
 ##
-ASC			= ASC				##	Change les caractères anglais ou katakana à pleine chasse (codés sur deux octets) à l’intérieur d’une chaîne de caractères en caractères à demi-chasse (codés sur un octet).
-BAHTTEXT		= BAHTTEXT			##	Convertit un nombre en texte en utilisant le format monétaire ß (baht).
-CHAR			= CAR				##	Renvoie le caractère spécifié par le code numérique.
-CLEAN			= EPURAGE			##	Supprime tous les caractères de contrôle du texte.
-CODE			= CODE				##	Renvoie le numéro de code du premier caractère du texte.
-CONCATENATE		= CONCATENER			##	Assemble plusieurs éléments textuels de façon à n’en former qu’un seul.
-DOLLAR			= EURO				##	Convertit un nombre en texte en utilisant le format monétaire € (euro).
-EXACT			= EXACT				##	Vérifie si deux valeurs de texte sont identiques.
-FIND			= TROUVE			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FINDB			= TROUVERB			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FIXED			= CTXT				##	Convertit un nombre au format texte avec un nombre de décimales spécifié.
-JIS			= JIS				##	Change les caractères anglais ou katakana à demi-chasse (codés sur un octet) à l’intérieur d’une chaîne de caractères en caractères à à pleine chasse (codés sur deux octets).
-LEFT			= GAUCHE			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEFTB			= GAUCHEB			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEN			= NBCAR				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LENB			= LENB				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LOWER			= MINUSCULE			##	Convertit le texte en minuscules.
-MID			= STXT				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-MIDB			= STXTB				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-PHONETIC		= PHONETIQUE			##	Extrait les caractères phonétiques (furigana) d’une chaîne de texte.
-PROPER			= NOMPROPRE			##	Met en majuscules la première lettre de chaque mot dans une chaîne textuelle.
-REPLACE			= REMPLACER			##	Remplace des caractères dans un texte.
-REPLACEB		= REMPLACERB			##	Remplace des caractères dans un texte.
-REPT			= REPT				##	Répète un texte un certain nombre de fois.
-RIGHT			= DROITE			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-RIGHTB			= DROITEB			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-SEARCH			= CHERCHE			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SEARCHB			= CHERCHERB			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SUBSTITUTE		= SUBSTITUE			##	Remplace l’ancien texte d’une chaîne de caractères par un nouveau.
-T			= T				##	Convertit ses arguments en texte.
-TEXT			= TEXTE				##	Convertit un nombre au format texte.
-TRIM			= SUPPRESPACE			##	Supprime les espaces du texte.
-UPPER			= MAJUSCULE			##	Convertit le texte en majuscules.
-VALUE			= CNUM				##	Convertit un argument textuel en nombre
+ENCODEURL = URLENCODAGE
+FILTERXML = FILTRE.XML
+WEBSERVICE = SERVICEWEB
+
+##
+## Fonctions de compatibilité (Compatibility Functions)
+##
+BETADIST = LOI.BETA
+BETAINV = BETA.INVERSE
+BINOMDIST = LOI.BINOMIALE
+CEILING = PLAFOND
+CHIDIST = LOI.KHIDEUX
+CHIINV = KHIDEUX.INVERSE
+CHITEST = TEST.KHIDEUX
+CONCATENATE = CONCATENER
+CONFIDENCE = INTERVALLE.CONFIANCE
+COVAR = COVARIANCE
+CRITBINOM = CRITERE.LOI.BINOMIALE
+EXPONDIST = LOI.EXPONENTIELLE
+FDIST = LOI.F
+FINV = INVERSE.LOI.F
+FLOOR = PLANCHER
+FORECAST = PREVISION
+FTEST = TEST.F
+GAMMADIST = LOI.GAMMA
+GAMMAINV = LOI.GAMMA.INVERSE
+HYPGEOMDIST = LOI.HYPERGEOMETRIQUE
+LOGINV = LOI.LOGNORMALE.INVERSE
+LOGNORMDIST = LOI.LOGNORMALE
+MODE = MODE
+NEGBINOMDIST = LOI.BINOMIALE.NEG
+NORMDIST = LOI.NORMALE
+NORMINV = LOI.NORMALE.INVERSE
+NORMSDIST = LOI.NORMALE.STANDARD
+NORMSINV = LOI.NORMALE.STANDARD.INVERSE
+PERCENTILE = CENTILE
+PERCENTRANK = RANG.POURCENTAGE
+POISSON = LOI.POISSON
+QUARTILE = QUARTILE
+RANK = RANG
+STDEV = ECARTYPE
+STDEVP = ECARTYPEP
+TDIST = LOI.STUDENT
+TINV = LOI.STUDENT.INVERSE
+TTEST = TEST.STUDENT
+VAR = VAR
+VARP = VAR.P
+WEIBULL = LOI.WEIBULL
+ZTEST = TEST.Z
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config
index db61436c1..dc585d71f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config
@@ -1,23 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Magyar (Hungarian)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= Ft
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULLA!
-DIV0	= #ZÉRÓOSZTÓ!
-VALUE	= #ÉRTÉK!
-REF	= #HIV!
-NAME	= #NÉV?
-NUM	= #SZÁM!
-NA	= #HIÁNYZIK
+NULL = #NULLA!
+DIV0 = #ZÉRÓOSZTÓ!
+VALUE = #ÉRTÉK!
+REF = #HIV!
+NAME = #NÉV?
+NUM = #SZÁM!
+NA = #HIÁNYZIK
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
index 3adffeb14..4a375ea2d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
@@ -1,416 +1,538 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Magyar (Hungarian)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Bővítmények és automatizálási függvények
+## Kockafüggvények (Cube Functions)
 ##
-GETPIVOTDATA		= KIMUTATÁSADATOT.VESZ		##	A kimutatásokban tárolt adatok visszaadására használható.
-
+CUBEKPIMEMBER = KOCKA.FŐTELJMUT
+CUBEMEMBER = KOCKA.TAG
+CUBEMEMBERPROPERTY = KOCKA.TAG.TUL
+CUBERANKEDMEMBER = KOCKA.HALM.ELEM
+CUBESET = KOCKA.HALM
+CUBESETCOUNT = KOCKA.HALM.DB
+CUBEVALUE = KOCKA.ÉRTÉK
 
 ##
-##	Cube functions Kockafüggvények
+## Adatbázis-kezelő függvények (Database Functions)
 ##
-CUBEKPIMEMBER		= KOCKA.FŐTELJMUT		##	Egy fő teljesítménymutató (KPI) nevét, tulajdonságát és mértékegységét adja eredményül, a nevet és a tulajdonságot megjeleníti a cellában. A KPI-k számszerűsíthető mérési lehetőséget jelentenek – ilyen mutató például a havi bruttó nyereség vagy az egy alkalmazottra jutó negyedéves forgalom –, egy szervezet teljesítményének nyomonkövetésére használhatók.
-CUBEMEMBER		= KOCKA.TAG			##	Kockahierachia tagját vagy rekordját adja eredményül. Ellenőrizhető vele, hogy szerepel-e a kockában az adott tag vagy rekord.
-CUBEMEMBERPROPERTY	= KOCKA.TAG.TUL			##	A kocka egyik tagtulajdonságának értékét adja eredményül. Használatával ellenőrizhető, hogy szerepel-e egy tagnév a kockában, eredménye pedig az erre a tagra vonatkozó, megadott tulajdonság.
-CUBERANKEDMEMBER	= KOCKA.HALM.ELEM		##	Egy halmaz rangsor szerinti n-edik tagját adja eredményül. Használatával egy halmaz egy vagy több elemét kaphatja meg, például a legnagyobb teljesítményű üzletkötőt vagy a 10 legjobb tanulót.
-CUBESET			= KOCKA.HALM			##	Számított tagok vagy rekordok halmazát adja eredményül, ehhez egy beállított kifejezést elküld a kiszolgálón található kockának, majd ezt a halmazt adja vissza a Microsoft Office Excel alkalmazásnak.
-CUBESETCOUNT		= KOCKA.HALM.DB			##	Egy halmaz elemszámát adja eredményül.
-CUBEVALUE		= KOCKA.ÉRTÉK			##	Kockából összesített értéket ad eredményül.
-
+DAVERAGE = AB.ÁTLAG
+DCOUNT = AB.DARAB
+DCOUNTA = AB.DARAB2
+DGET = AB.MEZŐ
+DMAX = AB.MAX
+DMIN = AB.MIN
+DPRODUCT = AB.SZORZAT
+DSTDEV = AB.SZÓRÁS
+DSTDEVP = AB.SZÓRÁS2
+DSUM = AB.SZUM
+DVAR = AB.VAR
+DVARP = AB.VAR2
 
 ##
-##	Database functions				Adatbázis-kezelő függvények
+## Dátumfüggvények (Date & Time Functions)
 ##
-DAVERAGE		= AB.ÁTLAG			##	A kijelölt adatbáziselemek átlagát számítja ki.
-DCOUNT			= AB.DARAB			##	Megszámolja, hogy az adatbázisban hány cella tartalmaz számokat.
-DCOUNTA			= AB.DARAB2			##	Megszámolja az adatbázisban lévő nem üres cellákat.
-DGET			= AB.MEZŐ			##	Egy adatbázisból egyetlen olyan rekordot ad vissza, amely megfelel a megadott feltételeknek.
-DMAX			= AB.MAX			##	A kiválasztott adatbáziselemek közül a legnagyobb értéket adja eredményül.
-DMIN			= AB.MIN			##	A kijelölt adatbáziselemek közül a legkisebb értéket adja eredményül.
-DPRODUCT		= AB.SZORZAT			##	Az adatbázis megadott feltételeknek eleget tevő rekordjaira összeszorozza a megadott mezőben található számértékeket, és eredményül ezt a szorzatot adja.
-DSTDEV			= AB.SZÓRÁS			##	A kijelölt adatbáziselemek egy mintája alapján megbecsüli a szórást.
-DSTDEVP			= AB.SZÓRÁS2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórást.
-DSUM			= AB.SZUM			##	Összeadja a feltételnek megfelelő adatbázisrekordok mezőoszlopában a számokat.
-DVAR			= AB.VAR			##	A kijelölt adatbáziselemek mintája alapján becslést ad a szórásnégyzetre.
-DVARP			= AB.VAR2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórásnégyzetet.
-
+DATE = DÁTUM
+DATEDIF = DÁTUMTÓLIG
+DATESTRING = DÁTUMSZÖVEG
+DATEVALUE = DÁTUMÉRTÉK
+DAY = NAP
+DAYS = NAPOK
+DAYS360 = NAP360
+EDATE = KALK.DÁTUM
+EOMONTH = HÓNAP.UTOLSÓ.NAP
+HOUR = ÓRA
+ISOWEEKNUM = ISO.HÉT.SZÁMA
+MINUTE = PERCEK
+MONTH = HÓNAP
+NETWORKDAYS = ÖSSZ.MUNKANAP
+NETWORKDAYS.INTL = ÖSSZ.MUNKANAP.INTL
+NOW = MOST
+SECOND = MPERC
+THAIDAYOFWEEK = THAIHÉTNAPJA
+THAIMONTHOFYEAR = THAIHÓNAP
+THAIYEAR = THAIÉV
+TIME = IDŐ
+TIMEVALUE = IDŐÉRTÉK
+TODAY = MA
+WEEKDAY = HÉT.NAPJA
+WEEKNUM = HÉT.SZÁMA
+WORKDAY = KALK.MUNKANAP
+WORKDAY.INTL = KALK.MUNKANAP.INTL
+YEAR = ÉV
+YEARFRAC = TÖRTÉV
 
 ##
-##	Date and time functions				Dátumfüggvények
+## Mérnöki függvények (Engineering Functions)
 ##
-DATE			= DÁTUM				##	Adott dátum dátumértékét adja eredményül.
-DATEVALUE		= DÁTUMÉRTÉK			##	Szövegként megadott dátumot dátumértékké alakít át.
-DAY			= NAP				##	Dátumértéket a hónap egy napjává (0-31) alakít.
-DAYS360			= NAP360			##	Két dátum közé eső napok számát számítja ki a 360 napos év alapján.
-EDATE			= EDATE				##	Adott dátumnál adott számú hónappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-EOMONTH			= EOMONTH			##	Adott dátumnál adott számú hónappal korábbi vagy későbbi hónap utolsó napjának dátumértékét adja eredményül.
-HOUR			= ÓRA				##	Időértéket órákká alakít.
-MINUTE			= PERC				##	Időértéket percekké alakít.
-MONTH			= HÓNAP				##	Időértéket hónapokká alakít.
-NETWORKDAYS		= NETWORKDAYS			##	Két dátum között a teljes munkanapok számát adja meg.
-NOW			= MOST				##	A napi dátum dátumértékét és a pontos idő időértékét adja eredményül.
-SECOND			= MPERC				##	Időértéket másodpercekké alakít át.
-TIME			= IDŐ				##	Adott időpont időértékét adja meg.
-TIMEVALUE		= IDŐÉRTÉK			##	Szövegként megadott időpontot időértékké alakít át.
-TODAY			= MA				##	A napi dátum dátumértékét adja eredményül.
-WEEKDAY			= HÉT.NAPJA			##	Dátumértéket a hét napjává alakítja át.
-WEEKNUM			= WEEKNUM			##	Visszatérési értéke egy szám, amely azt mutatja meg, hogy a megadott dátum az év hányadik hetére esik.
-WORKDAY			= WORKDAY			##	Adott dátumnál adott munkanappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-YEAR			= ÉV				##	Sorszámot évvé alakít át.
-YEARFRAC		= YEARFRAC			##	Az adott dátumok közötti teljes napok számát törtévként adja meg.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.DEC
+BIN2HEX = BIN.HEX
+BIN2OCT = BIN.OKT
+BITAND = BIT.ÉS
+BITLSHIFT = BIT.BAL.ELTOL
+BITOR = BIT.VAGY
+BITRSHIFT = BIT.JOBB.ELTOL
+BITXOR = BIT.XVAGY
+COMPLEX = KOMPLEX
+CONVERT = KONVERTÁLÁS
+DEC2BIN = DEC.BIN
+DEC2HEX = DEC.HEX
+DEC2OCT = DEC.OKT
+DELTA = DELTA
+ERF = HIBAF
+ERF.PRECISE = HIBAF.PONTOS
+ERFC = HIBAF.KOMPLEMENTER
+ERFC.PRECISE = HIBAFKOMPLEMENTER.PONTOS
+GESTEP = KÜSZÖBNÉL.NAGYOBB
+HEX2BIN = HEX.BIN
+HEX2DEC = HEX.DEC
+HEX2OCT = HEX.OKT
+IMABS = KÉPZ.ABSZ
+IMAGINARY = KÉPZETES
+IMARGUMENT = KÉPZ.ARGUMENT
+IMCONJUGATE = KÉPZ.KONJUGÁLT
+IMCOS = KÉPZ.COS
+IMCOSH = KÉPZ.COSH
+IMCOT = KÉPZ.COT
+IMCSC = KÉPZ.CSC
+IMCSCH = KÉPZ.CSCH
+IMDIV = KÉPZ.HÁNYAD
+IMEXP = KÉPZ.EXP
+IMLN = KÉPZ.LN
+IMLOG10 = KÉPZ.LOG10
+IMLOG2 = KÉPZ.LOG2
+IMPOWER = KÉPZ.HATV
+IMPRODUCT = KÉPZ.SZORZAT
+IMREAL = KÉPZ.VALÓS
+IMSEC = KÉPZ.SEC
+IMSECH = KÉPZ.SECH
+IMSIN = KÉPZ.SIN
+IMSINH = KÉPZ.SINH
+IMSQRT = KÉPZ.GYÖK
+IMSUB = KÉPZ.KÜL
+IMSUM = KÉPZ.ÖSSZEG
+IMTAN = KÉPZ.TAN
+OCT2BIN = OKT.BIN
+OCT2DEC = OKT.DEC
+OCT2HEX = OKT.HEX
 
 ##
-##	Engineering functions				Mérnöki függvények
+## Pénzügyi függvények (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Az In(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELJ			= BESSELJ			##	A Jn(x) Bessel-függvény értékét adja eredményül.
-BESSELK			= BESSELK			##	A Kn(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELY			= BESSELY			##	Az Yn(x) módosított Bessel-függvény értékét adja eredményül.
-BIN2DEC			= BIN2DEC			##	Bináris számot decimálissá alakít át.
-BIN2HEX			= BIN2HEX			##	Bináris számot hexadecimálissá alakít át.
-BIN2OCT			= BIN2OCT			##	Bináris számot oktálissá alakít át.
-COMPLEX			= COMPLEX			##	Valós és képzetes részből komplex számot képez.
-CONVERT			= CONVERT			##	Mértékegységeket vált át.
-DEC2BIN			= DEC2BIN			##	Decimális számot binárissá alakít át.
-DEC2HEX			= DEC2HEX			##	Decimális számot hexadecimálissá alakít át.
-DEC2OCT			= DEC2OCT			##	Decimális számot oktálissá alakít át.
-DELTA			= DELTA				##	Azt vizsgálja, hogy két érték egyenlő-e.
-ERF			= ERF				##	A hibafüggvény értékét adja eredményül.
-ERFC			= ERFC				##	A kiegészített hibafüggvény értékét adja eredményül.
-GESTEP			= GESTEP			##	Azt vizsgálja, hogy egy szám nagyobb-e adott küszöbértéknél.
-HEX2BIN			= HEX2BIN			##	Hexadecimális számot binárissá alakít át.
-HEX2DEC			= HEX2DEC			##	Hexadecimális számot decimálissá alakít át.
-HEX2OCT			= HEX2OCT			##	Hexadecimális számot oktálissá alakít át.
-IMABS			= IMABS				##	Komplex szám abszolút értékét (modulusát) adja eredményül.
-IMAGINARY		= IMAGINARY			##	Komplex szám képzetes részét adja eredményül.
-IMARGUMENT		= IMARGUMENT			##	A komplex szám radiánban kifejezett théta argumentumát adja eredményül.
-IMCONJUGATE		= IMCONJUGATE			##	Komplex szám komplex konjugáltját adja eredményül.
-IMCOS			= IMCOS				##	Komplex szám koszinuszát adja eredményül.
-IMDIV			= IMDIV				##	Két komplex szám hányadosát adja eredményül.
-IMEXP			= IMEXP				##	Az e szám komplex kitevőjű hatványát adja eredményül.
-IMLN			= IMLN				##	Komplex szám természetes logaritmusát adja eredményül.
-IMLOG10			= IMLOG10			##	Komplex szám tízes alapú logaritmusát adja eredményül.
-IMLOG2			= IMLOG2			##	Komplex szám kettes alapú logaritmusát adja eredményül.
-IMPOWER			= IMPOWER			##	Komplex szám hatványát adja eredményül.
-IMPRODUCT		= IMPRODUCT			##	Komplex számok szorzatát adja eredményül.
-IMREAL			= IMREAL			##	Komplex szám valós részét adja eredményül.
-IMSIN			= IMSIN				##	Komplex szám szinuszát adja eredményül.
-IMSQRT			= IMSQRT			##	Komplex szám négyzetgyökét adja eredményül.
-IMSUB			= IMSUB				##	Két komplex szám különbségét adja eredményül.
-IMSUM			= IMSUM				##	Komplex számok összegét adja eredményül.
-OCT2BIN			= OCT2BIN			##	Oktális számot binárissá alakít át.
-OCT2DEC			= OCT2DEC			##	Oktális számot decimálissá alakít át.
-OCT2HEX			= OCT2HEX			##	Oktális számot hexadecimálissá alakít át.
-
+ACCRINT = IDŐSZAKI.KAMAT
+ACCRINTM = LEJÁRATI.KAMAT
+AMORDEGRC = ÉRTÉKCSÖKK.TÉNYEZŐVEL
+AMORLINC = ÉRTÉKCSÖKK
+COUPDAYBS = SZELVÉNYIDŐ.KEZDETTŐL
+COUPDAYS = SZELVÉNYIDŐ
+COUPDAYSNC = SZELVÉNYIDŐ.KIFIZETÉSTŐL
+COUPNCD = ELSŐ.SZELVÉNYDÁTUM
+COUPNUM = SZELVÉNYSZÁM
+COUPPCD = UTOLSÓ.SZELVÉNYDÁTUM
+CUMIPMT = ÖSSZES.KAMAT
+CUMPRINC = ÖSSZES.TŐKERÉSZ
+DB = KCS2
+DDB = KCSA
+DISC = LESZÁM
+DOLLARDE = FORINT.DEC
+DOLLARFR = FORINT.TÖRT
+DURATION = KAMATÉRZ
+EFFECT = TÉNYLEGES
+FV = JBÉ
+FVSCHEDULE = KJÉ
+INTRATE = KAMATRÁTA
+IPMT = RRÉSZLET
+IRR = BMR
+ISPMT = LRÉSZLETKAMAT
+MDURATION = MKAMATÉRZ
+MIRR = MEGTÉRÜLÉS
+NOMINAL = NÉVLEGES
+NPER = PER.SZÁM
+NPV = NMÉ
+ODDFPRICE = ELTÉRŐ.EÁR
+ODDFYIELD = ELTÉRŐ.EHOZAM
+ODDLPRICE = ELTÉRŐ.UÁR
+ODDLYIELD = ELTÉRŐ.UHOZAM
+PDURATION = KAMATÉRZ.PER
+PMT = RÉSZLET
+PPMT = PRÉSZLET
+PRICE = ÁR
+PRICEDISC = ÁR.LESZÁM
+PRICEMAT = ÁR.LEJÁRAT
+PV = MÉ
+RATE = RÁTA
+RECEIVED = KAPOTT
+RRI = MR
+SLN = LCSA
+SYD = ÉSZÖ
+TBILLEQ = KJEGY.EGYENÉRT
+TBILLPRICE = KJEGY.ÁR
+TBILLYIELD = KJEGY.HOZAM
+VDB = ÉCSRI
+XIRR = XBMR
+XNPV = XNJÉ
+YIELD = HOZAM
+YIELDDISC = HOZAM.LESZÁM
+YIELDMAT = HOZAM.LEJÁRAT
 
 ##
-##	Financial functions				Pénzügyi függvények
+## Információs függvények (Information Functions)
 ##
-ACCRINT			= ACCRINT			##	Periodikusan kamatozó értékpapír felszaporodott kamatát adja eredményül.
-ACCRINTM		= ACCRINTM			##	Lejáratkor kamatozó értékpapír felszaporodott kamatát adja eredményül.
-AMORDEGRC		= AMORDEGRC			##	Állóeszköz lineáris értékcsökkenését adja meg az egyes könyvelési időszakokra vonatkozóan.
-AMORLINC		= AMORLINC			##	Az egyes könyvelési időszakokban az értékcsökkenést adja meg.
-COUPDAYBS		= COUPDAYBS			##	A szelvényidőszak kezdetétől a kifizetés időpontjáig eltelt napokat adja vissza.
-COUPDAYS		= COUPDAYS			##	A kifizetés időpontját magában foglaló szelvényperiódus hosszát adja meg napokban.
-COUPDAYSNC		= COUPDAYSNC			##	A kifizetés időpontja és a legközelebbi szelvénydátum közötti napok számát adja meg.
-COUPNCD			= COUPNCD			##	A kifizetést követő legelső szelvénydátumot adja eredményül.
-COUPNUM			= COUPNUM			##	A kifizetés és a lejárat időpontja között kifizetendő szelvények számát adja eredményül.
-COUPPCD			= COUPPCD			##	A kifizetés előtti utolsó szelvénydátumot adja eredményül.
-CUMIPMT			= CUMIPMT			##	Két fizetési időszak között kifizetett kamat halmozott értékét adja eredményül.
-CUMPRINC		= CUMPRINC			##	Két fizetési időszak között kifizetett részletek halmozott (kamatot nem tartalmazó) értékét adja eredményül.
-DB			= KCS2				##	Eszköz adott időszak alatti értékcsökkenését számítja ki a lineáris leírási modell alkalmazásával.
-DDB			= KCSA				##	Eszköz értékcsökkenését számítja ki adott időszakra vonatkozóan a progresszív vagy egyéb megadott leírási modell alkalmazásával.
-DISC			= DISC				##	Értékpapír leszámítolási kamatlábát adja eredményül.
-DOLLARDE		= DOLLARDE			##	Egy közönséges törtként megadott számot tizedes törtté alakít át.
-DOLLARFR		= DOLLARFR			##	Tizedes törtként megadott számot közönséges törtté alakít át.
-DURATION		= DURATION			##	Periodikus kamatfizetésű értékpapír éves kamatérzékenységét adja eredményül.
-EFFECT			= EFFECT			##	Az éves tényleges kamatláb értékét adja eredményül.
-FV			= JBÉ				##	Befektetés jövőbeli értékét számítja ki.
-FVSCHEDULE		= FVSCHEDULE			##	A kezdőtőke adott kamatlábak szerint megnövelt jövőbeli értékét adja eredményül.
-INTRATE			= INTRATE			##	A lejáratig teljesen lekötött értékpapír kamatrátáját adja eredményül.
-IPMT			= RRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-IRR			= BMR				##	A befektetés belső megtérülési rátáját számítja ki pénzáramláshoz.
-ISPMT			= LRÉSZLETKAMAT			##	A befektetés adott időszakára fizetett kamatot számítja ki.
-MDURATION		= MDURATION			##	Egy 100 Ft névértékű értékpapír Macauley-féle módosított kamatérzékenységét adja eredményül.
-MIRR			= MEGTÉRÜLÉS			##	A befektetés belső megtérülési rátáját számítja ki a költségek és a bevételek különböző kamatlába mellett.
-NOMINAL			= NOMINAL			##	Az éves névleges kamatláb értékét adja eredményül.
-NPER			= PER.SZÁM			##	A törlesztési időszakok számát adja meg.
-NPV			= NMÉ				##	Befektetéshez kapcsolódó pénzáramlás nettó jelenértékét számítja ki ismert pénzáramlás és kamatláb mellett.
-ODDFPRICE		= ODDFPRICE			##	Egy 100 Ft névértékű, a futamidő elején töredék-időszakos értékpapír árát adja eredményül.
-ODDFYIELD		= ODDFYIELD			##	A futamidő elején töredék-időszakos értékpapír hozamát adja eredményül.
-ODDLPRICE		= ODDLPRICE			##	Egy 100 Ft névértékű, a futamidő végén töredék-időszakos értékpapír árát adja eredményül.
-ODDLYIELD		= ODDLYIELD			##	A futamidő végén töredék-időszakos értékpapír hozamát adja eredményül.
-PMT			= RÉSZLET			##	A törlesztési időszakra vonatkozó törlesztési összeget számítja ki.
-PPMT			= PRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-PRICE			= PRICE				##	Egy 100 Ft névértékű, periodikusan kamatozó értékpapír árát adja eredményül.
-PRICEDISC		= PRICEDISC			##	Egy 100 Ft névértékű leszámítolt értékpapír árát adja eredményül.
-PRICEMAT		= PRICEMAT			##	Egy 100 Ft névértékű, a lejáratkor kamatozó értékpapír árát adja eredményül.
-PV			= MÉ				##	Befektetés jelenlegi értékét számítja ki.
-RATE			= RÁTA				##	Egy törlesztési időszakban az egy időszakra eső kamatláb nagyságát számítja ki.
-RECEIVED		= RECEIVED			##	A lejáratig teljesen lekötött értékpapír lejáratakor kapott összegét adja eredményül.
-SLN			= LCSA				##	Tárgyi eszköz egy időszakra eső amortizációját adja meg bruttó érték szerinti lineáris leírási kulcsot alkalmazva.
-SYD			= SYD				##	Tárgyi eszköz értékcsökkenését számítja ki adott időszakra az évek számjegyösszegével dolgozó módszer alapján.
-TBILLEQ			= TBILLEQ			##	Kincstárjegy kötvény-egyenértékű hozamát adja eredményül.
-TBILLPRICE		= TBILLPRICE			##	Egy 100 Ft névértékű kincstárjegy árát adja eredményül.
-TBILLYIELD		= TBILLYIELD			##	Kincstárjegy hozamát adja eredményül.
-VDB			= ÉCSRI				##	Tárgyi eszköz amortizációját számítja ki megadott vagy részidőszakra a csökkenő egyenleg módszerének alkalmazásával.
-XIRR			= XIRR				##	Ütemezett készpénzforgalom (cash flow) belső megtérülési kamatrátáját adja eredményül.
-XNPV			= XNPV				##	Ütemezett készpénzforgalom (cash flow) nettó jelenlegi értékét adja eredményül.
-YIELD			= YIELD				##	Periodikusan kamatozó értékpapír hozamát adja eredményül.
-YIELDDISC		= YIELDDISC			##	Leszámítolt értékpapír (például kincstárjegy) éves hozamát adja eredményül.
-YIELDMAT		= YIELDMAT			##	Lejáratkor kamatozó értékpapír éves hozamát adja eredményül.
-
+CELL = CELLA
+ERROR.TYPE = HIBA.TÍPUS
+INFO = INFÓ
+ISBLANK = ÜRES
+ISERR = HIBA.E
+ISERROR = HIBÁS
+ISEVEN = PÁROSE
+ISFORMULA = KÉPLET
+ISLOGICAL = LOGIKAI
+ISNA = NINCS
+ISNONTEXT = NEM.SZÖVEG
+ISNUMBER = SZÁM
+ISODD = PÁRATLANE
+ISREF = HIVATKOZÁS
+ISTEXT = SZÖVEG.E
+N = S
+NA = HIÁNYZIK
+SHEET = LAP
+SHEETS = LAPOK
+TYPE = TÍPUS
 
 ##
-##	Information functions				Információs függvények
+## Logikai függvények (Logical Functions)
 ##
-CELL			= CELLA				##	Egy cella formátumára, elhelyezkedésére vagy tartalmára vonatkozó adatokat ad eredményül.
-ERROR.TYPE		= HIBA.TÍPUS			##	Egy hibatípushoz tartozó számot ad eredményül.
-INFO			= INFÓ				##	A rendszer- és munkakörnyezet pillanatnyi állapotáról ad felvilágosítást.
-ISBLANK			= ÜRES				##	Eredménye IGAZ, ha az érték üres.
-ISERR			= HIBA				##	Eredménye IGAZ, ha az érték valamelyik hibaérték a #HIÁNYZIK kivételével.
-ISERROR			= HIBÁS				##	Eredménye IGAZ, ha az érték valamelyik hibaérték.
-ISEVEN			= ISEVEN			##	Eredménye IGAZ, ha argumentuma páros szám.
-ISLOGICAL		= LOGIKAI			##	Eredménye IGAZ, ha az érték logikai érték.
-ISNA			= NINCS				##	Eredménye IGAZ, ha az érték a #HIÁNYZIK hibaérték.
-ISNONTEXT		= NEM.SZÖVEG			##	Eredménye IGAZ, ha az érték nem szöveg.
-ISNUMBER		= SZÁM				##	Eredménye IGAZ, ha az érték szám.
-ISODD			= ISODD				##	Eredménye IGAZ, ha argumentuma páratlan szám.
-ISREF			= HIVATKOZÁS			##	Eredménye IGAZ, ha az érték hivatkozás.
-ISTEXT			= SZÖVEG.E			##	Eredménye IGAZ, ha az érték szöveg.
-N			= N				##	Argumentumának értékét számmá alakítja.
-NA			= HIÁNYZIK			##	Eredménye a #HIÁNYZIK hibaérték.
-TYPE			= TÍPUS				##	Érték adattípusának azonosítószámát adja eredményül.
-
+AND = ÉS
+FALSE = HAMIS
+IF = HA
+IFERROR = HAHIBA
+IFNA = HAHIÁNYZIK
+IFS = HAELSŐIGAZ
+NOT = NEM
+OR = VAGY
+SWITCH = ÁTVÁLT
+TRUE = IGAZ
+XOR = XVAGY
 
 ##
-##	Logical functions				Logikai függvények
+## Keresési és hivatkozási függvények (Lookup & Reference Functions)
 ##
-AND			= ÉS				##	Eredménye IGAZ, ha minden argumentuma IGAZ.
-FALSE			= HAMIS				##	A HAMIS logikai értéket adja eredményül.
-IF			= HA				##	Logikai vizsgálatot hajt végre.
-IFERROR			= HAHIBA			##	A megadott értéket adja vissza, ha egy képlet hibához vezet; más esetben a képlet értékét adja eredményül.
-NOT			= NEM				##	Argumentuma értékének ellentettjét adja eredményül.
-OR			= VAGY				##	Eredménye IGAZ, ha bármely argumentuma IGAZ.
-TRUE			= IGAZ				##	Az IGAZ logikai értéket adja eredményül.
-
+ADDRESS = CÍM
+AREAS = TERÜLET
+CHOOSE = VÁLASZT
+COLUMN = OSZLOP
+COLUMNS = OSZLOPOK
+FORMULATEXT = KÉPLETSZÖVEG
+GETPIVOTDATA = KIMUTATÁSADATOT.VESZ
+HLOOKUP = VKERES
+HYPERLINK = HIPERHIVATKOZÁS
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = KERES
+MATCH = HOL.VAN
+OFFSET = ELTOLÁS
+ROW = SOR
+ROWS = SOROK
+RTD = VIA
+TRANSPOSE = TRANSZPONÁLÁS
+VLOOKUP = FKERES
+*RC = SO
 
 ##
-##	Lookup and reference functions			Keresési és hivatkozási függvények
+## Matematikai és trigonometrikus függvények (Math & Trig Functions)
 ##
-ADDRESS			= CÍM				##	A munkalap egy cellájára való hivatkozást adja szövegként eredményül.
-AREAS			= TERÜLET			##	Hivatkozásban a területek számát adja eredményül.
-CHOOSE			= VÁLASZT			##	Értékek listájából választ ki egy elemet.
-COLUMN			= OSZLOP			##	Egy hivatkozás oszlopszámát adja eredményül.
-COLUMNS			= OSZLOPOK			##	A hivatkozásban található oszlopok számát adja eredményül.
-HLOOKUP			= VKERES			##	A megadott tömb felső sorában adott értékű elemet keres, és a megtalált elem oszlopából adott sorban elhelyezkedő értékkel tér vissza.
-HYPERLINK		= HIPERHIVATKOZÁS		##	Hálózati kiszolgálón, intraneten vagy az interneten tárolt dokumentumot megnyitó parancsikont vagy hivatkozást hoz létre.
-INDEX			= INDEX				##	Tömb- vagy hivatkozás indexszel megadott értékét adja vissza.
-INDIRECT		= INDIREKT			##	Szöveg megadott hivatkozást ad eredményül.
-LOOKUP			= KERES				##	Vektorban vagy tömbben keres meg értékeket.
-MATCH			= HOL.VAN			##	Hivatkozásban vagy tömbben értékeket keres.
-OFFSET			= OFSZET			##	Hivatkozás egy másik hivatkozástól számított távolságát adja meg.
-ROW			= SOR				##	Egy hivatkozás sorának számát adja meg.
-ROWS			= SOROK				##	Egy hivatkozás sorainak számát adja meg.
-RTD			= RTD				##	Valós idejű adatokat keres vissza a COM automatizmust (automatizálás: Egy alkalmazás objektumaival való munka másik alkalmazásból vagy fejlesztőeszközből. A korábban OLE automatizmusnak nevezett automatizálás iparági szabvány, a Component Object Model (COM) szolgáltatása.) támogató programból.
-TRANSPOSE		= TRANSZPONÁLÁS			##	Egy tömb transzponáltját adja eredményül.
-VLOOKUP			= FKERES			##	A megadott tömb bal szélső oszlopában megkeres egy értéket, majd annak sora és a megadott oszlop metszéspontjában levő értéked adja eredményül.
-
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ACOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = ÖSSZESÍT
+ARABIC = ARAB
+ASIN = ARCSIN
+ASINH = ASINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ATANH
+BASE = ALAP
+CEILING.MATH = PLAFON.MAT
+CEILING.PRECISE = PLAFON.PONTOS
+COMBIN = KOMBINÁCIÓK
+COMBINA = KOMBINÁCIÓK.ISM
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = TIZEDES
+DEGREES = FOK
+ECMA.CEILING = ECMA.PLAFON
+EVEN = PÁROS
+EXP = KITEVŐ
+FACT = FAKT
+FACTDOUBLE = FAKTDUPLA
+FLOOR.MATH = PADLÓ.MAT
+FLOOR.PRECISE = PADLÓ.PONTOS
+GCD = LKO
+INT = INT
+ISO.CEILING = ISO.PLAFON
+LCM = LKT
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = INVERZ.MÁTRIX
+MMULT = MSZORZAT
+MOD = MARADÉK
+MROUND = TÖBBSZ.KEREKÍT
+MULTINOMIAL = SZORHÁNYFAKT
+MUNIT = MMÁTRIX
+ODD = PÁRATLAN
+PI = PI
+POWER = HATVÁNY
+PRODUCT = SZORZAT
+QUOTIENT = KVÓCIENS
+RADIANS = RADIÁN
+RAND = VÉL
+RANDBETWEEN = VÉLETLEN.KÖZÖTT
+ROMAN = RÓMAI
+ROUND = KEREKÍTÉS
+ROUNDBAHTDOWN = BAHTKEREK.LE
+ROUNDBAHTUP = BAHTKEREK.FEL
+ROUNDDOWN = KEREK.LE
+ROUNDUP = KEREK.FEL
+SEC = SEC
+SECH = SECH
+SERIESSUM = SORÖSSZEG
+SIGN = ELŐJEL
+SIN = SIN
+SINH = SINH
+SQRT = GYÖK
+SQRTPI = GYÖKPI
+SUBTOTAL = RÉSZÖSSZEG
+SUM = SZUM
+SUMIF = SZUMHA
+SUMIFS = SZUMHATÖBB
+SUMPRODUCT = SZORZATÖSSZEG
+SUMSQ = NÉGYZETÖSSZEG
+SUMX2MY2 = SZUMX2BŐLY2
+SUMX2PY2 = SZUMX2MEGY2
+SUMXMY2 = SZUMXBŐLY2
+TAN = TAN
+TANH = TANH
+TRUNC = CSONK
 
 ##
-##	Math and trigonometry functions			Matematikai és trigonometrikus függvények
+## Statisztikai függvények (Statistical Functions)
 ##
-ABS			= ABS				##	Egy szám abszolút értékét adja eredményül.
-ACOS			= ARCCOS			##	Egy szám arkusz koszinuszát számítja ki.
-ACOSH			= ACOSH				##	Egy szám inverz koszinusz hiperbolikuszát számítja ki.
-ASIN			= ARCSIN			##	Egy szám arkusz szinuszát számítja ki.
-ASINH			= ASINH				##	Egy szám inverz szinusz hiperbolikuszát számítja ki.
-ATAN			= ARCTAN			##	Egy szám arkusz tangensét számítja ki.
-ATAN2			= ARCTAN2			##	X és y koordináták alapján számítja ki az arkusz tangens értéket.
-ATANH			= ATANH				##	A szám inverz tangens hiperbolikuszát számítja ki.
-CEILING			= PLAFON			##	Egy számot a legközelebbi egészre vagy a pontosságként megadott érték legközelebb eső többszörösére kerekít.
-COMBIN			= KOMBINÁCIÓK			##	Adott számú objektum összes lehetséges kombinációinak számát számítja ki.
-COS			= COS				##	Egy szám koszinuszát számítja ki.
-COSH			= COSH				##	Egy szám koszinusz hiperbolikuszát számítja ki.
-DEGREES			= FOK				##	Radiánt fokká alakít át.
-EVEN			= PÁROS				##	Egy számot a legközelebbi páros egész számra kerekít.
-EXP			= KITEVŐ			##	Az e adott kitevőjű hatványát adja eredményül.
-FACT			= FAKT				##	Egy szám faktoriálisát számítja ki.
-FACTDOUBLE		= FACTDOUBLE			##	Egy szám dupla faktoriálisát adja eredményül.
-FLOOR			= PADLÓ				##	Egy számot lefelé, a nulla felé kerekít.
-GCD			= GCD				##	A legnagyobb közös osztót adja eredményül.
-INT			= INT				##	Egy számot lefelé kerekít a legközelebbi egészre.
-LCM			= LCM				##	A legkisebb közös többszöröst adja eredményül.
-LN			= LN				##	Egy szám természetes logaritmusát számítja ki.
-LOG			= LOG				##	Egy szám adott alapú logaritmusát számítja ki.
-LOG10			= LOG10				##	Egy szám 10-es alapú logaritmusát számítja ki.
-MDETERM			= MDETERM			##	Egy tömb mátrix-determinánsát számítja ki.
-MINVERSE		= INVERZ.MÁTRIX			##	Egy tömb mátrix inverzét adja eredményül.
-MMULT			= MSZORZAT			##	Két tömb mátrix-szorzatát adja meg.
-MOD			= MARADÉK			##	Egy szám osztási maradékát adja eredményül.
-MROUND			= MROUND			##	A kívánt többszörösére kerekített értéket ad eredményül.
-MULTINOMIAL		= MULTINOMIAL			##	Számhalmaz multinomiálisát adja eredményül.
-ODD			= PÁRATLAN			##	Egy számot a legközelebbi páratlan számra kerekít.
-PI			= PI				##	A pi matematikai állandót adja vissza.
-POWER			= HATVÁNY			##	Egy szám adott kitevőjű hatványát számítja ki.
-PRODUCT			= SZORZAT			##	Argumentumai szorzatát számítja ki.
-QUOTIENT		= QUOTIENT			##	Egy hányados egész részét adja eredményül.
-RADIANS			= RADIÁN			##	Fokot radiánná alakít át.
-RAND			= VÉL				##	Egy 0 és 1 közötti véletlen számot ad eredményül.
-RANDBETWEEN		= RANDBETWEEN			##	Megadott számok közé eső véletlen számot állít elő.
-ROMAN			= RÓMAI				##	Egy számot római számokkal kifejezve szövegként ad eredményül.
-ROUND			= KEREKÍTÉS			##	Egy számot adott számú számjegyre kerekít.
-ROUNDDOWN		= KEREKÍTÉS.LE			##	Egy számot lefelé, a nulla felé kerekít.
-ROUNDUP			= KEREKÍTÉS.FEL			##	Egy számot felfelé, a nullától távolabbra kerekít.
-SERIESSUM		= SERIESSUM			##	Hatványsor összegét adja eredményül.
-SIGN			= ELŐJEL			##	Egy szám előjelét adja meg.
-SIN			= SIN				##	Egy szög szinuszát számítja ki.
-SINH			= SINH				##	Egy szám szinusz hiperbolikuszát számítja ki.
-SQRT			= GYÖK				##	Egy szám pozitív négyzetgyökét számítja ki.
-SQRTPI			= SQRTPI			##	A (szám*pi) négyzetgyökét adja eredményül.
-SUBTOTAL		= RÉSZÖSSZEG			##	Lista vagy adatbázis részösszegét adja eredményül.
-SUM			= SZUM				##	Összeadja az argumentumlistájában lévő számokat.
-SUMIF			= SZUMHA			##	A megadott feltételeknek eleget tevő cellákban található értékeket adja össze.
-SUMIFS			= SZUMHATÖBB			##	Több megadott feltételnek eleget tévő tartománycellák összegét adja eredményül.
-SUMPRODUCT		= SZORZATÖSSZEG			##	A megfelelő tömbelemek szorzatának összegét számítja ki.
-SUMSQ			= NÉGYZETÖSSZEG			##	Argumentumai négyzetének összegét számítja ki.
-SUMX2MY2		= SZUMX2BŐLY2			##	Két tömb megfelelő elemei négyzetének különbségét összegzi.
-SUMX2PY2		= SZUMX2MEGY2			##	Két tömb megfelelő elemei négyzetének összegét összegzi.
-SUMXMY2			= SZUMXBŐLY2			##	Két tömb megfelelő elemei különbségének négyzetösszegét számítja ki.
-TAN			= TAN				##	Egy szám tangensét számítja ki.
-TANH			= TANH				##	Egy szám tangens hiperbolikuszát számítja ki.
-TRUNC			= CSONK				##	Egy számot egésszé csonkít.
-
+AVEDEV = ÁTL.ELTÉRÉS
+AVERAGE = ÁTLAG
+AVERAGEA = ÁTLAGA
+AVERAGEIF = ÁTLAGHA
+AVERAGEIFS = ÁTLAGHATÖBB
+BETA.DIST = BÉTA.ELOSZL
+BETA.INV = BÉTA.INVERZ
+BINOM.DIST = BINOM.ELOSZL
+BINOM.DIST.RANGE = BINOM.ELOSZL.TART
+BINOM.INV = BINOM.INVERZ
+CHISQ.DIST = KHINÉGYZET.ELOSZLÁS
+CHISQ.DIST.RT = KHINÉGYZET.ELOSZLÁS.JOBB
+CHISQ.INV = KHINÉGYZET.INVERZ
+CHISQ.INV.RT = KHINÉGYZET.INVERZ.JOBB
+CHISQ.TEST = KHINÉGYZET.PRÓBA
+CONFIDENCE.NORM = MEGBÍZHATÓSÁG.NORM
+CONFIDENCE.T = MEGBÍZHATÓSÁG.T
+CORREL = KORREL
+COUNT = DARAB
+COUNTA = DARAB2
+COUNTBLANK = DARABÜRES
+COUNTIF = DARABTELI
+COUNTIFS = DARABHATÖBB
+COVARIANCE.P = KOVARIANCIA.S
+COVARIANCE.S = KOVARIANCIA.M
+DEVSQ = SQ
+EXPON.DIST = EXP.ELOSZL
+F.DIST = F.ELOSZL
+F.DIST.RT = F.ELOSZLÁS.JOBB
+F.INV = F.INVERZ
+F.INV.RT = F.INVERZ.JOBB
+F.TEST = F.PRÓB
+FISHER = FISHER
+FISHERINV = INVERZ.FISHER
+FORECAST.ETS = ELŐREJELZÉS.ESIM
+FORECAST.ETS.CONFINT = ELŐREJELZÉS.ESIM.KONFINT
+FORECAST.ETS.SEASONALITY = ELŐREJELZÉS.ESIM.SZEZONALITÁS
+FORECAST.ETS.STAT = ELŐREJELZÉS.ESIM.STAT
+FORECAST.LINEAR = ELŐREJELZÉS.LINEÁRIS
+FREQUENCY = GYAKORISÁG
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.ELOSZL
+GAMMA.INV = GAMMA.INVERZ
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PONTOS
+GAUSS = GAUSS
+GEOMEAN = MÉRTANI.KÖZÉP
+GROWTH = NÖV
+HARMEAN = HARM.KÖZÉP
+HYPGEOM.DIST = HIPGEOM.ELOSZLÁS
+INTERCEPT = METSZ
+KURT = CSÚCSOSSÁG
+LARGE = NAGY
+LINEST = LIN.ILL
+LOGEST = LOG.ILL
+LOGNORM.DIST = LOGNORM.ELOSZLÁS
+LOGNORM.INV = LOGNORM.INVERZ
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXHA
+MEDIAN = MEDIÁN
+MIN = MIN
+MINA = MIN2
+MINIFS = MINHA
+MODE.MULT = MÓDUSZ.TÖBB
+MODE.SNGL = MÓDUSZ.EGY
+NEGBINOM.DIST = NEGBINOM.ELOSZLÁS
+NORM.DIST = NORM.ELOSZLÁS
+NORM.INV = NORM.INVERZ
+NORM.S.DIST = NORM.S.ELOSZLÁS
+NORM.S.INV = NORM.S.INVERZ
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTILIS.KIZÁR
+PERCENTILE.INC = PERCENTILIS.TARTALMAZ
+PERCENTRANK.EXC = SZÁZALÉKRANG.KIZÁR
+PERCENTRANK.INC = SZÁZALÉKRANG.TARTALMAZ
+PERMUT = VARIÁCIÓK
+PERMUTATIONA = VARIÁCIÓK.ISM
+PHI = FI
+POISSON.DIST = POISSON.ELOSZLÁS
+PROB = VALÓSZÍNŰSÉG
+QUARTILE.EXC = KVARTILIS.KIZÁR
+QUARTILE.INC = KVARTILIS.TARTALMAZ
+RANK.AVG = RANG.ÁTL
+RANK.EQ = RANG.EGY
+RSQ = RNÉGYZET
+SKEW = FERDESÉG
+SKEW.P = FERDESÉG.P
+SLOPE = MEREDEKSÉG
+SMALL = KICSI
+STANDARDIZE = NORMALIZÁLÁS
+STDEV.P = SZÓR.S
+STDEV.S = SZÓR.M
+STDEVA = SZÓRÁSA
+STDEVPA = SZÓRÁSPA
+STEYX = STHIBAYX
+T.DIST = T.ELOSZL
+T.DIST.2T = T.ELOSZLÁS.2SZ
+T.DIST.RT = T.ELOSZLÁS.JOBB
+T.INV = T.INVERZ
+T.INV.2T = T.INVERZ.2SZ
+T.TEST = T.PRÓB
+TREND = TREND
+TRIMMEAN = RÉSZÁTLAG
+VAR.P = VAR.S
+VAR.S = VAR.M
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.ELOSZLÁS
+Z.TEST = Z.PRÓB
 
 ##
-##	Statistical functions				Statisztikai függvények
+## Szövegműveletekhez használható függvények (Text Functions)
 ##
-AVEDEV			= ÁTL.ELTÉRÉS			##	Az adatpontoknak átlaguktól való átlagos abszolút eltérését számítja ki.
-AVERAGE			= ÁTLAG				##	Argumentumai átlagát számítja ki.
-AVERAGEA		= ÁTLAGA			##	Argumentumai átlagát számítja ki (beleértve a számokat, szöveget és logikai értékeket).
-AVERAGEIF		= ÁTLAGHA			##	A megadott feltételnek eleget tévő tartomány celláinak átlagát (számtani közepét) adja eredményül.
-AVERAGEIFS		= ÁTLAGHATÖBB			##	A megadott feltételeknek eleget tévő cellák átlagát (számtani közepét) adja eredményül.
-BETADIST		= BÉTA.ELOSZLÁS			##	A béta-eloszlás függvényt számítja ki.
-BETAINV			= INVERZ.BÉTA			##	Adott béta-eloszláshoz kiszámítja a béta eloszlásfüggvény inverzét.
-BINOMDIST		= BINOM.ELOSZLÁS		##	A diszkrét binomiális eloszlás valószínűségértékét számítja ki.
-CHIDIST			= KHI.ELOSZLÁS			##	A khi-négyzet-eloszlás egyszélű valószínűségértékét számítja ki.
-CHIINV			= INVERZ.KHI			##	A khi-négyzet-eloszlás egyszélű valószínűségértékének inverzét számítja ki.
-CHITEST			= KHI.PRÓBA			##	Függetlenségvizsgálatot hajt végre.
-CONFIDENCE		= MEGBÍZHATÓSÁG			##	Egy statisztikai sokaság várható értékének megbízhatósági intervallumát adja eredményül.
-CORREL			= KORREL			##	Két adathalmaz korrelációs együtthatóját számítja ki.
-COUNT			= DARAB				##	Megszámolja, hogy argumentumlistájában hány szám található.
-COUNTA			= DARAB2			##	Megszámolja, hogy argumentumlistájában hány érték található.
-COUNTBLANK		= DARABÜRES			##	Egy tartományban összeszámolja az üres cellákat.
-COUNTIF			= DARABTELI			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek a megadott feltételnek.
-COUNTIFS		= DARABHATÖBB			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek több feltételnek.
-COVAR			= KOVAR				##	A kovarianciát, azaz a páronkénti eltérések szorzatának átlagát számítja ki.
-CRITBINOM		= KRITBINOM			##	Azt a legkisebb számot adja eredményül, amelyre a binomiális eloszlásfüggvény értéke nem kisebb egy adott határértéknél.
-DEVSQ			= SQ				##	Az átlagtól való eltérések négyzetének összegét számítja ki.
-EXPONDIST		= EXP.ELOSZLÁS			##	Az exponenciális eloszlás értékét számítja ki.
-FDIST			= F.ELOSZLÁS			##	Az F-eloszlás értékét számítja ki.
-FINV			= INVERZ.F			##	Az F-eloszlás inverzének értékét számítja ki.
-FISHER			= FISHER			##	Fisher-transzformációt hajt végre.
-FISHERINV		= INVERZ.FISHER			##	A Fisher-transzformáció inverzét hajtja végre.
-FORECAST		= ELŐREJELZÉS			##	Az ismert értékek alapján lineáris regresszióval becsült értéket ad eredményül.
-FREQUENCY		= GYAKORISÁG			##	A gyakorisági vagy empirikus eloszlás értékét függőleges tömbként adja eredményül.
-FTEST			= F.PRÓBA			##	Az F-próba értékét adja eredményül.
-GAMMADIST		= GAMMA.ELOSZLÁS		##	A gamma-eloszlás értékét számítja ki.
-GAMMAINV		= INVERZ.GAMMA			##	A gamma-eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-GAMMALN			= GAMMALN			##	A gamma-függvény természetes logaritmusát számítja ki.
-GEOMEAN			= MÉRTANI.KÖZÉP			##	Argumentumai mértani középértékét számítja ki.
-GROWTH			= NÖV				##	Exponenciális regresszió alapján ad becslést.
-HARMEAN			= HARM.KÖZÉP			##	Argumentumai harmonikus átlagát számítja ki.
-HYPGEOMDIST		= HIPERGEOM.ELOSZLÁS		##	A hipergeometriai eloszlás értékét számítja ki.
-INTERCEPT		= METSZ				##	A regressziós egyenes y tengellyel való metszéspontját határozza meg.
-KURT			= CSÚCSOSSÁG			##	Egy adathalmaz csúcsosságát számítja ki.
-LARGE			= NAGY				##	Egy adathalmaz k-adik legnagyobb elemét adja eredményül.
-LINEST			= LIN.ILL			##	A legkisebb négyzetek módszerével az adatokra illesztett egyenes paramétereit határozza meg.
-LOGEST			= LOG.ILL			##	Az adatokra illesztett exponenciális görbe paramétereit határozza meg.
-LOGINV			= INVERZ.LOG.ELOSZLÁS		##	A lognormális eloszlás inverzét számítja ki.
-LOGNORMDIST		= LOG.ELOSZLÁS			##	A lognormális eloszlásfüggvény értékét számítja ki.
-MAX			= MAX				##	Az argumentumai között szereplő legnagyobb számot adja meg.
-MAXA			= MAX2				##	Az argumentumai között szereplő legnagyobb számot adja meg (beleértve a számokat, szöveget és logikai értékeket).
-MEDIAN			= MEDIÁN			##	Adott számhalmaz mediánját számítja ki.
-MIN			= MIN				##	Az argumentumai között szereplő legkisebb számot adja meg.
-MINA			= MIN2				##	Az argumentumai között szereplő legkisebb számot adja meg, beleértve a számokat, szöveget és logikai értékeket.
-MODE			= MÓDUSZ			##	Egy adathalmazból kiválasztja a leggyakrabban előforduló számot.
-NEGBINOMDIST		= NEGBINOM.ELOSZL		##	A negatív binomiális eloszlás értékét számítja ki.
-NORMDIST		= NORM.ELOSZL			##	A normális eloszlás értékét számítja ki.
-NORMINV			= INVERZ.NORM			##	A normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-NORMSDIST		= STNORMELOSZL			##	A standard normális eloszlás eloszlásfüggvényének értékét számítja ki.
-NORMSINV		= INVERZ.STNORM			##	A standard normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-PEARSON			= PEARSON			##	A Pearson-féle korrelációs együtthatót számítja ki.
-PERCENTILE		= PERCENTILIS			##	Egy tartományban található értékek k-adik percentilisét, azaz százalékosztályát adja eredményül.
-PERCENTRANK		= SZÁZALÉKRANG			##	Egy értéknek egy adathalmazon belül vett százalékos rangját (elhelyezkedését) számítja ki.
-PERMUT			= VARIÁCIÓK			##	Adott számú objektum k-ad osztályú ismétlés nélküli variációinak számát számítja ki.
-POISSON			= POISSON			##	A Poisson-eloszlás értékét számítja ki.
-PROB			= VALÓSZÍNŰSÉG			##	Annak valószínűségét számítja ki, hogy adott értékek két határérték közé esnek.
-QUARTILE		= KVARTILIS			##	Egy adathalmaz kvartilisét (negyedszintjét) számítja ki.
-RANK			= SORSZÁM			##	Kiszámítja, hogy egy szám hányadik egy számsorozatban.
-RSQ			= RNÉGYZET			##	Kiszámítja a Pearson-féle szorzatmomentum korrelációs együtthatójának négyzetét.
-SKEW			= FERDESÉG			##	Egy eloszlás ferdeségét határozza meg.
-SLOPE			= MEREDEKSÉG			##	Egy lineáris regressziós egyenes meredekségét számítja ki.
-SMALL			= KICSI				##	Egy adathalmaz k-adik legkisebb elemét adja meg.
-STANDARDIZE		= NORMALIZÁLÁS			##	Normalizált értéket ad eredményül.
-STDEV			= SZÓRÁS			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását.
-STDEVA			= SZÓRÁSA			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását (beleértve a számokat, szöveget és logikai értékeket).
-STDEVP			= SZÓRÁSP			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását.
-STDEVPA			= SZÓRÁSPA			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását (beleértve számokat, szöveget és logikai értékeket).
-STEYX			= STHIBAYX			##	Egy regresszió esetén az egyes x-értékek alapján meghatározott y-értékek standard hibáját számítja ki.
-TDIST			= T.ELOSZLÁS			##	A Student-féle t-eloszlás értékét számítja ki.
-TINV			= INVERZ.T			##	A Student-féle t-eloszlás inverzét számítja ki.
-TREND			= TREND				##	Lineáris trend értékeit számítja ki.
-TRIMMEAN		= RÉSZÁTLAG			##	Egy adathalmaz középső részének átlagát számítja ki.
-TTEST			= T.PRÓBA			##	A Student-féle t-próbához tartozó valószínűséget számítja ki.
-VAR			= VAR				##	Minta alapján becslést ad a varianciára.
-VARA			= VARA				##	Minta alapján becslést ad a varianciára (beleértve számokat, szöveget és logikai értékeket).
-VARP			= VARP				##	Egy statisztikai sokaság varianciáját számítja ki.
-VARPA			= VARPA				##	Egy statisztikai sokaság varianciáját számítja ki (beleértve számokat, szöveget és logikai értékeket).
-WEIBULL			= WEIBULL			##	A Weibull-féle eloszlás értékét számítja ki.
-ZTEST			= Z.PRÓBA			##	Az egyszélű z-próbával kapott valószínűségértéket számítja ki.
-
+BAHTTEXT = BAHTSZÖVEG
+CHAR = KARAKTER
+CLEAN = TISZTÍT
+CODE = KÓD
+CONCAT = FŰZ
+DOLLAR = FORINT
+EXACT = AZONOS
+FIND = SZÖVEG.TALÁL
+FIXED = FIX
+ISTHAIDIGIT = ON.THAI.NUMERO
+LEFT = BAL
+LEN = HOSSZ
+LOWER = KISBETŰ
+MID = KÖZÉP
+NUMBERSTRING = SZÁM.BETŰVEL
+NUMBERVALUE = SZÁMÉRTÉK
+PHONETIC = FONETIKUS
+PROPER = TNÉV
+REPLACE = CSERE
+REPT = SOKSZOR
+RIGHT = JOBB
+SEARCH = SZÖVEG.KERES
+SUBSTITUTE = HELYETTE
+T = T
+TEXT = SZÖVEG
+TEXTJOIN = SZÖVEGÖSSZEFŰZÉS
+THAIDIGIT = THAISZÁM
+THAINUMSOUND = THAISZÁMHANG
+THAINUMSTRING = THAISZÁMKAR
+THAISTRINGLENGTH = THAIKARHOSSZ
+TRIM = KIMETSZ
+UNICHAR = UNIKARAKTER
+UNICODE = UNICODE
+UPPER = NAGYBETŰS
+VALUE = ÉRTÉK
 
 ##
-##	Text functions					Szövegműveletekhez használható függvények
+## Webes függvények (Web Functions)
 ##
-ASC			= ASC				##	Szöveg teljes szélességű (kétbájtos) latin és katakana karaktereit félszélességű (egybájtos) karakterekké alakítja.
-BAHTTEXT		= BAHTSZÖVEG			##	Számot szöveggé alakít a ß (baht) pénznemformátum használatával.
-CHAR			= KARAKTER			##	A kódszámmal meghatározott karaktert adja eredményül.
-CLEAN			= TISZTÍT			##	A szövegből eltávolítja az összes nem nyomtatható karaktert.
-CODE			= KÓD				##	Karaktersorozat első karakterének numerikus kódját adja eredményül.
-CONCATENATE		= ÖSSZEFŰZ			##	Több szövegelemet egyetlen szöveges elemmé fűz össze.
-DOLLAR			= FORINT			##	Számot pénznem formátumú szöveggé alakít át.
-EXACT			= AZONOS			##	Megvizsgálja, hogy két érték azonos-e.
-FIND			= SZÖVEG.TALÁL			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FINDB			= SZÖVEG.TALÁL2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FIXED			= FIX				##	Számot szöveges formátumúra alakít adott számú tizedesjegyre kerekítve.
-JIS			= JIS				##	A félszélességű (egybájtos) latin és a katakana karaktereket teljes szélességű (kétbájtos) karakterekké alakítja.
-LEFT			= BAL				##	Szöveg bal szélső karaktereit adja eredményül.
-LEFTB			= BAL2				##	Szöveg bal szélső karaktereit adja eredményül.
-LEN			= HOSSZ				##	Szöveg karakterekben mért hosszát adja eredményül.
-LENB			= HOSSZ2			##	Szöveg karakterekben mért hosszát adja eredményül.
-LOWER			= KISBETŰ			##	Szöveget kisbetűssé alakít át.
-MID			= KÖZÉP				##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-MIDB			= KÖZÉP2			##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-PHONETIC		= PHONETIC			##	Szöveg furigana (fonetikus) karaktereit adja vissza.
-PROPER			= TNÉV				##	Szöveg minden szavának kezdőbetűjét nagybetűsre cseréli.
-REPLACE			= CSERE				##	A szövegen belül karaktereket cserél.
-REPLACEB		= CSERE2			##	A szövegen belül karaktereket cserél.
-REPT			= SOKSZOR			##	Megadott számú alkalommal megismétel egy szövegrészt.
-RIGHT			= JOBB				##	Szövegrész jobb szélső karaktereit adja eredményül.
-RIGHTB			= JOBB2				##	Szövegrész jobb szélső karaktereit adja eredményül.
-SEARCH			= SZÖVEG.KERES			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SEARCHB			= SZÖVEG.KERES2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SUBSTITUTE		= HELYETTE			##	Szövegben adott karaktereket másikra cserél.
-T			= T				##	Argumentumát szöveggé alakítja át.
-TEXT			= SZÖVEG			##	Számértéket alakít át adott számformátumú szöveggé.
-TRIM			= TRIM				##	A szövegből eltávolítja a szóközöket.
-UPPER			= NAGYBETŰS			##	Szöveget nagybetűssé alakít át.
-VALUE			= ÉRTÉK				##	Szöveget számmá alakít át.
+ENCODEURL = URL.KÓDOL
+FILTERXML = XMLSZŰRÉS
+WEBSERVICE = WEBSZOLGÁLTATÁS
+
+##
+## Kompatibilitási függvények (Compatibility Functions)
+##
+BETADIST = BÉTA.ELOSZLÁS
+BETAINV = INVERZ.BÉTA
+BINOMDIST = BINOM.ELOSZLÁS
+CEILING = PLAFON
+CHIDIST = KHI.ELOSZLÁS
+CHIINV = INVERZ.KHI
+CHITEST = KHI.PRÓBA
+CONCATENATE = ÖSSZEFŰZ
+CONFIDENCE = MEGBÍZHATÓSÁG
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXP.ELOSZLÁS
+FDIST = F.ELOSZLÁS
+FINV = INVERZ.F
+FLOOR = PADLÓ
+FORECAST = ELŐREJELZÉS
+FTEST = F.PRÓBA
+GAMMADIST = GAMMA.ELOSZLÁS
+GAMMAINV = INVERZ.GAMMA
+HYPGEOMDIST = HIPERGEOM.ELOSZLÁS
+LOGINV = INVERZ.LOG.ELOSZLÁS
+LOGNORMDIST = LOG.ELOSZLÁS
+MODE = MÓDUSZ
+NEGBINOMDIST = NEGBINOM.ELOSZL
+NORMDIST = NORM.ELOSZL
+NORMINV = INVERZ.NORM
+NORMSDIST = STNORMELOSZL
+NORMSINV = INVERZ.STNORM
+PERCENTILE = PERCENTILIS
+PERCENTRANK = SZÁZALÉKRANG
+POISSON = POISSON
+QUARTILE = KVARTILIS
+RANK = SORSZÁM
+STDEV = SZÓRÁS
+STDEVP = SZÓRÁSP
+TDIST = T.ELOSZLÁS
+TINV = INVERZ.T
+TTEST = T.PRÓBA
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = Z.PRÓBA
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config
index 6cc013aec..5c1e49556 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Italiano (Italian)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NULLO!
-DIV0	= #DIV/0!
-VALUE	= #VALORE!
-REF	= #RIF!
-NAME	= #NOME?
-NUM	= #NUM!
-NA	= #N/D
+NULL
+DIV0
+VALUE = #VALORE!
+REF = #RIF!
+NAME = #NOME?
+NUM
+NA = #N/D
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions
index 1901bafa7..c14ed85f0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions
@@ -1,416 +1,537 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Italiano (Italian)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Funzioni di automazione e dei componenti aggiuntivi
+## Funzioni cubo (Cube Functions)
 ##
-GETPIVOTDATA		= INFO.DATI.TAB.PIVOT		##	Restituisce i dati memorizzati in un rapporto di tabella pivot
-
+CUBEKPIMEMBER = MEMBRO.KPI.CUBO
+CUBEMEMBER = MEMBRO.CUBO
+CUBEMEMBERPROPERTY = PROPRIETÀ.MEMBRO.CUBO
+CUBERANKEDMEMBER = MEMBRO.CUBO.CON.RANGO
+CUBESET = SET.CUBO
+CUBESETCOUNT = CONTA.SET.CUBO
+CUBEVALUE = VALORE.CUBO
 
 ##
-##	Cube functions					Funzioni cubo
+## Funzioni di database (Database Functions)
 ##
-CUBEKPIMEMBER		= MEMBRO.KPI.CUBO		##	Restituisce il nome, la proprietà e la misura di un indicatore di prestazioni chiave (KPI) e visualizza il nome e la proprietà nella cella. Un KPI è una misura quantificabile, ad esempio l'utile lordo mensile o il fatturato trimestrale dei dipendenti, utilizzata per il monitoraggio delle prestazioni di un'organizzazione.
-CUBEMEMBER		= MEMBRO.CUBO			##	Restituisce un membro o una tupla in una gerarchia di cubi. Consente di verificare l'esistenza del membro o della tupla nel cubo.
-CUBEMEMBERPROPERTY	= PROPRIETÀ.MEMBRO.CUBO		##	Restituisce il valore di una proprietà di un membro del cubo. Consente di verificare l'esistenza di un nome di membro all'interno del cubo e di restituire la proprietà specificata per tale membro.
-CUBERANKEDMEMBER	= MEMBRO.CUBO.CON.RANGO		##	Restituisce l'n-esimo membro o il membro ordinato di un insieme. Consente di restituire uno o più elementi in un insieme, ad esempio l'agente di vendita migliore o i primi 10 studenti.
-CUBESET			= SET.CUBO			##	Definisce un insieme di tuple o membri calcolati mediante l'invio di un'espressione di insieme al cubo sul server. In questo modo l'insieme viene creato e restituito a Microsoft Office Excel.
-CUBESETCOUNT		= CONTA.SET.CUBO		##	Restituisce il numero di elementi di un insieme.
-CUBEVALUE		= VALORE.CUBO			##	Restituisce un valore aggregato da un cubo.
-
+DAVERAGE = DB.MEDIA
+DCOUNT = DB.CONTA.NUMERI
+DCOUNTA = DB.CONTA.VALORI
+DGET = DB.VALORI
+DMAX = DB.MAX
+DMIN = DB.MIN
+DPRODUCT = DB.PRODOTTO
+DSTDEV = DB.DEV.ST
+DSTDEVP = DB.DEV.ST.POP
+DSUM = DB.SOMMA
+DVAR = DB.VAR
+DVARP = DB.VAR.POP
 
 ##
-##	Database functions				Funzioni di database
+## Funzioni data e ora (Date & Time Functions)
 ##
-DAVERAGE		= DB.MEDIA			##	Restituisce la media di voci del database selezionate
-DCOUNT			= DB.CONTA.NUMERI		##	Conta le celle di un database contenenti numeri
-DCOUNTA			= DB.CONTA.VALORI		##	Conta le celle non vuote in un database
-DGET			= DB.VALORI			##	Estrae da un database un singolo record che soddisfa i criteri specificati
-DMAX			= DB.MAX			##	Restituisce il valore massimo dalle voci selezionate in un database
-DMIN			= DB.MIN			##	Restituisce il valore minimo dalle voci di un database selezionate
-DPRODUCT		= DB.PRODOTTO			##	Moltiplica i valori in un determinato campo di record che soddisfano i criteri del database
-DSTDEV			= DB.DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione di voci di un database selezionate
-DSTDEVP			= DB.DEV.ST.POP			##	Calcola la deviazione standard sulla base di tutte le voci di un database selezionate
-DSUM			= DB.SOMMA			##	Aggiunge i numeri nel campo colonna di record del database che soddisfa determinati criteri
-DVAR			= DB.VAR			##	Restituisce una stima della varianza sulla base di un campione da voci di un database selezionate
-DVARP			= DB.VAR.POP			##	Calcola la varianza sulla base di tutte le voci di un database selezionate
-
+DATE = DATA
+DATEDIF = DATA.DIFF
+DATESTRING = DATA.STRINGA
+DATEVALUE = DATA.VALORE
+DAY = GIORNO
+DAYS = GIORNI
+DAYS360 = GIORNO360
+EDATE = DATA.MESE
+EOMONTH = FINE.MESE
+HOUR = ORA
+ISOWEEKNUM = NUM.SETTIMANA.ISO
+MINUTE = MINUTO
+MONTH = MESE
+NETWORKDAYS = GIORNI.LAVORATIVI.TOT
+NETWORKDAYS.INTL = GIORNI.LAVORATIVI.TOT.INTL
+NOW = ADESSO
+SECOND = SECONDO
+THAIDAYOFWEEK = THAIGIORNODELLASETTIMANA
+THAIMONTHOFYEAR = THAIMESEDELLANNO
+THAIYEAR = THAIANNO
+TIME = ORARIO
+TIMEVALUE = ORARIO.VALORE
+TODAY = OGGI
+WEEKDAY = GIORNO.SETTIMANA
+WEEKNUM = NUM.SETTIMANA
+WORKDAY = GIORNO.LAVORATIVO
+WORKDAY.INTL = GIORNO.LAVORATIVO.INTL
+YEAR = ANNO
+YEARFRAC = FRAZIONE.ANNO
 
 ##
-##	Date and time functions				Funzioni data e ora
+## Funzioni ingegneristiche (Engineering Functions)
 ##
-DATE			= DATA				##	Restituisce il numero seriale di una determinata data
-DATEVALUE		= DATA.VALORE			##	Converte una data sotto forma di testo in un numero seriale
-DAY			= GIORNO			##	Converte un numero seriale in un giorno del mese
-DAYS360			= GIORNO360			##	Calcola il numero di giorni compreso tra due date basandosi su un anno di 360 giorni
-EDATE			= DATA.MESE			##	Restituisce il numero seriale della data che rappresenta il numero di mesi prima o dopo la data di inizio
-EOMONTH			= FINE.MESE			##	Restituisce il numero seriale dell'ultimo giorno del mese, prima o dopo un determinato numero di mesi
-HOUR			= ORA				##	Converte un numero seriale in un'ora
-MINUTE			= MINUTO			##	Converte un numero seriale in un minuto
-MONTH			= MESE				##	Converte un numero seriale in un mese
-NETWORKDAYS		= GIORNI.LAVORATIVI.TOT		##	Restituisce il numero di tutti i giorni lavorativi compresi fra due date
-NOW			= ADESSO			##	Restituisce il numero seriale della data e dell'ora corrente
-SECOND			= SECONDO			##	Converte un numero seriale in un secondo
-TIME			= ORARIO			##	Restituisce il numero seriale di una determinata ora
-TIMEVALUE		= ORARIO.VALORE			##	Converte un orario in forma di testo in un numero seriale
-TODAY			= OGGI				##	Restituisce il numero seriale relativo alla data odierna
-WEEKDAY			= GIORNO.SETTIMANA		##	Converte un numero seriale in un giorno della settimana
-WEEKNUM			= NUM.SETTIMANA			##	Converte un numero seriale in un numero che rappresenta la posizione numerica di una settimana nell'anno
-WORKDAY			= GIORNO.LAVORATIVO		##	Restituisce il numero della data prima o dopo un determinato numero di giorni lavorativi
-YEAR			= ANNO				##	Converte un numero seriale in un anno
-YEARFRAC		= FRAZIONE.ANNO			##	Restituisce la frazione dell'anno che rappresenta il numero dei giorni compresi tra una data_ iniziale e una data_finale
-
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = BINARIO.DECIMALE
+BIN2HEX = BINARIO.HEX
+BIN2OCT = BINARIO.OCT
+BITAND = BITAND
+BITLSHIFT = BIT.SPOSTA.SX
+BITOR = BITOR
+BITRSHIFT = BIT.SPOSTA.DX
+BITXOR = BITXOR
+COMPLEX = COMPLESSO
+CONVERT = CONVERTI
+DEC2BIN = DECIMALE.BINARIO
+DEC2HEX = DECIMALE.HEX
+DEC2OCT = DECIMALE.OCT
+DELTA = DELTA
+ERF = FUNZ.ERRORE
+ERF.PRECISE = FUNZ.ERRORE.PRECISA
+ERFC = FUNZ.ERRORE.COMP
+ERFC.PRECISE = FUNZ.ERRORE.COMP.PRECISA
+GESTEP = SOGLIA
+HEX2BIN = HEX.BINARIO
+HEX2DEC = HEX.DECIMALE
+HEX2OCT = HEX.OCT
+IMABS = COMP.MODULO
+IMAGINARY = COMP.IMMAGINARIO
+IMARGUMENT = COMP.ARGOMENTO
+IMCONJUGATE = COMP.CONIUGATO
+IMCOS = COMP.COS
+IMCOSH = COMP.COSH
+IMCOT = COMP.COT
+IMCSC = COMP.CSC
+IMCSCH = COMP.CSCH
+IMDIV = COMP.DIV
+IMEXP = COMP.EXP
+IMLN = COMP.LN
+IMLOG10 = COMP.LOG10
+IMLOG2 = COMP.LOG2
+IMPOWER = COMP.POTENZA
+IMPRODUCT = COMP.PRODOTTO
+IMREAL = COMP.PARTE.REALE
+IMSEC = COMP.SEC
+IMSECH = COMP.SECH
+IMSIN = COMP.SEN
+IMSINH = COMP.SENH
+IMSQRT = COMP.RADQ
+IMSUB = COMP.DIFF
+IMSUM = COMP.SOMMA
+IMTAN = COMP.TAN
+OCT2BIN = OCT.BINARIO
+OCT2DEC = OCT.DECIMALE
+OCT2HEX = OCT.HEX
 
 ##
-##	Engineering functions				Funzioni ingegneristiche
+## Funzioni finanziarie (Financial Functions)
 ##
-BESSELI			= BESSEL.I			##	Restituisce la funzione di Bessel modificata In(x)
-BESSELJ			= BESSEL.J			##	Restituisce la funzione di Bessel Jn(x)
-BESSELK			= BESSEL.K			##	Restituisce la funzione di Bessel modificata Kn(x)
-BESSELY			= BESSEL.Y			##	Restituisce la funzione di Bessel Yn(x)
-BIN2DEC			= BINARIO.DECIMALE		##	Converte un numero binario in decimale
-BIN2HEX			= BINARIO.HEX			##	Converte un numero binario in esadecimale
-BIN2OCT			= BINARIO.OCT			##	Converte un numero binario in ottale
-COMPLEX			= COMPLESSO			##	Converte i coefficienti reali e immaginari in numeri complessi
-CONVERT			= CONVERTI			##	Converte un numero da un sistema di misura in un altro
-DEC2BIN			= DECIMALE.BINARIO		##	Converte un numero decimale in binario
-DEC2HEX			= DECIMALE.HEX			##	Converte un numero decimale in esadecimale
-DEC2OCT			= DECIMALE.OCT			##	Converte un numero decimale in ottale
-DELTA			= DELTA				##	Verifica se due valori sono uguali
-ERF			= FUNZ.ERRORE			##	Restituisce la funzione di errore
-ERFC			= FUNZ.ERRORE.COMP		##	Restituisce la funzione di errore complementare
-GESTEP			= SOGLIA			##	Verifica se un numero è maggiore del valore di soglia
-HEX2BIN			= HEX.BINARIO			##	Converte un numero esadecimale in binario
-HEX2DEC			= HEX.DECIMALE			##	Converte un numero esadecimale in decimale
-HEX2OCT			= HEX.OCT			##	Converte un numero esadecimale in ottale
-IMABS			= COMP.MODULO			##	Restituisce il valore assoluto (modulo) di un numero complesso
-IMAGINARY		= COMP.IMMAGINARIO		##	Restituisce il coefficiente immaginario di un numero complesso
-IMARGUMENT		= COMP.ARGOMENTO		##	Restituisce l'argomento theta, un angolo espresso in radianti
-IMCONJUGATE		= COMP.CONIUGATO		##	Restituisce il complesso coniugato del numero complesso
-IMCOS			= COMP.COS			##	Restituisce il coseno di un numero complesso
-IMDIV			= COMP.DIV			##	Restituisce il quoziente di due numeri complessi
-IMEXP			= COMP.EXP			##	Restituisce il valore esponenziale di un numero complesso
-IMLN			= COMP.LN			##	Restituisce il logaritmo naturale di un numero complesso
-IMLOG10			= COMP.LOG10			##	Restituisce il logaritmo in base 10 di un numero complesso
-IMLOG2			= COMP.LOG2			##	Restituisce un logaritmo in base 2 di un numero complesso
-IMPOWER			= COMP.POTENZA			##	Restituisce il numero complesso elevato a una potenza intera
-IMPRODUCT		= COMP.PRODOTTO			##	Restituisce il prodotto di numeri complessi compresi tra 2 e 29
-IMREAL			= COMP.PARTE.REALE		##	Restituisce il coefficiente reale di un numero complesso
-IMSIN			= COMP.SEN			##	Restituisce il seno di un numero complesso
-IMSQRT			= COMP.RADQ			##	Restituisce la radice quadrata di un numero complesso
-IMSUB			= COMP.DIFF			##	Restituisce la differenza fra due numeri complessi
-IMSUM			= COMP.SOMMA			##	Restituisce la somma di numeri complessi
-OCT2BIN			= OCT.BINARIO			##	Converte un numero ottale in binario
-OCT2DEC			= OCT.DECIMALE			##	Converte un numero ottale in decimale
-OCT2HEX			= OCT.HEX			##	Converte un numero ottale in esadecimale
-
+ACCRINT = INT.MATURATO.PER
+ACCRINTM = INT.MATURATO.SCAD
+AMORDEGRC = AMMORT.DEGR
+AMORLINC = AMMORT.PER
+COUPDAYBS = GIORNI.CED.INIZ.LIQ
+COUPDAYS = GIORNI.CED
+COUPDAYSNC = GIORNI.CED.NUOVA
+COUPNCD = DATA.CED.SUCC
+COUPNUM = NUM.CED
+COUPPCD = DATA.CED.PREC
+CUMIPMT = INT.CUMUL
+CUMPRINC = CAP.CUM
+DB = AMMORT.FISSO
+DDB = AMMORT
+DISC = TASSO.SCONTO
+DOLLARDE = VALUTA.DEC
+DOLLARFR = VALUTA.FRAZ
+DURATION = DURATA
+EFFECT = EFFETTIVO
+FV = VAL.FUT
+FVSCHEDULE = VAL.FUT.CAPITALE
+INTRATE = TASSO.INT
+IPMT = INTERESSI
+IRR = TIR.COST
+ISPMT = INTERESSE.RATA
+MDURATION = DURATA.M
+MIRR = TIR.VAR
+NOMINAL = NOMINALE
+NPER = NUM.RATE
+NPV = VAN
+ODDFPRICE = PREZZO.PRIMO.IRR
+ODDFYIELD = REND.PRIMO.IRR
+ODDLPRICE = PREZZO.ULTIMO.IRR
+ODDLYIELD = REND.ULTIMO.IRR
+PDURATION = DURATA.P
+PMT = RATA
+PPMT = P.RATA
+PRICE = PREZZO
+PRICEDISC = PREZZO.SCONT
+PRICEMAT = PREZZO.SCAD
+PV = VA
+RATE = TASSO
+RECEIVED = RICEV.SCAD
+RRI = RIT.INVEST.EFFETT
+SLN = AMMORT.COST
+SYD = AMMORT.ANNUO
+TBILLEQ = BOT.EQUIV
+TBILLPRICE = BOT.PREZZO
+TBILLYIELD = BOT.REND
+VDB = AMMORT.VAR
+XIRR = TIR.X
+XNPV = VAN.X
+YIELD = REND
+YIELDDISC = REND.TITOLI.SCONT
+YIELDMAT = REND.SCAD
 
 ##
-##	Financial functions				Funzioni finanziarie
+## Funzioni relative alle informazioni (Information Functions)
 ##
-ACCRINT			= INT.MATURATO.PER		##	Restituisce l'interesse maturato di un titolo che paga interessi periodici
-ACCRINTM		= INT.MATURATO.SCAD		##	Restituisce l'interesse maturato di un titolo che paga interessi alla scadenza
-AMORDEGRC		= AMMORT.DEGR			##	Restituisce l'ammortamento per ogni periodo contabile utilizzando un coefficiente di ammortamento
-AMORLINC		= AMMORT.PER			##	Restituisce l'ammortamento per ogni periodo contabile
-COUPDAYBS		= GIORNI.CED.INIZ.LIQ		##	Restituisce il numero dei giorni che vanno dall'inizio del periodo di durata della cedola alla data di liquidazione
-COUPDAYS		= GIORNI.CED			##	Restituisce il numero dei giorni relativi al periodo della cedola che contiene la data di liquidazione
-COUPDAYSNC		= GIORNI.CED.NUOVA		##	Restituisce il numero di giorni che vanno dalla data di liquidazione alla data della cedola successiva
-COUPNCD			= DATA.CED.SUCC			##	Restituisce un numero che rappresenta la data della cedola successiva alla data di liquidazione
-COUPNUM			= NUM.CED			##	Restituisce il numero di cedole pagabili fra la data di liquidazione e la data di scadenza
-COUPPCD			= DATA.CED.PREC			##	Restituisce un numero che rappresenta la data della cedola precedente alla data di liquidazione
-CUMIPMT			= INT.CUMUL			##	Restituisce l'interesse cumulativo pagato fra due periodi
-CUMPRINC		= CAP.CUM			##	Restituisce il capitale cumulativo pagato per estinguere un debito fra due periodi
-DB			= DB				##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a quote fisse decrescenti
-DDB			= AMMORT			##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a doppie quote decrescenti o altri metodi specificati
-DISC			= TASSO.SCONTO			##	Restituisce il tasso di sconto per un titolo
-DOLLARDE		= VALUTA.DEC			##	Converte un prezzo valuta, espresso come frazione, in prezzo valuta, espresso come numero decimale
-DOLLARFR		= VALUTA.FRAZ			##	Converte un prezzo valuta, espresso come numero decimale, in prezzo valuta, espresso come frazione
-DURATION		= DURATA			##	Restituisce la durata annuale di un titolo con i pagamenti di interesse periodico
-EFFECT			= EFFETTIVO			##	Restituisce l'effettivo tasso di interesse annuo
-FV			= VAL.FUT			##	Restituisce il valore futuro di un investimento
-FVSCHEDULE		= VAL.FUT.CAPITALE		##	Restituisce il valore futuro di un capitale iniziale dopo aver applicato una serie di tassi di interesse composti
-INTRATE			= TASSO.INT			##	Restituisce il tasso di interesse per un titolo interamente investito
-IPMT			= INTERESSI			##	Restituisce il valore degli interessi per un investimento relativo a un periodo specifico
-IRR			= TIR.COST			##	Restituisce il tasso di rendimento interno per una serie di flussi di cassa
-ISPMT			= INTERESSE.RATA		##	Calcola l'interesse di un investimento pagato durante un periodo specifico
-MDURATION		= DURATA.M			##	Restituisce la durata Macauley modificata per un titolo con un valore presunto di € 100
-MIRR			= TIR.VAR			##	Restituisce il tasso di rendimento interno in cui i flussi di cassa positivi e negativi sono finanziati a tassi differenti
-NOMINAL			= NOMINALE			##	Restituisce il tasso di interesse nominale annuale
-NPER			= NUM.RATE			##	Restituisce un numero di periodi relativi a un investimento
-NPV			= VAN				##	Restituisce il valore attuale netto di un investimento basato su una serie di flussi di cassa periodici e sul tasso di sconto
-ODDFPRICE		= PREZZO.PRIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente il primo periodo di durata irregolare
-ODDFYIELD		= REND.PRIMO.IRR		##	Restituisce il rendimento di un titolo avente il primo periodo di durata irregolare
-ODDLPRICE		= PREZZO.ULTIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente l'ultimo periodo di durata irregolare
-ODDLYIELD		= REND.ULTIMO.IRR		##	Restituisce il rendimento di un titolo avente l'ultimo periodo di durata irregolare
-PMT			= RATA				##	Restituisce il pagamento periodico di una rendita annua
-PPMT			= P.RATA			##	Restituisce il pagamento sul capitale di un investimento per un dato periodo
-PRICE			= PREZZO			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga interessi periodici
-PRICEDISC		= PREZZO.SCONT			##	Restituisce il prezzo di un titolo scontato dal valore nominale di € 100
-PRICEMAT		= PREZZO.SCAD			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga gli interessi alla scadenza
-PV			= VA				##	Restituisce il valore attuale di un investimento
-RATE			= TASSO				##	Restituisce il tasso di interesse per un periodo di un'annualità
-RECEIVED		= RICEV.SCAD			##	Restituisce l'ammontare ricevuto alla scadenza di un titolo interamente investito
-SLN			= AMMORT.COST			##	Restituisce l'ammortamento a quote costanti di un bene per un singolo periodo
-SYD			= AMMORT.ANNUO			##	Restituisce l'ammortamento a somma degli anni di un bene per un periodo specificato
-TBILLEQ			= BOT.EQUIV			##	Restituisce il rendimento equivalente ad un'obbligazione per un Buono ordinario del Tesoro
-TBILLPRICE		= BOT.PREZZO			##	Restituisce il prezzo di un Buono del Tesoro dal valore nominale di € 100
-TBILLYIELD		= BOT.REND			##	Restituisce il rendimento di un Buono del Tesoro
-VDB			= AMMORT.VAR			##	Restituisce l'ammortamento di un bene per un periodo specificato o parziale utilizzando il metodo a doppie quote proporzionali ai valori residui
-XIRR			= TIR.X				##	Restituisce il tasso di rendimento interno di un impiego di flussi di cassa
-XNPV			= VAN.X				##	Restituisce il valore attuale netto di un impiego di flussi di cassa non necessariamente periodici
-YIELD			= REND				##	Restituisce il rendimento di un titolo che frutta interessi periodici
-YIELDDISC		= REND.TITOLI.SCONT		##	Restituisce il rendimento annuale di un titolo scontato, ad esempio un Buono del Tesoro
-YIELDMAT		= REND.SCAD			##	Restituisce il rendimento annuo di un titolo che paga interessi alla scadenza
-
+CELL = CELLA
+ERROR.TYPE = ERRORE.TIPO
+INFO = AMBIENTE.INFO
+ISBLANK = VAL.VUOTO
+ISERR = VAL.ERR
+ISERROR = VAL.ERRORE
+ISEVEN = VAL.PARI
+ISFORMULA = VAL.FORMULA
+ISLOGICAL = VAL.LOGICO
+ISNA = VAL.NON.DISP
+ISNONTEXT = VAL.NON.TESTO
+ISNUMBER = VAL.NUMERO
+ISODD = VAL.DISPARI
+ISREF = VAL.RIF
+ISTEXT = VAL.TESTO
+N = NUM
+NA = NON.DISP
+SHEET = FOGLIO
+SHEETS = FOGLI
+TYPE = TIPO
 
 ##
-##	Information functions				Funzioni relative alle informazioni
+## Funzioni logiche (Logical Functions)
 ##
-CELL			= CELLA				##	Restituisce le informazioni sulla formattazione, la posizione o i contenuti di una cella
-ERROR.TYPE		= ERRORE.TIPO			##	Restituisce un numero che corrisponde a un tipo di errore
-INFO			= INFO				##	Restituisce le informazioni sull'ambiente operativo corrente
-ISBLANK			= VAL.VUOTO			##	Restituisce VERO se il valore è vuoto
-ISERR			= VAL.ERR			##	Restituisce VERO se il valore è un valore di errore qualsiasi tranne #N/D
-ISERROR			= VAL.ERRORE			##	Restituisce VERO se il valore è un valore di errore qualsiasi
-ISEVEN			= VAL.PARI			##	Restituisce VERO se il numero è pari
-ISLOGICAL		= VAL.LOGICO			##	Restituisce VERO se il valore è un valore logico
-ISNA			= VAL.NON.DISP			##	Restituisce VERO se il valore è un valore di errore #N/D
-ISNONTEXT		= VAL.NON.TESTO			##	Restituisce VERO se il valore non è in formato testo
-ISNUMBER		= VAL.NUMERO			##	Restituisce VERO se il valore è un numero
-ISODD			= VAL.DISPARI			##	Restituisce VERO se il numero è dispari
-ISREF			= VAL.RIF			##	Restituisce VERO se il valore è un riferimento
-ISTEXT			= VAL.TESTO			##	Restituisce VERO se il valore è in formato testo
-N			= NUM				##	Restituisce un valore convertito in numero
-NA			= NON.DISP			##	Restituisce il valore di errore #N/D
-TYPE			= TIPO				##	Restituisce un numero che indica il tipo di dati relativi a un valore
-
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SE.ERRORE
+IFNA = SE.NON.DISP.
+IFS = PIÙ.SE
+NOT = NON
+OR = O
+SWITCH = SWITCH
+TRUE = VERO
+XOR = XOR
 
 ##
-##	Logical functions				Funzioni logiche
+## Funzioni di ricerca e di riferimento (Lookup & Reference Functions)
 ##
-AND			= E				##	Restituisce VERO se tutti gli argomenti sono VERO
-FALSE			= FALSO				##	Restituisce il valore logico FALSO
-IF			= SE				##	Specifica un test logico da eseguire
-IFERROR			= SE.ERRORE			##	Restituisce un valore specificato se una formula fornisce un errore come risultato; in caso contrario, restituisce il risultato della formula
-NOT			= NON				##	Inverte la logica degli argomenti
-OR			= O				##	Restituisce VERO se un argomento qualsiasi è VERO
-TRUE			= VERO				##	Restituisce il valore logico VERO
-
+ADDRESS = INDIRIZZO
+AREAS = AREE
+CHOOSE = SCEGLI
+COLUMN = RIF.COLONNA
+COLUMNS = COLONNE
+FORMULATEXT = TESTO.FORMULA
+GETPIVOTDATA = INFO.DATI.TAB.PIVOT
+HLOOKUP = CERCA.ORIZZ
+HYPERLINK = COLLEG.IPERTESTUALE
+INDEX = INDICE
+INDIRECT = INDIRETTO
+LOOKUP = CERCA
+MATCH = CONFRONTA
+OFFSET = SCARTO
+ROW = RIF.RIGA
+ROWS = RIGHE
+RTD = DATITEMPOREALE
+TRANSPOSE = MATR.TRASPOSTA
+VLOOKUP = CERCA.VERT
 
 ##
-##	Lookup and reference functions			Funzioni di ricerca e di riferimento
+## Funzioni matematiche e trigonometriche (Math & Trig Functions)
 ##
-ADDRESS			= INDIRIZZO			##	Restituisce un riferimento come testo in una singola cella di un foglio di lavoro
-AREAS			= AREE				##	Restituisce il numero di aree in un riferimento
-CHOOSE			= SCEGLI			##	Sceglie un valore da un elenco di valori
-COLUMN			= RIF.COLONNA			##	Restituisce il numero di colonna di un riferimento
-COLUMNS			= COLONNE			##	Restituisce il numero di colonne in un riferimento
-HLOOKUP			= CERCA.ORIZZ			##	Effettua una ricerca nella riga superiore di una matrice e restituisce il valore della cella specificata
-HYPERLINK		= COLLEG.IPERTESTUALE		##	Crea un collegamento che apre un documento memorizzato in un server di rete, una rete Intranet o Internet
-INDEX			= INDICE			##	Utilizza un indice per scegliere un valore da un riferimento o da una matrice
-INDIRECT		= INDIRETTO			##	Restituisce un riferimento specificato da un valore testo
-LOOKUP			= CERCA				##	Ricerca i valori in un vettore o in una matrice
-MATCH			= CONFRONTA			##	Ricerca i valori in un riferimento o in una matrice
-OFFSET			= SCARTO			##	Restituisce uno scarto di riferimento da un riferimento dato
-ROW			= RIF.RIGA			##	Restituisce il numero di riga di un riferimento
-ROWS			= RIGHE				##	Restituisce il numero delle righe in un riferimento
-RTD			= DATITEMPOREALE		##	Recupera dati in tempo reale da un programma che supporta l'automazione COM (automazione: Metodo per utilizzare gli oggetti di un'applicazione da un'altra applicazione o da un altro strumento di sviluppo. Precedentemente nota come automazione OLE, l'automazione è uno standard del settore e una caratteristica del modello COM (Component Object Model).)
-TRANSPOSE		= MATR.TRASPOSTA		##	Restituisce la trasposizione di una matrice
-VLOOKUP			= CERCA.VERT			##	Effettua una ricerca nella prima colonna di una matrice e si sposta attraverso la riga per restituire il valore di una cella
-
+ABS = ASS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = AGGREGA
+ARABIC = ARABO
+ASIN = ARCSEN
+ASINH = ARCSENH
+ATAN = ARCTAN
+ATAN2 = ARCTAN.2
+ATANH = ARCTANH
+BASE = BASE
+CEILING.MATH = ARROTONDA.ECCESSO.MAT
+CEILING.PRECISE = ARROTONDA.ECCESSO.PRECISA
+COMBIN = COMBINAZIONE
+COMBINA = COMBINAZIONE.VALORI
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMALE
+DEGREES = GRADI
+ECMA.CEILING = ECMA.ARROTONDA.ECCESSO
+EVEN = PARI
+EXP = EXP
+FACT = FATTORIALE
+FACTDOUBLE = FATT.DOPPIO
+FLOOR.MATH = ARROTONDA.DIFETTO.MAT
+FLOOR.PRECISE = ARROTONDA.DIFETTO.PRECISA
+GCD = MCD
+INT = INT
+ISO.CEILING = ISO.ARROTONDA.ECCESSO
+LCM = MCM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATR.DETERM
+MINVERSE = MATR.INVERSA
+MMULT = MATR.PRODOTTO
+MOD = RESTO
+MROUND = ARROTONDA.MULTIPLO
+MULTINOMIAL = MULTINOMIALE
+MUNIT = MATR.UNIT
+ODD = DISPARI
+PI = PI.GRECO
+POWER = POTENZA
+PRODUCT = PRODOTTO
+QUOTIENT = QUOZIENTE
+RADIANS = RADIANTI
+RAND = CASUALE
+RANDBETWEEN = CASUALE.TRA
+ROMAN = ROMANO
+ROUND = ARROTONDA
+ROUNDBAHTDOWN = ARROTBAHTGIU
+ROUNDBAHTUP = ARROTBAHTSU
+ROUNDDOWN = ARROTONDA.PER.DIF
+ROUNDUP = ARROTONDA.PER.ECC
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMMA.SERIE
+SIGN = SEGNO
+SIN = SEN
+SINH = SENH
+SQRT = RADQ
+SQRTPI = RADQ.PI.GRECO
+SUBTOTAL = SUBTOTALE
+SUM = SOMMA
+SUMIF = SOMMA.SE
+SUMIFS = SOMMA.PIÙ.SE
+SUMPRODUCT = MATR.SOMMA.PRODOTTO
+SUMSQ = SOMMA.Q
+SUMX2MY2 = SOMMA.DIFF.Q
+SUMX2PY2 = SOMMA.SOMMA.Q
+SUMXMY2 = SOMMA.Q.DIFF
+TAN = TAN
+TANH = TANH
+TRUNC = TRONCA
 
 ##
-##	Math and trigonometry functions			Funzioni matematiche e trigonometriche
+## Funzioni statistiche (Statistical Functions)
 ##
-ABS			= ASS				##	Restituisce il valore assoluto di un numero.
-ACOS			= ARCCOS			##	Restituisce l'arcocoseno di un numero
-ACOSH			= ARCCOSH			##	Restituisce l'inverso del coseno iperbolico di un numero
-ASIN			= ARCSEN			##	Restituisce l'arcoseno di un numero
-ASINH			= ARCSENH			##	Restituisce l'inverso del seno iperbolico di un numero
-ATAN			= ARCTAN			##	Restituisce l'arcotangente di un numero
-ATAN2			= ARCTAN.2			##	Restituisce l'arcotangente delle coordinate x e y specificate
-ATANH			= ARCTANH			##	Restituisce l'inverso della tangente iperbolica di un numero
-CEILING			= ARROTONDA.ECCESSO		##	Arrotonda un numero per eccesso all'intero più vicino o al multiplo più vicino a peso
-COMBIN			= COMBINAZIONE			##	Restituisce il numero di combinazioni possibili per un numero assegnato di elementi
-COS			= COS				##	Restituisce il coseno dell'angolo specificato
-COSH			= COSH				##	Restituisce il coseno iperbolico di un numero
-DEGREES			= GRADI				##	Converte i radianti in gradi
-EVEN			= PARI				##	Arrotonda il valore assoluto di un numero per eccesso al più vicino intero pari
-EXP			= ESP				##	Restituisce il numero e elevato alla potenza di num
-FACT			= FATTORIALE			##	Restituisce il fattoriale di un numero
-FACTDOUBLE		= FATT.DOPPIO			##	Restituisce il fattoriale doppio di un numero
-FLOOR			= ARROTONDA.DIFETTO		##	Arrotonda un numero per difetto al multiplo più vicino a zero
-GCD			= MCD				##	Restituisce il massimo comune divisore
-INT			= INT				##	Arrotonda un numero per difetto al numero intero più vicino
-LCM			= MCM				##	Restituisce il minimo comune multiplo
-LN			= LN				##	Restituisce il logaritmo naturale di un numero
-LOG			= LOG				##	Restituisce il logaritmo di un numero in una specificata base
-LOG10			= LOG10				##	Restituisce il logaritmo in base 10 di un numero
-MDETERM			= MATR.DETERM			##	Restituisce il determinante di una matrice
-MINVERSE		= MATR.INVERSA			##	Restituisce l'inverso di una matrice
-MMULT			= MATR.PRODOTTO			##	Restituisce il prodotto di due matrici
-MOD			= RESTO				##	Restituisce il resto della divisione
-MROUND			= ARROTONDA.MULTIPLO		##	Restituisce un numero arrotondato al multiplo desiderato
-MULTINOMIAL		= MULTINOMIALE			##	Restituisce il multinomiale di un insieme di numeri
-ODD			= DISPARI			##	Arrotonda un numero per eccesso al più vicino intero dispari
-PI			= PI.GRECO			##	Restituisce il valore di pi greco
-POWER			= POTENZA			##	Restituisce il risultato di un numero elevato a potenza
-PRODUCT			= PRODOTTO			##	Moltiplica i suoi argomenti
-QUOTIENT		= QUOZIENTE			##	Restituisce la parte intera di una divisione
-RADIANS			= RADIANTI			##	Converte i gradi in radianti
-RAND			= CASUALE			##	Restituisce un numero casuale compreso tra 0 e 1
-RANDBETWEEN		= CASUALE.TRA			##	Restituisce un numero casuale compreso tra i numeri specificati
-ROMAN			= ROMANO			##	Restituisce il numero come numero romano sotto forma di testo
-ROUND			= ARROTONDA			##	Arrotonda il numero al numero di cifre specificato
-ROUNDDOWN		= ARROTONDA.PER.DIF		##	Arrotonda il valore assoluto di un numero per difetto
-ROUNDUP			= ARROTONDA.PER.ECC		##	Arrotonda il valore assoluto di un numero per eccesso
-SERIESSUM		= SOMMA.SERIE			##	Restituisce la somma di una serie di potenze in base alla formula
-SIGN			= SEGNO				##	Restituisce il segno di un numero
-SIN			= SEN				##	Restituisce il seno di un dato angolo
-SINH			= SENH				##	Restituisce il seno iperbolico di un numero
-SQRT			= RADQ				##	Restituisce una radice quadrata
-SQRTPI			= RADQ.PI.GRECO			##	Restituisce la radice quadrata di un numero (numero * pi greco)
-SUBTOTAL		= SUBTOTALE			##	Restituisce un subtotale in un elenco o in un database
-SUM			= SOMMA				##	Somma i suoi argomenti
-SUMIF			= SOMMA.SE			##	Somma le celle specificate da un dato criterio
-SUMIFS			= SOMMA.PIÙ.SE			##	Somma le celle in un intervallo che soddisfano più criteri
-SUMPRODUCT		= MATR.SOMMA.PRODOTTO		##	Restituisce la somma dei prodotti dei componenti corrispondenti della matrice
-SUMSQ			= SOMMA.Q			##	Restituisce la somma dei quadrati degli argomenti
-SUMX2MY2		= SOMMA.DIFF.Q			##	Restituisce la somma della differenza dei quadrati dei corrispondenti elementi in due matrici
-SUMX2PY2		= SOMMA.SOMMA.Q			##	Restituisce la somma della somma dei quadrati dei corrispondenti elementi in due matrici
-SUMXMY2			= SOMMA.Q.DIFF			##	Restituisce la somma dei quadrati delle differenze dei corrispondenti elementi in due matrici
-TAN			= TAN				##	Restituisce la tangente di un numero
-TANH			= TANH				##	Restituisce la tangente iperbolica di un numero
-TRUNC			= TRONCA			##	Tronca la parte decimale di un numero
-
+AVEDEV = MEDIA.DEV
+AVERAGE = MEDIA
+AVERAGEA = MEDIA.VALORI
+AVERAGEIF = MEDIA.SE
+AVERAGEIFS = MEDIA.PIÙ.SE
+BETA.DIST = DISTRIB.BETA.N
+BETA.INV = INV.BETA.N
+BINOM.DIST = DISTRIB.BINOM.N
+BINOM.DIST.RANGE = INTERVALLO.DISTRIB.BINOM.N.
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DISTRIB.CHI.QUAD
+CHISQ.DIST.RT = DISTRIB.CHI.QUAD.DS
+CHISQ.INV = INV.CHI.QUAD
+CHISQ.INV.RT = INV.CHI.QUAD.DS
+CHISQ.TEST = TEST.CHI.QUAD
+CONFIDENCE.NORM = CONFIDENZA.NORM
+CONFIDENCE.T = CONFIDENZA.T
+CORREL = CORRELAZIONE
+COUNT = CONTA.NUMERI
+COUNTA = CONTA.VALORI
+COUNTBLANK = CONTA.VUOTE
+COUNTIF = CONTA.SE
+COUNTIFS = CONTA.PIÙ.SE
+COVARIANCE.P = COVARIANZA.P
+COVARIANCE.S = COVARIANZA.C
+DEVSQ = DEV.Q
+EXPON.DIST = DISTRIB.EXP.N
+F.DIST = DISTRIBF
+F.DIST.RT = DISTRIB.F.DS
+F.INV = INVF
+F.INV.RT = INV.F.DS
+F.TEST = TESTF
+FISHER = FISHER
+FISHERINV = INV.FISHER
+FORECAST.ETS = PREVISIONE.ETS
+FORECAST.ETS.CONFINT = PREVISIONE.ETS.INTCONF
+FORECAST.ETS.SEASONALITY = PREVISIONE.ETS.STAGIONALITÀ
+FORECAST.ETS.STAT = PREVISIONE.ETS.STAT
+FORECAST.LINEAR = PREVISIONE.LINEARE
+FREQUENCY = FREQUENZA
+GAMMA = GAMMA
+GAMMA.DIST = DISTRIB.GAMMA.N
+GAMMA.INV = INV.GAMMA.N
+GAMMALN = LN.GAMMA
+GAMMALN.PRECISE = LN.GAMMA.PRECISA
+GAUSS = GAUSS
+GEOMEAN = MEDIA.GEOMETRICA
+GROWTH = CRESCITA
+HARMEAN = MEDIA.ARMONICA
+HYPGEOM.DIST = DISTRIB.IPERGEOM.N
+INTERCEPT = INTERCETTA
+KURT = CURTOSI
+LARGE = GRANDE
+LINEST = REGR.LIN
+LOGEST = REGR.LOG
+LOGNORM.DIST = DISTRIB.LOGNORM.N
+LOGNORM.INV = INV.LOGNORM.N
+MAX = MAX
+MAXA = MAX.VALORI
+MAXIFS = MAX.PIÙ.SE
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MIN.VALORI
+MINIFS = MIN.PIÙ.SE
+MODE.MULT = MODA.MULT
+MODE.SNGL = MODA.SNGL
+NEGBINOM.DIST = DISTRIB.BINOM.NEG.N
+NORM.DIST = DISTRIB.NORM.N
+NORM.INV = INV.NORM.N
+NORM.S.DIST = DISTRIB.NORM.ST.N
+NORM.S.INV = INV.NORM.S
+PEARSON = PEARSON
+PERCENTILE.EXC = ESC.PERCENTILE
+PERCENTILE.INC = INC.PERCENTILE
+PERCENTRANK.EXC = ESC.PERCENT.RANGO
+PERCENTRANK.INC = INC.PERCENT.RANGO
+PERMUT = PERMUTAZIONE
+PERMUTATIONA = PERMUTAZIONE.VALORI
+PHI = PHI
+POISSON.DIST = DISTRIB.POISSON
+PROB = PROBABILITÀ
+QUARTILE.EXC = ESC.QUARTILE
+QUARTILE.INC = INC.QUARTILE
+RANK.AVG = RANGO.MEDIA
+RANK.EQ = RANGO.UG
+RSQ = RQ
+SKEW = ASIMMETRIA
+SKEW.P = ASIMMETRIA.P
+SLOPE = PENDENZA
+SMALL = PICCOLO
+STANDARDIZE = NORMALIZZA
+STDEV.P = DEV.ST.P
+STDEV.S = DEV.ST.C
+STDEVA = DEV.ST.VALORI
+STDEVPA = DEV.ST.POP.VALORI
+STEYX = ERR.STD.YX
+T.DIST = DISTRIB.T.N
+T.DIST.2T = DISTRIB.T.2T
+T.DIST.RT = DISTRIB.T.DS
+T.INV = INVT
+T.INV.2T = INV.T.2T
+T.TEST = TESTT
+TREND = TENDENZA
+TRIMMEAN = MEDIA.TRONCATA
+VAR.P = VAR.P
+VAR.S = VAR.C
+VARA = VAR.VALORI
+VARPA = VAR.POP.VALORI
+WEIBULL.DIST = DISTRIB.WEIBULL
+Z.TEST = TESTZ
 
 ##
-##	Statistical functions				Funzioni statistiche
+## Funzioni di testo (Text Functions)
 ##
-AVEDEV			= MEDIA.DEV			##	Restituisce la media delle deviazioni assolute delle coordinate rispetto alla loro media
-AVERAGE			= MEDIA				##	Restituisce la media degli argomenti
-AVERAGEA		= MEDIA.VALORI			##	Restituisce la media degli argomenti, inclusi i numeri, il testo e i valori logici
-AVERAGEIF		= MEDIA.SE			##	Restituisce la media aritmetica di tutte le celle in un intervallo che soddisfano un determinato criterio
-AVERAGEIFS		= MEDIA.PIÙ.SE			##	Restituisce la media aritmetica di tutte le celle che soddisfano più criteri
-BETADIST		= DISTRIB.BETA			##	Restituisce la funzione di distribuzione cumulativa beta
-BETAINV			= INV.BETA			##	Restituisce l'inverso della funzione di distribuzione cumulativa per una distribuzione beta specificata
-BINOMDIST		= DISTRIB.BINOM			##	Restituisce la distribuzione binomiale per il termine individuale
-CHIDIST			= DISTRIB.CHI			##	Restituisce la probabilità a una coda per la distribuzione del chi quadrato
-CHIINV			= INV.CHI			##	Restituisce l'inverso della probabilità ad una coda per la distribuzione del chi quadrato
-CHITEST			= TEST.CHI			##	Restituisce il test per l'indipendenza
-CONFIDENCE		= CONFIDENZA			##	Restituisce l'intervallo di confidenza per una popolazione
-CORREL			= CORRELAZIONE			##	Restituisce il coefficiente di correlazione tra due insiemi di dati
-COUNT			= CONTA.NUMERI			##	Conta la quantità di numeri nell'elenco di argomenti
-COUNTA			= CONTA.VALORI			##	Conta il numero di valori nell'elenco di argomenti
-COUNTBLANK		= CONTA.VUOTE			##	Conta il numero di celle vuote all'interno di un intervallo
-COUNTIF			= CONTA.SE			##	Conta il numero di celle all'interno di un intervallo che soddisfa i criteri specificati
-COUNTIFS		= CONTA.PIÙ.SE			##	Conta il numero di celle in un intervallo che soddisfano più criteri.
-COVAR			= COVARIANZA			##	Calcola la covarianza, la media dei prodotti delle deviazioni accoppiate
-CRITBINOM		= CRIT.BINOM			##	Restituisce il più piccolo valore per il quale la distribuzione cumulativa binomiale risulta maggiore o uguale ad un valore di criterio
-DEVSQ			= DEV.Q				##	Restituisce la somma dei quadrati delle deviazioni
-EXPONDIST		= DISTRIB.EXP			##	Restituisce la distribuzione esponenziale
-FDIST			= DISTRIB.F			##	Restituisce la distribuzione di probabilità F
-FINV			= INV.F				##	Restituisce l'inverso della distribuzione della probabilità F
-FISHER			= FISHER			##	Restituisce la trasformazione di Fisher
-FISHERINV		= INV.FISHER			##	Restituisce l'inverso della trasformazione di Fisher
-FORECAST		= PREVISIONE			##	Restituisce i valori lungo una tendenza lineare
-FREQUENCY		= FREQUENZA			##	Restituisce la distribuzione di frequenza come matrice verticale
-FTEST			= TEST.F			##	Restituisce il risultato di un test F
-GAMMADIST		= DISTRIB.GAMMA			##	Restituisce la distribuzione gamma
-GAMMAINV		= INV.GAMMA			##	Restituisce l'inverso della distribuzione cumulativa gamma
-GAMMALN			= LN.GAMMA			##	Restituisce il logaritmo naturale della funzione gamma, G(x)
-GEOMEAN			= MEDIA.GEOMETRICA		##	Restituisce la media geometrica
-GROWTH			= CRESCITA			##	Restituisce i valori lungo una linea di tendenza esponenziale
-HARMEAN			= MEDIA.ARMONICA		##	Restituisce la media armonica
-HYPGEOMDIST		= DISTRIB.IPERGEOM		##	Restituisce la distribuzione ipergeometrica
-INTERCEPT		= INTERCETTA			##	Restituisce l'intercetta della retta di regressione lineare
-KURT			= CURTOSI			##	Restituisce la curtosi di un insieme di dati
-LARGE			= GRANDE			##	Restituisce il k-esimo valore più grande in un insieme di dati
-LINEST			= REGR.LIN			##	Restituisce i parametri di una tendenza lineare
-LOGEST			= REGR.LOG			##	Restituisce i parametri di una linea di tendenza esponenziale
-LOGINV			= INV.LOGNORM			##	Restituisce l'inverso di una distribuzione lognormale
-LOGNORMDIST		= DISTRIB.LOGNORM		##	Restituisce la distribuzione lognormale cumulativa
-MAX			= MAX				##	Restituisce il valore massimo in un elenco di argomenti
-MAXA			= MAX.VALORI			##	Restituisce il valore massimo in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MEDIAN			= MEDIANA			##	Restituisce la mediana dei numeri specificati
-MIN			= MIN				##	Restituisce il valore minimo in un elenco di argomenti
-MINA			= MIN.VALORI			##	Restituisce il più piccolo valore in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MODE			= MODA				##	Restituisce il valore più comune in un insieme di dati
-NEGBINOMDIST		= DISTRIB.BINOM.NEG		##	Restituisce la distribuzione binomiale negativa
-NORMDIST		= DISTRIB.NORM			##	Restituisce la distribuzione cumulativa normale
-NORMINV			= INV.NORM			##	Restituisce l'inverso della distribuzione cumulativa normale standard
-NORMSDIST		= DISTRIB.NORM.ST		##	Restituisce la distribuzione cumulativa normale standard
-NORMSINV		= INV.NORM.ST			##	Restituisce l'inverso della distribuzione cumulativa normale
-PEARSON			= PEARSON			##	Restituisce il coefficiente del momento di correlazione di Pearson
-PERCENTILE		= PERCENTILE			##	Restituisce il k-esimo dato percentile di valori in un intervallo
-PERCENTRANK		= PERCENT.RANGO			##	Restituisce il rango di un valore in un insieme di dati come percentuale
-PERMUT			= PERMUTAZIONE			##	Restituisce il numero delle permutazioni per un determinato numero di oggetti
-POISSON			= POISSON			##	Restituisce la distribuzione di Poisson
-PROB			= PROBABILITÀ			##	Calcola la probabilità che dei valori in un intervallo siano compresi tra due limiti
-QUARTILE		= QUARTILE			##	Restituisce il quartile di un insieme di dati
-RANK			= RANGO				##	Restituisce il rango di un numero in un elenco di numeri
-RSQ			= RQ				##	Restituisce la radice quadrata del coefficiente di momento di correlazione di Pearson
-SKEW			= ASIMMETRIA			##	Restituisce il grado di asimmetria di una distribuzione
-SLOPE			= PENDENZA			##	Restituisce la pendenza di una retta di regressione lineare
-SMALL			= PICCOLO			##	Restituisce il k-esimo valore più piccolo in un insieme di dati
-STANDARDIZE		= NORMALIZZA			##	Restituisce un valore normalizzato
-STDEV			= DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione
-STDEVA			= DEV.ST.VALORI			##	Restituisce una stima della deviazione standard sulla base di un campione, inclusi i numeri, il testo e i valori logici
-STDEVP			= DEV.ST.POP			##	Calcola la deviazione standard sulla base di un'intera popolazione
-STDEVPA			= DEV.ST.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-STEYX			= ERR.STD.YX			##	Restituisce l'errore standard del valore previsto per y per ogni valore x nella regressione
-TDIST			= DISTRIB.T			##	Restituisce la distribuzione t di Student
-TINV			= INV.T				##	Restituisce l'inversa della distribuzione t di Student
-TREND			= TENDENZA			##	Restituisce i valori lungo una linea di tendenza lineare
-TRIMMEAN		= MEDIA.TRONCATA		##	Restituisce la media della parte interna di un insieme di dati
-TTEST			= TEST.T			##	Restituisce la probabilità associata ad un test t di Student
-VAR			= VAR				##	Stima la varianza sulla base di un campione
-VARA			= VAR.VALORI			##	Stima la varianza sulla base di un campione, inclusi i numeri, il testo e i valori logici
-VARP			= VAR.POP			##	Calcola la varianza sulla base dell'intera popolazione
-VARPA			= VAR.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-WEIBULL			= WEIBULL			##	Restituisce la distribuzione di Weibull
-ZTEST			= TEST.Z			##	Restituisce il valore di probabilità a una coda per un test z
-
+BAHTTEXT = BAHTTESTO
+CHAR = CODICE.CARATT
+CLEAN = LIBERA
+CODE = CODICE
+CONCAT = CONCAT
+DOLLAR = VALUTA
+EXACT = IDENTICO
+FIND = TROVA
+FIXED = FISSO
+ISTHAIDIGIT = ÈTHAICIFRA
+LEFT = SINISTRA
+LEN = LUNGHEZZA
+LOWER = MINUSC
+MID = STRINGA.ESTRAI
+NUMBERSTRING = NUMERO.STRINGA
+NUMBERVALUE = NUMERO.VALORE
+PHONETIC = FURIGANA
+PROPER = MAIUSC.INIZ
+REPLACE = RIMPIAZZA
+REPT = RIPETI
+RIGHT = DESTRA
+SEARCH = RICERCA
+SUBSTITUTE = SOSTITUISCI
+T = T
+TEXT = TESTO
+TEXTJOIN = TESTO.UNISCI
+THAIDIGIT = THAICIFRA
+THAINUMSOUND = THAINUMSUONO
+THAINUMSTRING = THAISZÁMKAR
+THAISTRINGLENGTH = THAILUNGSTRINGA
+TRIM = ANNULLA.SPAZI
+UNICHAR = CARATT.UNI
+UNICODE = UNICODE
+UPPER = MAIUSC
+VALUE = VALORE
 
 ##
-##	Text functions					Funzioni di testo
+## Funzioni Web (Web Functions)
 ##
-ASC			= ASC				##	Modifica le lettere inglesi o il katakana a doppio byte all'interno di una stringa di caratteri in caratteri a singolo byte
-BAHTTEXT		= BAHTTESTO			##	Converte un numero in testo, utilizzando il formato valuta ß (baht)
-CHAR			= CODICE.CARATT			##	Restituisce il carattere specificato dal numero di codice
-CLEAN			= LIBERA			##	Elimina dal testo tutti i caratteri che non è possibile stampare
-CODE			= CODICE			##	Restituisce il codice numerico del primo carattere di una stringa di testo
-CONCATENATE		= CONCATENA			##	Unisce diversi elementi di testo in un unico elemento di testo
-DOLLAR			= VALUTA			##	Converte un numero in testo, utilizzando il formato valuta € (euro)
-EXACT			= IDENTICO			##	Verifica se due valori di testo sono uguali
-FIND			= TROVA				##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FINDB			= TROVA.B			##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FIXED			= FISSO				##	Formatta un numero come testo con un numero fisso di decimali
-JIS			= ORDINAMENTO.JIS		##	Modifica le lettere inglesi o i caratteri katakana a byte singolo all'interno di una stringa di caratteri in caratteri a byte doppio.
-LEFT			= SINISTRA			##	Restituisce il carattere più a sinistra di un valore di testo
-LEFTB			= SINISTRA.B			##	Restituisce il carattere più a sinistra di un valore di testo
-LEN			= LUNGHEZZA			##	Restituisce il numero di caratteri di una stringa di testo
-LENB			= LUNB				##	Restituisce il numero di caratteri di una stringa di testo
-LOWER			= MINUSC			##	Converte il testo in lettere minuscole
-MID			= MEDIA				##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-MIDB			= MEDIA.B			##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-PHONETIC		= FURIGANA			##	Estrae i caratteri fonetici (furigana) da una stringa di testo.
-PROPER			= MAIUSC.INIZ			##	Converte in maiuscolo la prima lettera di ogni parola di un valore di testo
-REPLACE			= RIMPIAZZA			##	Sostituisce i caratteri all'interno di un testo
-REPLACEB		= SOSTITUISCI.B			##	Sostituisce i caratteri all'interno di un testo
-REPT			= RIPETI			##	Ripete un testo per un dato numero di volte
-RIGHT			= DESTRA			##	Restituisce il carattere più a destra di un valore di testo
-RIGHTB			= DESTRA.B			##	Restituisce il carattere più a destra di un valore di testo
-SEARCH			= RICERCA			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SEARCHB			= CERCA.B			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SUBSTITUTE		= SOSTITUISCI			##	Sostituisce il nuovo testo al testo contenuto in una stringa
-T			= T				##	Converte gli argomenti in testo
-TEXT			= TESTO				##	Formatta un numero e lo converte in testo
-TRIM			= ANNULLA.SPAZI			##	Elimina gli spazi dal testo
-UPPER			= MAIUSC			##	Converte il testo in lettere maiuscole
-VALUE			= VALORE			##	Converte un argomento di testo in numero
+ENCODEURL = CODIFICA.URL
+FILTERXML = FILTRO.XML
+WEBSERVICE = SERVIZIO.WEB
+
+##
+## Funzioni di compatibilità (Compatibility Functions)
+##
+BETADIST = DISTRIB.BETA
+BETAINV = INV.BETA
+BINOMDIST = DISTRIB.BINOM
+CEILING = ARROTONDA.ECCESSO
+CHIDIST = DISTRIB.CHI
+CHIINV = INV.CHI
+CHITEST = TEST.CHI
+CONCATENATE = CONCATENA
+CONFIDENCE = CONFIDENZA
+COVAR = COVARIANZA
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTRIB.EXP
+FDIST = DISTRIB.F
+FINV = INV.F
+FLOOR = ARROTONDA.DIFETTO
+FORECAST = PREVISIONE
+FTEST = TEST.F
+GAMMADIST = DISTRIB.GAMMA
+GAMMAINV = INV.GAMMA
+HYPGEOMDIST = DISTRIB.IPERGEOM
+LOGINV = INV.LOGNORM
+LOGNORMDIST = DISTRIB.LOGNORM
+MODE = MODA
+NEGBINOMDIST = DISTRIB.BINOM.NEG
+NORMDIST = DISTRIB.NORM
+NORMINV = INV.NORM
+NORMSDIST = DISTRIB.NORM.ST
+NORMSINV = INV.NORM.ST
+PERCENTILE = PERCENTILE
+PERCENTRANK = PERCENT.RANGO
+POISSON = POISSON
+QUARTILE = QUARTILE
+RANK = RANGO
+STDEV = DEV.ST
+STDEVP = DEV.ST.POP
+TDIST = DISTRIB.T
+TINV = INV.T
+TTEST = TEST.T
+VAR = VAR
+VARP = VAR.POP
+WEIBULL = WEIBULL
+ZTEST = TEST.Z
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config
new file mode 100644
index 000000000..a7f3be179
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Norsk Bokmål (Norwegian Bokmål)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL
+DIV0
+VALUE = #VERDI!
+REF
+NAME = #NAVN?
+NUM
+NA = #N/D
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
new file mode 100644
index 000000000..d352e1f41
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
@@ -0,0 +1,539 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Norsk Bokmål (Norwegian Bokmål)
+##
+############################################################
+
+
+##
+## Kubefunksjoner (Cube Functions)
+##
+CUBEKPIMEMBER = KUBEKPIMEDLEM
+CUBEMEMBER = KUBEMEDLEM
+CUBEMEMBERPROPERTY = KUBEMEDLEMEGENSKAP
+CUBERANKEDMEMBER = KUBERANGERTMEDLEM
+CUBESET = KUBESETT
+CUBESETCOUNT = KUBESETTANTALL
+CUBEVALUE = KUBEVERDI
+
+##
+## Databasefunksjoner (Database Functions)
+##
+DAVERAGE = DGJENNOMSNITT
+DCOUNT = DANTALL
+DCOUNTA = DANTALLA
+DGET = DHENT
+DMAX = DMAKS
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAV
+DSTDEVP = DSTDAVP
+DSUM = DSUMMER
+DVAR = DVARIANS
+DVARP = DVARIANSP
+
+##
+## Dato- og tidsfunksjoner (Date & Time Functions)
+##
+DATE = DATO
+DATEDIF = DATODIFF
+DATESTRING = DATOSTRENG
+DATEVALUE = DATOVERDI
+DAY = DAG
+DAYS = DAGER
+DAYS360 = DAGER360
+EDATE = DAG.ETTER
+EOMONTH = MÅNEDSSLUTT
+HOUR = TIME
+ISOWEEKNUM = ISOUKENR
+MINUTE = MINUTT
+MONTH = MÅNED
+NETWORKDAYS = NETT.ARBEIDSDAGER
+NETWORKDAYS.INTL = NETT.ARBEIDSDAGER.INTL
+NOW = NÅ
+SECOND = SEKUND
+THAIDAYOFWEEK = THAIUKEDAG
+THAIMONTHOFYEAR = THAIMÅNED
+THAIYEAR = THAIÅR
+TIME = TID
+TIMEVALUE = TIDSVERDI
+TODAY = IDAG
+WEEKDAY = UKEDAG
+WEEKNUM = UKENR
+WORKDAY = ARBEIDSDAG
+WORKDAY.INTL = ARBEIDSDAG.INTL
+YEAR = ÅR
+YEARFRAC = ÅRDEL
+
+##
+## Tekniske funksjoner (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINTILDES
+BIN2HEX = BINTILHEKS
+BIN2OCT = BINTILOKT
+BITAND = BITOG
+BITLSHIFT = BITVFORSKYV
+BITOR = BITELLER
+BITRSHIFT = BITHFORSKYV
+BITXOR = BITEKSKLUSIVELLER
+COMPLEX = KOMPLEKS
+CONVERT = KONVERTER
+DEC2BIN = DESTILBIN
+DEC2HEX = DESTILHEKS
+DEC2OCT = DESTILOKT
+DELTA = DELTA
+ERF = FEILF
+ERF.PRECISE = FEILF.PRESIS
+ERFC = FEILFK
+ERFC.PRECISE = FEILFK.PRESIS
+GESTEP = GRENSEVERDI
+HEX2BIN = HEKSTILBIN
+HEX2DEC = HEKSTILDES
+HEX2OCT = HEKSTILOKT
+IMABS = IMABS
+IMAGINARY = IMAGINÆR
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGERT
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEKSP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMOPPHØY
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREELL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMROT
+IMSUB = IMSUB
+IMSUM = IMSUMMER
+IMTAN = IMTAN
+OCT2BIN = OKTTILBIN
+OCT2DEC = OKTTILDES
+OCT2HEX = OKTTILHEKS
+
+##
+## Økonomiske funksjoner (Financial Functions)
+##
+ACCRINT = PÅLØPT.PERIODISK.RENTE
+ACCRINTM = PÅLØPT.FORFALLSRENTE
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = OBLIG.DAGER.FF
+COUPDAYS = OBLIG.DAGER
+COUPDAYSNC = OBLIG.DAGER.NF
+COUPNCD = OBLIG.DAGER.EF
+COUPNUM = OBLIG.ANTALL
+COUPPCD = OBLIG.DAG.FORRIGE
+CUMIPMT = SAMLET.RENTE
+CUMPRINC = SAMLET.HOVEDSTOL
+DB = DAVSKR
+DDB = DEGRAVS
+DISC = DISKONTERT
+DOLLARDE = DOLLARDE
+DOLLARFR = DOLLARBR
+DURATION = VARIGHET
+EFFECT = EFFEKTIV.RENTE
+FV = SLUTTVERDI
+FVSCHEDULE = SVPLAN
+INTRATE = RENTESATS
+IPMT = RAVDRAG
+IRR = IR
+ISPMT = ER.AVDRAG
+MDURATION = MVARIGHET
+MIRR = MODIR
+NOMINAL = NOMINELL
+NPER = PERIODER
+NPV = NNV
+ODDFPRICE = AVVIKFP.PRIS
+ODDFYIELD = AVVIKFP.AVKASTNING
+ODDLPRICE = AVVIKSP.PRIS
+ODDLYIELD = AVVIKSP.AVKASTNING
+PDURATION = PVARIGHET
+PMT = AVDRAG
+PPMT = AMORT
+PRICE = PRIS
+PRICEDISC = PRIS.DISKONTERT
+PRICEMAT = PRIS.FORFALL
+PV = NÅVERDI
+RATE = RENTE
+RECEIVED = MOTTATT.AVKAST
+RRI = REALISERT.AVKASTNING
+SLN = LINAVS
+SYD = ÅRSAVS
+TBILLEQ = TBILLEKV
+TBILLPRICE = TBILLPRIS
+TBILLYIELD = TBILLAVKASTNING
+VDB = VERDIAVS
+XIRR = XIR
+XNPV = XNNV
+YIELD = AVKAST
+YIELDDISC = AVKAST.DISKONTERT
+YIELDMAT = AVKAST.FORFALL
+
+##
+## Informasjonsfunksjoner (Information Functions)
+##
+CELL = CELLE
+ERROR.TYPE = FEIL.TYPE
+INFO = INFO
+ISBLANK = ERTOM
+ISERR = ERF
+ISERROR = ERFEIL
+ISEVEN = ERPARTALL
+ISFORMULA = ERFORMEL
+ISLOGICAL = ERLOGISK
+ISNA = ERIT
+ISNONTEXT = ERIKKETEKST
+ISNUMBER = ERTALL
+ISODD = ERODDE
+ISREF = ERREF
+ISTEXT = ERTEKST
+N = N
+NA = IT
+SHEET = ARK
+SHEETS = ANTALL.ARK
+TYPE = VERDITYPE
+
+##
+## Logiske funksjoner (Logical Functions)
+##
+AND = OG
+FALSE = USANN
+IF = HVIS
+IFERROR = HVISFEIL
+IFNA = HVIS.IT
+IFS = HVIS.SETT
+NOT = IKKE
+OR = ELLER
+SWITCH = BRYTER
+TRUE = SANN
+XOR = EKSKLUSIVELLER
+
+##
+## Oppslag- og referansefunksjoner (Lookup & Reference Functions)
+##
+ADDRESS = ADRESSE
+AREAS = OMRÅDER
+CHOOSE = VELG
+COLUMN = KOLONNE
+COLUMNS = KOLONNER
+FORMULATEXT = FORMELTEKST
+GETPIVOTDATA = HENTPIVOTDATA
+HLOOKUP = FINN.KOLONNE
+HYPERLINK = HYPERKOBLING
+INDEX = INDEKS
+INDIRECT = INDIREKTE
+LOOKUP = SLÅ.OPP
+MATCH = SAMMENLIGNE
+OFFSET = FORSKYVNING
+ROW = RAD
+ROWS = RADER
+RTD = RTD
+TRANSPOSE = TRANSPONER
+VLOOKUP = FINN.RAD
+*RC = RK
+
+##
+## Matematikk- og trigonometrifunksjoner (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = MENGDE
+ARABIC = ARABISK
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = GRUNNTALL
+CEILING.MATH = AVRUND.GJELDENDE.MULTIPLUM.OPP.MATEMATISK
+CEILING.PRECISE = AVRUND.GJELDENDE.MULTIPLUM.PRESIS
+COMBIN = KOMBINASJON
+COMBINA = KOMBINASJONA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DESIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.AVRUND.GJELDENDE.MULTIPLUM
+EVEN = AVRUND.TIL.PARTALL
+EXP = EKSP
+FACT = FAKULTET
+FACTDOUBLE = DOBBELFAKT
+FLOOR.MATH = AVRUND.GJELDENDE.MULTIPLUM.NED.MATEMATISK
+FLOOR.PRECISE = AVRUND.GJELDENDE.MULTIPLUM.NED.PRESIS
+GCD = SFF
+INT = HELTALL
+ISO.CEILING = ISO.AVRUND.GJELDENDE.MULTIPLUM
+LCM = MFM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERS
+MMULT = MMULT
+MOD = REST
+MROUND = MRUND
+MULTINOMIAL = MULTINOMINELL
+MUNIT = MENHET
+ODD = AVRUND.TIL.ODDETALL
+PI = PI
+POWER = OPPHØYD.I
+PRODUCT = PRODUKT
+QUOTIENT = KVOTIENT
+RADIANS = RADIANER
+RAND = TILFELDIG
+RANDBETWEEN = TILFELDIGMELLOM
+ROMAN = ROMERTALL
+ROUND = AVRUND
+ROUNDBAHTDOWN = RUNDAVBAHTNEDOVER
+ROUNDBAHTUP = RUNDAVBAHTOPPOVER
+ROUNDDOWN = AVRUND.NED
+ROUNDUP = AVRUND.OPP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMMER.REKKE
+SIGN = FORTEGN
+SIN = SIN
+SINH = SINH
+SQRT = ROT
+SQRTPI = ROTPI
+SUBTOTAL = DELSUM
+SUM = SUMMER
+SUMIF = SUMMERHVIS
+SUMIFS = SUMMER.HVIS.SETT
+SUMPRODUCT = SUMMERPRODUKT
+SUMSQ = SUMMERKVADRAT
+SUMX2MY2 = SUMMERX2MY2
+SUMX2PY2 = SUMMERX2PY2
+SUMXMY2 = SUMMERXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AVKORT
+
+##
+## Statistiske funksjoner (Statistical Functions)
+##
+AVEDEV = GJENNOMSNITTSAVVIK
+AVERAGE = GJENNOMSNITT
+AVERAGEA = GJENNOMSNITTA
+AVERAGEIF = GJENNOMSNITTHVIS
+AVERAGEIFS = GJENNOMSNITT.HVIS.SETT
+BETA.DIST = BETA.FORDELING.N
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.FORDELING.N
+BINOM.DIST.RANGE = BINOM.FORDELING.OMRÅDE
+BINOM.INV = BINOM.INV
+CHISQ.DIST = KJIKVADRAT.FORDELING
+CHISQ.DIST.RT = KJIKVADRAT.FORDELING.H
+CHISQ.INV = KJIKVADRAT.INV
+CHISQ.INV.RT = KJIKVADRAT.INV.H
+CHISQ.TEST = KJIKVADRAT.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENS.T
+CORREL = KORRELASJON
+COUNT = ANTALL
+COUNTA = ANTALLA
+COUNTBLANK = TELLBLANKE
+COUNTIF = ANTALL.HVIS
+COUNTIFS = ANTALL.HVIS.SETT
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = AVVIK.KVADRERT
+EXPON.DIST = EKSP.FORDELING.N
+F.DIST = F.FORDELING
+F.DIST.RT = F.FORDELING.H
+F.INV = F.INV
+F.INV.RT = F.INV.H
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SESONGAVHENGIGHET
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEÆR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FORDELING
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRESIS
+GAUSS = GAUSS
+GEOMEAN = GJENNOMSNITT.GEOMETRISK
+GROWTH = VEKST
+HARMEAN = GJENNOMSNITT.HARMONISK
+HYPGEOM.DIST = HYPGEOM.FORDELING.N
+INTERCEPT = SKJÆRINGSPUNKT
+KURT = KURT
+LARGE = N.STØRST
+LINEST = RETTLINJE
+LOGEST = KURVE
+LOGNORM.DIST = LOGNORM.FORDELING
+LOGNORM.INV = LOGNORM.INV
+MAX = STØRST
+MAXA = MAKSA
+MAXIFS = MAKS.HVIS.SETT
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.HVIS.SETT
+MODE.MULT = MODUS.MULT
+MODE.SNGL = MODUS.SNGL
+NEGBINOM.DIST = NEGBINOM.FORDELING.N
+NORM.DIST = NORM.FORDELING
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.FORDELING
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERSENTIL.EKS
+PERCENTILE.INC = PERSENTIL.INK
+PERCENTRANK.EXC = PROSENTDEL.EKS
+PERCENTRANK.INC = PROSENTDEL.INK
+PERMUT = PERMUTER
+PERMUTATIONA = PERMUTASJONA
+PHI = PHI
+POISSON.DIST = POISSON.FORDELING
+PROB = SANNSYNLIG
+QUARTILE.EXC = KVARTIL.EKS
+QUARTILE.INC = KVARTIL.INK
+RANK.AVG = RANG.GJSN
+RANK.EQ = RANG.EKV
+RSQ = RKVADRAT
+SKEW = SKJEVFORDELING
+SKEW.P = SKJEVFORDELING.P
+SLOPE = STIGNINGSTALL
+SMALL = N.MINST
+STANDARDIZE = NORMALISER
+STDEV.P = STDAV.P
+STDEV.S = STDAV.S
+STDEVA = STDAVVIKA
+STDEVPA = STDAVVIKPA
+STEYX = STANDARDFEIL
+T.DIST = T.FORDELING
+T.DIST.2T = T.FORDELING.2T
+T.DIST.RT = T.FORDELING.H
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = TRIMMET.GJENNOMSNITT
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARIANSA
+VARPA = VARIANSPA
+WEIBULL.DIST = WEIBULL.DIST.N
+Z.TEST = Z.TEST
+
+##
+## Tekstfunksjoner (Text Functions)
+##
+ASC = STIGENDE
+BAHTTEXT = BAHTTEKST
+CHAR = TEGNKODE
+CLEAN = RENSK
+CODE = KODE
+CONCAT = KJED.SAMMEN
+DOLLAR = VALUTA
+EXACT = EKSAKT
+FIND = FINN
+FIXED = FASTSATT
+ISTHAIDIGIT = ERTHAISIFFER
+LEFT = VENSTRE
+LEN = LENGDE
+LOWER = SMÅ
+MID = DELTEKST
+NUMBERSTRING = TALLSTRENG
+NUMBERVALUE = TALLVERDI
+PHONETIC = FURIGANA
+PROPER = STOR.FORBOKSTAV
+REPLACE = ERSTATT
+REPT = GJENTA
+RIGHT = HØYRE
+SEARCH = SØK
+SUBSTITUTE = BYTT.UT
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.KOMBINER
+THAIDIGIT = THAISIFFER
+THAINUMSOUND = THAINUMLYD
+THAINUMSTRING = THAINUMSTRENG
+THAISTRINGLENGTH = THAISTRENGLENGDE
+TRIM = TRIMME
+UNICHAR = UNICODETEGN
+UNICODE = UNICODE
+UPPER = STORE
+VALUE = VERDI
+
+##
+## Nettfunksjoner (Web Functions)
+##
+ENCODEURL = URL.KODE
+FILTERXML = FILTRERXML
+WEBSERVICE = NETTJENESTE
+
+##
+## Kompatibilitetsfunksjoner (Compatibility Functions)
+##
+BETADIST = BETA.FORDELING
+BETAINV = INVERS.BETA.FORDELING
+BINOMDIST = BINOM.FORDELING
+CEILING = AVRUND.GJELDENDE.MULTIPLUM
+CHIDIST = KJI.FORDELING
+CHIINV = INVERS.KJI.FORDELING
+CHITEST = KJI.TEST
+CONCATENATE = KJEDE.SAMMEN
+CONFIDENCE = KONFIDENS
+COVAR = KOVARIANS
+CRITBINOM = GRENSE.BINOM
+EXPONDIST = EKSP.FORDELING
+FDIST = FFORDELING
+FINV = FFORDELING.INVERS
+FLOOR = AVRUND.GJELDENDE.MULTIPLUM.NED
+FORECAST = PROGNOSE
+FTEST = FTEST
+GAMMADIST = GAMMAFORDELING
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOM.FORDELING
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFORD
+MODE = MODUS
+NEGBINOMDIST = NEGBINOM.FORDELING
+NORMDIST = NORMALFORDELING
+NORMINV = NORMINV
+NORMSDIST = NORMSFORDELING
+NORMSINV = NORMSINV
+PERCENTILE = PERSENTIL
+PERCENTRANK = PROSENTDEL
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = RANG
+STDEV = STDAV
+STDEVP = STDAVP
+TDIST = TFORDELING
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL.FORDELING
+ZTEST = ZTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config
index 8376022d1..370567a7a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Nederlands (Dutch)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #LEEG!
-DIV0	= #DEEL/0!
-VALUE	= #WAARDE!
-REF	= #VERW!
-NAME	= #NAAM?
-NUM	= #GETAL!
-NA	= #N/B
+NULL = #LEEG!
+DIV0 = #DEEL/0!
+VALUE = #WAARDE!
+REF = #VERW!
+NAME = #NAAM?
+NUM = #GETAL!
+NA = #N/B
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
index 2518f4216..ce0b30cc8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
@@ -1,416 +1,537 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Nederlands (Dutch)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Automatiseringsfuncties en functies in invoegtoepassingen
+## Kubusfuncties (Cube Functions)
 ##
-GETPIVOTDATA		= DRAAITABEL.OPHALEN		##	Geeft gegevens uit een draaitabelrapport als resultaat
-
+CUBEKPIMEMBER = KUBUSKPILID
+CUBEMEMBER = KUBUSLID
+CUBEMEMBERPROPERTY = KUBUSLIDEIGENSCHAP
+CUBERANKEDMEMBER = KUBUSGERANGSCHIKTLID
+CUBESET = KUBUSSET
+CUBESETCOUNT = KUBUSSETAANTAL
+CUBEVALUE = KUBUSWAARDE
 
 ##
-##	Cube functions					Kubusfuncties
+## Databasefuncties (Database Functions)
 ##
-CUBEKPIMEMBER		= KUBUSKPILID			##	Retourneert de naam, eigenschap en waarde van een KPI (prestatie-indicator) en geeft de naam en de eigenschap in de cel weer. Een KPI is een meetbare waarde, zoals de maandelijkse brutowinst of de omzet per kwartaal per werknemer, die wordt gebruikt om de prestaties van een organisatie te bewaken
-CUBEMEMBER		= KUBUSLID			##	Retourneert een lid of tupel in een kubushiërarchie. Wordt gebruikt om te controleren of het lid of de tupel in de kubus aanwezig is
-CUBEMEMBERPROPERTY	= KUBUSLIDEIGENSCHAP		##	Retourneert de waarde van een lideigenschap in de kubus. Wordt gebruikt om te controleren of de lidnaam in de kubus bestaat en retourneert de opgegeven eigenschap voor dit lid
-CUBERANKEDMEMBER	= KUBUSGERANGCHIKTLID		##	Retourneert het zoveelste, gerangschikte lid in een set. Wordt gebruikt om een of meer elementen in een set te retourneren, zoals de tien beste verkopers of de tien beste studenten
-CUBESET			= KUBUSSET			##	Definieert een berekende set leden of tupels door een ingestelde expressie naar de kubus op de server te sturen, alwaar de set wordt gemaakt en vervolgens wordt geretourneerd naar Microsoft Office Excel
-CUBESETCOUNT		= KUBUSSETAANTAL		##	Retourneert het aantal onderdelen in een set
-CUBEVALUE		= KUBUSWAARDE			##	Retourneert een samengestelde waarde van een kubus
-
+DAVERAGE = DBGEMIDDELDE
+DCOUNT = DBAANTAL
+DCOUNTA = DBAANTALC
+DGET = DBLEZEN
+DMAX = DBMAX
+DMIN = DBMIN
+DPRODUCT = DBPRODUCT
+DSTDEV = DBSTDEV
+DSTDEVP = DBSTDEVP
+DSUM = DBSOM
+DVAR = DBVAR
+DVARP = DBVARP
 
 ##
-##	Database functions				Databasefuncties
+## Datum- en tijdfuncties (Date & Time Functions)
 ##
-DAVERAGE		= DBGEMIDDELDE			##	Berekent de gemiddelde waarde in geselecteerde databasegegevens
-DCOUNT			= DBAANTAL			##	Telt de cellen met getallen in een database
-DCOUNTA			= DBAANTALC			##	Telt de niet-lege cellen in een database
-DGET			= DBLEZEN			##	Retourneert één record dat voldoet aan de opgegeven criteria uit een database
-DMAX			= DBMAX				##	Retourneert de maximumwaarde in de geselecteerde databasegegevens
-DMIN			= DBMIN				##	Retourneert de minimumwaarde in de geselecteerde databasegegevens
-DPRODUCT		= DBPRODUCT			##	Vermenigvuldigt de waarden in een bepaald veld van de records die voldoen aan de criteria in een database
-DSTDEV			= DBSTDEV			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef uit geselecteerde databasegegevens
-DSTDEVP			= DBSTDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie van geselecteerde databasegegevens
-DSUM			= DBSOM				##	Telt de getallen uit een kolom records in de database op die voldoen aan de criteria
-DVAR			= DBVAR				##	Maakt een schatting van de variantie op basis van een steekproef uit geselecteerde databasegegevens
-DVARP			= DBVARP			##	Berekent de variantie op basis van de volledige populatie van geselecteerde databasegegevens
-
+DATE = DATUM
+DATESTRING = DATUMNOTATIE
+DATEVALUE = DATUMWAARDE
+DAY = DAG
+DAYS = DAGEN
+DAYS360 = DAGEN360
+EDATE = ZELFDE.DAG
+EOMONTH = LAATSTE.DAG
+HOUR = UUR
+ISOWEEKNUM = ISO.WEEKNUMMER
+MINUTE = MINUUT
+MONTH = MAAND
+NETWORKDAYS = NETTO.WERKDAGEN
+NETWORKDAYS.INTL = NETWERKDAGEN.INTL
+NOW = NU
+SECOND = SECONDE
+THAIDAYOFWEEK = THAIS.WEEKDAG
+THAIMONTHOFYEAR = THAIS.MAAND.VAN.JAAR
+THAIYEAR = THAIS.JAAR
+TIME = TIJD
+TIMEVALUE = TIJDWAARDE
+TODAY = VANDAAG
+WEEKDAY = WEEKDAG
+WEEKNUM = WEEKNUMMER
+WORKDAY = WERKDAG
+WORKDAY.INTL = WERKDAG.INTL
+YEAR = JAAR
+YEARFRAC = JAAR.DEEL
 
 ##
-##	Date and time functions				Datum- en tijdfuncties
+## Technische functies (Engineering Functions)
 ##
-DATE			= DATUM				##	Geeft als resultaat het seriële getal van een opgegeven datum
-DATEVALUE		= DATUMWAARDE			##	Converteert een datum in de vorm van tekst naar een serieel getal
-DAY			= DAG				##	Converteert een serieel getal naar een dag van de maand
-DAYS360			= DAGEN360			##	Berekent het aantal dagen tussen twee datums op basis van een jaar met 360 dagen
-EDATE			= ZELFDE.DAG			##	Geeft als resultaat het seriële getal van een datum die het opgegeven aantal maanden voor of na de begindatum ligt
-EOMONTH			= LAATSTE.DAG			##	Geeft als resultaat het seriële getal van de laatste dag van de maand voor of na het opgegeven aantal maanden
-HOUR			= UUR				##	Converteert een serieel getal naar uren
-MINUTE			= MINUUT			##	Converteert een serieel naar getal minuten
-MONTH			= MAAND				##	Converteert een serieel getal naar een maand
-NETWORKDAYS		= NETTO.WERKDAGEN		##	Geeft als resultaat het aantal hele werkdagen tussen twee datums
-NOW			= NU				##	Geeft als resultaat het seriële getal van de huidige datum en tijd
-SECOND			= SECONDE			##	Converteert een serieel getal naar seconden
-TIME			= TIJD				##	Geeft als resultaat het seriële getal van een bepaald tijdstip
-TIMEVALUE		= TIJDWAARDE			##	Converteert de tijd in de vorm van tekst naar een serieel getal
-TODAY			= VANDAAG			##	Geeft als resultaat het seriële getal van de huidige datum
-WEEKDAY			= WEEKDAG			##	Converteert een serieel getal naar een weekdag
-WEEKNUM			= WEEKNUMMER			##	Converteert een serieel getal naar een weeknummer
-WORKDAY			= WERKDAG			##	Geeft als resultaat het seriële getal van de datum voor of na een bepaald aantal werkdagen
-YEAR			= JAAR				##	Converteert een serieel getal naar een jaar
-YEARFRAC		= JAAR.DEEL			##	Geeft als resultaat het gedeelte van het jaar, uitgedrukt in het aantal hele dagen tussen begindatum en einddatum
-
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = BIN.N.DEC
+BIN2HEX = BIN.N.HEX
+BIN2OCT = BIN.N.OCT
+BITAND = BIT.EN
+BITLSHIFT = BIT.VERSCHUIF.LINKS
+BITOR = BIT.OF
+BITRSHIFT = BIT.VERSCHUIF.RECHTS
+BITXOR = BIT.EX.OF
+COMPLEX = COMPLEX
+CONVERT = CONVERTEREN
+DEC2BIN = DEC.N.BIN
+DEC2HEX = DEC.N.HEX
+DEC2OCT = DEC.N.OCT
+DELTA = DELTA
+ERF = FOUTFUNCTIE
+ERF.PRECISE = FOUTFUNCTIE.NAUWKEURIG
+ERFC = FOUT.COMPLEMENT
+ERFC.PRECISE = FOUT.COMPLEMENT.NAUWKEURIG
+GESTEP = GROTER.DAN
+HEX2BIN = HEX.N.BIN
+HEX2DEC = HEX.N.DEC
+HEX2OCT = HEX.N.OCT
+IMABS = C.ABS
+IMAGINARY = C.IM.DEEL
+IMARGUMENT = C.ARGUMENT
+IMCONJUGATE = C.TOEGEVOEGD
+IMCOS = C.COS
+IMCOSH = C.COSH
+IMCOT = C.COT
+IMCSC = C.COSEC
+IMCSCH = C.COSECH
+IMDIV = C.QUOTIENT
+IMEXP = C.EXP
+IMLN = C.LN
+IMLOG10 = C.LOG10
+IMLOG2 = C.LOG2
+IMPOWER = C.MACHT
+IMPRODUCT = C.PRODUCT
+IMREAL = C.REEEL.DEEL
+IMSEC = C.SEC
+IMSECH = C.SECH
+IMSIN = C.SIN
+IMSINH = C.SINH
+IMSQRT = C.WORTEL
+IMSUB = C.VERSCHIL
+IMSUM = C.SOM
+IMTAN = C.TAN
+OCT2BIN = OCT.N.BIN
+OCT2DEC = OCT.N.DEC
+OCT2HEX = OCT.N.HEX
 
 ##
-##	Engineering functions				Technische functies
+## Financiële functies (Financial Functions)
 ##
-BESSELI			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie In(x)
-BESSELJ			= BESSEL.J			##	Geeft als resultaat de Bessel-functie Jn(x)
-BESSELK			= BESSEL.K			##	Geeft als resultaat de gewijzigde Bessel-functie Kn(x)
-BESSELY			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie Yn(x)
-BIN2DEC			= BIN.N.DEC			##	Converteert een binair getal naar een decimaal getal
-BIN2HEX			= BIN.N.HEX			##	Converteert een binair getal naar een hexadecimaal getal
-BIN2OCT			= BIN.N.OCT			##	Converteert een binair getal naar een octaal getal
-COMPLEX			= COMPLEX			##	Converteert reële en imaginaire coëfficiënten naar een complex getal
-CONVERT			= CONVERTEREN			##	Converteert een getal in de ene maateenheid naar een getal in een andere maateenheid
-DEC2BIN			= DEC.N.BIN			##	Converteert een decimaal getal naar een binair getal
-DEC2HEX			= DEC.N.HEX			##	Converteert een decimaal getal naar een hexadecimaal getal
-DEC2OCT			= DEC.N.OCT			##	Converteert een decimaal getal naar een octaal getal
-DELTA			= DELTA				##	Test of twee waarden gelijk zijn
-ERF			= FOUTFUNCTIE			##	Geeft als resultaat de foutfunctie
-ERFC			= FOUT.COMPLEMENT		##	Geeft als resultaat de complementaire foutfunctie
-GESTEP			= GROTER.DAN			##	Test of een getal groter is dan de drempelwaarde
-HEX2BIN			= HEX.N.BIN			##	Converteert een hexadecimaal getal naar een binair getal
-HEX2DEC			= HEX.N.DEC			##	Converteert een hexadecimaal getal naar een decimaal getal
-HEX2OCT			= HEX.N.OCT			##	Converteert een hexadecimaal getal naar een octaal getal
-IMABS			= C.ABS				##	Geeft als resultaat de absolute waarde (modulus) van een complex getal
-IMAGINARY		= C.IM.DEEL			##	Geeft als resultaat de imaginaire coëfficiënt van een complex getal
-IMARGUMENT		= C.ARGUMENT			##	Geeft als resultaat het argument thèta, een hoek uitgedrukt in radialen
-IMCONJUGATE		= C.TOEGEVOEGD			##	Geeft als resultaat het complexe toegevoegde getal van een complex getal
-IMCOS			= C.COS				##	Geeft als resultaat de cosinus van een complex getal
-IMDIV			= C.QUOTIENT			##	Geeft als resultaat het quotiënt van twee complexe getallen
-IMEXP			= C.EXP				##	Geeft als resultaat de exponent van een complex getal
-IMLN			= C.LN				##	Geeft als resultaat de natuurlijke logaritme van een complex getal
-IMLOG10			= C.LOG10			##	Geeft als resultaat de logaritme met grondtal 10 van een complex getal
-IMLOG2			= C.LOG2			##	Geeft als resultaat de logaritme met grondtal 2 van een complex getal
-IMPOWER			= C.MACHT			##	Geeft als resultaat een complex getal dat is verheven tot de macht van een geheel getal
-IMPRODUCT		= C.PRODUCT			##	Geeft als resultaat het product van complexe getallen
-IMREAL			= C.REEEL.DEEL			##	Geeft als resultaat de reële coëfficiënt van een complex getal
-IMSIN			= C.SIN				##	Geeft als resultaat de sinus van een complex getal
-IMSQRT			= C.WORTEL			##	Geeft als resultaat de vierkantswortel van een complex getal
-IMSUB			= C.VERSCHIL			##	Geeft als resultaat het verschil tussen twee complexe getallen
-IMSUM			= C.SOM				##	Geeft als resultaat de som van complexe getallen
-OCT2BIN			= OCT.N.BIN			##	Converteert een octaal getal naar een binair getal
-OCT2DEC			= OCT.N.DEC			##	Converteert een octaal getal naar een decimaal getal
-OCT2HEX			= OCT.N.HEX			##	Converteert een octaal getal naar een hexadecimaal getal
-
+ACCRINT = SAMENG.RENTE
+ACCRINTM = SAMENG.RENTE.V
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = COUP.DAGEN.BB
+COUPDAYS = COUP.DAGEN
+COUPDAYSNC = COUP.DAGEN.VV
+COUPNCD = COUP.DATUM.NB
+COUPNUM = COUP.AANTAL
+COUPPCD = COUP.DATUM.VB
+CUMIPMT = CUM.RENTE
+CUMPRINC = CUM.HOOFDSOM
+DB = DB
+DDB = DDB
+DISC = DISCONTO
+DOLLARDE = EURO.DE
+DOLLARFR = EURO.BR
+DURATION = DUUR
+EFFECT = EFFECT.RENTE
+FV = TW
+FVSCHEDULE = TOEK.WAARDE2
+INTRATE = RENTEPERCENTAGE
+IPMT = IBET
+IRR = IR
+ISPMT = ISBET
+MDURATION = AANG.DUUR
+MIRR = GIR
+NOMINAL = NOMINALE.RENTE
+NPER = NPER
+NPV = NHW
+ODDFPRICE = AFW.ET.PRIJS
+ODDFYIELD = AFW.ET.REND
+ODDLPRICE = AFW.LT.PRIJS
+ODDLYIELD = AFW.LT.REND
+PDURATION = PDUUR
+PMT = BET
+PPMT = PBET
+PRICE = PRIJS.NOM
+PRICEDISC = PRIJS.DISCONTO
+PRICEMAT = PRIJS.VERVALDAG
+PV = HW
+RATE = RENTE
+RECEIVED = OPBRENGST
+RRI = RRI
+SLN = LIN.AFSCHR
+SYD = SYD
+TBILLEQ = SCHATK.OBL
+TBILLPRICE = SCHATK.PRIJS
+TBILLYIELD = SCHATK.REND
+VDB = VDB
+XIRR = IR.SCHEMA
+XNPV = NHW2
+YIELD = RENDEMENT
+YIELDDISC = REND.DISCONTO
+YIELDMAT = REND.VERVAL
 
 ##
-##	Financial functions				Financiële functies
+## Informatiefuncties (Information Functions)
 ##
-ACCRINT			= SAMENG.RENTE			##	Berekent de opgelopen rente voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-ACCRINTM		= SAMENG.RENTE.V		##	Berekent de opgelopen rente voor een waardepapier waarvan de rente op de vervaldatum wordt uitgekeerd
-AMORDEGRC		= AMORDEGRC			##	Geeft als resultaat de afschrijving voor elke boekingsperiode door een afschrijvingscoëfficiënt toe te passen
-AMORLINC		= AMORLINC			##	Berekent de afschrijving voor elke boekingsperiode
-COUPDAYBS		= COUP.DAGEN.BB			##	Berekent het aantal dagen vanaf het begin van de coupontermijn tot de stortingsdatum
-COUPDAYS		= COUP.DAGEN			##	Geeft als resultaat het aantal dagen in de coupontermijn waarin de stortingsdatum valt
-COUPDAYSNC		= COUP.DAGEN.VV			##	Geeft als resultaat het aantal dagen vanaf de stortingsdatum tot de volgende couponvervaldatum
-COUPNCD			= COUP.DATUM.NB			##	Geeft als resultaat de volgende coupondatum na de stortingsdatum
-COUPNUM			= COUP.AANTAL			##	Geeft als resultaat het aantal coupons dat nog moet worden uitbetaald tussen de stortingsdatum en de vervaldatum
-COUPPCD			= COUP.DATUM.VB			##	Geeft als resultaat de vorige couponvervaldatum vóór de stortingsdatum
-CUMIPMT			= CUM.RENTE			##	Geeft als resultaat de cumulatieve rente die tussen twee termijnen is uitgekeerd
-CUMPRINC		= CUM.HOOFDSOM			##	Geeft als resultaat de cumulatieve hoofdsom van een lening die tussen twee termijnen is terugbetaald
-DB			= DB				##	Geeft als resultaat de afschrijving van activa voor een bepaalde periode met behulp van de 'fixed declining balance'-methode
-DDB			= DDB				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'double declining balance'-methode of een andere methode die u opgeeft
-DISC			= DISCONTO			##	Geeft als resultaat het discontopercentage voor een waardepapier
-DOLLARDE		= EURO.DE			##	Converteert een prijs in euro's, uitgedrukt in een breuk, naar een prijs in euro's, uitgedrukt in een decimaal getal
-DOLLARFR		= EURO.BR			##	Converteert een prijs in euro's, uitgedrukt in een decimaal getal, naar een prijs in euro's, uitgedrukt in een breuk
-DURATION		= DUUR				##	Geeft als resultaat de gewogen gemiddelde looptijd voor een waardepapier met periodieke rentebetalingen
-EFFECT			= EFFECT.RENTE			##	Geeft als resultaat het effectieve jaarlijkse rentepercentage
-FV			= TW				##	Geeft als resultaat de toekomstige waarde van een investering
-FVSCHEDULE		= TOEK.WAARDE2			##	Geeft als resultaat de toekomstige waarde van een bepaalde hoofdsom na het toepassen van een reeks samengestelde rentepercentages
-INTRATE			= RENTEPERCENTAGE		##	Geeft als resultaat het rentepercentage voor een volgestort waardepapier
-IPMT			= IBET				##	Geeft als resultaat de te betalen rente voor een investering over een bepaalde termijn
-IRR			= IR				##	Geeft als resultaat de interne rentabiliteit voor een reeks cashflows
-ISPMT			= ISBET				##	Geeft als resultaat de rente die is betaald tijdens een bepaalde termijn van een investering
-MDURATION		= AANG.DUUR			##	Geeft als resultaat de aangepaste Macauley-looptijd voor een waardepapier, aangenomen dat de nominale waarde € 100 bedraagt
-MIRR			= GIR				##	Geeft als resultaat de interne rentabiliteit voor een serie cashflows, waarbij voor betalingen een ander rentepercentage geldt dan voor inkomsten
-NOMINAL			= NOMINALE.RENTE		##	Geeft als resultaat het nominale jaarlijkse rentepercentage
-NPER			= NPER				##	Geeft als resultaat het aantal termijnen van een investering
-NPV			= NHW				##	Geeft als resultaat de netto huidige waarde van een investering op basis van een reeks periodieke cashflows en een discontopercentage
-ODDFPRICE		= AFW.ET.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende eerste termijn
-ODDFYIELD		= AFW.ET.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende eerste termijn
-ODDLPRICE		= AFW.LT.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende laatste termijn
-ODDLYIELD		= AFW.LT.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende laatste termijn
-PMT			= BET				##	Geeft als resultaat de periodieke betaling voor een annuïteit
-PPMT			= PBET				##	Geeft als resultaat de afbetaling op de hoofdsom voor een bepaalde termijn
-PRICE			= PRIJS.NOM			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-PRICEDISC		= PRIJS.DISCONTO		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een verdisconteerd waardepapier
-PRICEMAT		= PRIJS.VERVALDAG		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-PV			= HW				##	Geeft als resultaat de huidige waarde van een investering
-RATE			= RENTE				##	Geeft als resultaat het periodieke rentepercentage voor een annuïteit
-RECEIVED		= OPBRENGST			##	Geeft als resultaat het bedrag dat op de vervaldatum wordt uitgekeerd voor een volgestort waardepapier
-SLN			= LIN.AFSCHR			##	Geeft als resultaat de lineaire afschrijving van activa over één termijn
-SYD			= SYD				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'Sum-Of-Years-Digits'-methode
-TBILLEQ			= SCHATK.OBL			##	Geeft als resultaat het rendement op schatkistpapier, dat op dezelfde manier wordt berekend als het rendement op obligaties
-TBILLPRICE		= SCHATK.PRIJS			##	Bepaalt de prijs per € 100 nominale waarde voor schatkistpapier
-TBILLYIELD		= SCHATK.REND			##	Berekent het rendement voor schatkistpapier
-VDB			= VDB				##	Geeft als resultaat de afschrijving van activa over een gehele of gedeeltelijke termijn met behulp van de 'declining balance'-methode
-XIRR			= IR.SCHEMA			##	Berekent de interne rentabiliteit voor een betalingsschema van cashflows
-XNPV			= NHW2				##	Berekent de huidige nettowaarde voor een betalingsschema van cashflows
-YIELD			= RENDEMENT			##	Geeft als resultaat het rendement voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-YIELDDISC		= REND.DISCONTO			##	Geeft als resultaat het jaarlijkse rendement voor een verdisconteerd waardepapier, bijvoorbeeld schatkistpapier
-YIELDMAT		= REND.VERVAL			##	Geeft als resultaat het jaarlijkse rendement voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-
+CELL = CEL
+ERROR.TYPE = TYPE.FOUT
+INFO = INFO
+ISBLANK = ISLEEG
+ISERR = ISFOUT2
+ISERROR = ISFOUT
+ISEVEN = IS.EVEN
+ISFORMULA = ISFORMULE
+ISLOGICAL = ISLOGISCH
+ISNA = ISNB
+ISNONTEXT = ISGEENTEKST
+ISNUMBER = ISGETAL
+ISODD = IS.ONEVEN
+ISREF = ISVERWIJZING
+ISTEXT = ISTEKST
+N = N
+NA = NB
+SHEET = BLAD
+SHEETS = BLADEN
+TYPE = TYPE
 
 ##
-##	Information functions				Informatiefuncties
+## Logische functies (Logical Functions)
 ##
-CELL			= CEL				##	Geeft als resultaat informatie over de opmaak, locatie of inhoud van een cel
-ERROR.TYPE		= TYPE.FOUT			##	Geeft als resultaat een getal dat overeenkomt met een van de foutwaarden van Microsoft Excel
-INFO			= INFO				##	Geeft als resultaat informatie over de huidige besturingsomgeving
-ISBLANK			= ISLEEG			##	Geeft als resultaat WAAR als de waarde leeg is
-ISERR			= ISFOUT2			##	Geeft als resultaat WAAR als de waarde een foutwaarde is, met uitzondering van #N/B
-ISERROR			= ISFOUT			##	Geeft als resultaat WAAR als de waarde een foutwaarde is
-ISEVEN			= IS.EVEN			##	Geeft als resultaat WAAR als het getal even is
-ISLOGICAL		= ISLOGISCH			##	Geeft als resultaat WAAR als de waarde een logische waarde is
-ISNA			= ISNB				##	Geeft als resultaat WAAR als de waarde de foutwaarde #N/B is
-ISNONTEXT		= ISGEENTEKST			##	Geeft als resultaat WAAR als de waarde geen tekst is
-ISNUMBER		= ISGETAL			##	Geeft als resultaat WAAR als de waarde een getal is
-ISODD			= IS.ONEVEN			##	Geeft als resultaat WAAR als het getal oneven is
-ISREF			= ISVERWIJZING			##	Geeft als resultaat WAAR als de waarde een verwijzing is
-ISTEXT			= ISTEKST			##	Geeft als resultaat WAAR als de waarde tekst is
-N			= N				##	Geeft als resultaat een waarde die is geconverteerd naar een getal
-NA			= NB				##	Geeft als resultaat de foutwaarde #N/B
-TYPE			= TYPE				##	Geeft als resultaat een getal dat het gegevenstype van een waarde aangeeft
-
+AND = EN
+FALSE = ONWAAR
+IF = ALS
+IFERROR = ALS.FOUT
+IFNA = ALS.NB
+IFS = ALS.VOORWAARDEN
+NOT = NIET
+OR = OF
+SWITCH = SCHAKELEN
+TRUE = WAAR
+XOR = EX.OF
 
 ##
-##	Logical functions				Logische functies
+## Zoek- en verwijzingsfuncties (Lookup & Reference Functions)
 ##
-AND			= EN				##	Geeft als resultaat WAAR als alle argumenten WAAR zijn
-FALSE			= ONWAAR			##	Geeft als resultaat de logische waarde ONWAAR
-IF			= ALS				##	Geeft een logische test aan
-IFERROR			= ALS.FOUT			##	Retourneert een waarde die u opgeeft als een formule een fout oplevert, anders wordt het resultaat van de formule geretourneerd
-NOT			= NIET				##	Keert de logische waarde van het argument om
-OR			= OF				##	Geeft als resultaat WAAR als minimaal een van de argumenten WAAR is
-TRUE			= WAAR				##	Geeft als resultaat de logische waarde WAAR
-
+ADDRESS = ADRES
+AREAS = BEREIKEN
+CHOOSE = KIEZEN
+COLUMN = KOLOM
+COLUMNS = KOLOMMEN
+FORMULATEXT = FORMULETEKST
+GETPIVOTDATA = DRAAITABEL.OPHALEN
+HLOOKUP = HORIZ.ZOEKEN
+HYPERLINK = HYPERLINK
+INDEX = INDEX
+INDIRECT = INDIRECT
+LOOKUP = ZOEKEN
+MATCH = VERGELIJKEN
+OFFSET = VERSCHUIVING
+ROW = RIJ
+ROWS = RIJEN
+RTD = RTG
+TRANSPOSE = TRANSPONEREN
+VLOOKUP = VERT.ZOEKEN
+*RC = RK
 
 ##
-##	Lookup and reference functions			Zoek- en verwijzingsfuncties
+## Wiskundige en trigonometrische functies (Math & Trig Functions)
 ##
-ADDRESS			= ADRES				##	Geeft als resultaat een verwijzing, in de vorm van tekst, naar één bepaalde cel in een werkblad
-AREAS			= BEREIKEN			##	Geeft als resultaat het aantal bereiken in een verwijzing
-CHOOSE			= KIEZEN			##	Kiest een waarde uit een lijst met waarden
-COLUMN			= KOLOM				##	Geeft als resultaat het kolomnummer van een verwijzing
-COLUMNS			= KOLOMMEN			##	Geeft als resultaat het aantal kolommen in een verwijzing
-HLOOKUP			= HORIZ.ZOEKEN			##	Zoekt in de bovenste rij van een matrix naar een bepaalde waarde en geeft als resultaat de gevonden waarde in de opgegeven cel
-HYPERLINK		= HYPERLINK			##	Maakt een snelkoppeling of een sprong waarmee een document wordt geopend dat is opgeslagen op een netwerkserver, een intranet of op internet
-INDEX			= INDEX				##	Kiest met een index een waarde uit een verwijzing of een matrix
-INDIRECT		= INDIRECT			##	Geeft als resultaat een verwijzing die wordt aangegeven met een tekstwaarde
-LOOKUP			= ZOEKEN			##	Zoekt naar bepaalde waarden in een vector of een matrix
-MATCH			= VERGELIJKEN			##	Zoekt naar bepaalde waarden in een verwijzing of een matrix
-OFFSET			= VERSCHUIVING			##	Geeft als resultaat een nieuwe verwijzing die is verschoven ten opzichte van een bepaalde verwijzing
-ROW			= RIJ				##	Geeft als resultaat het rijnummer van een verwijzing
-ROWS			= RIJEN				##	Geeft als resultaat het aantal rijen in een verwijzing
-RTD			= RTG				##	Haalt realtimegegevens op uit een programma dat COM-automatisering (automatisering: een methode waarmee de ene toepassing objecten van een andere toepassing of ontwikkelprogramma kan besturen. Automatisering werd vroeger OLE-automatisering genoemd. Automatisering is een industrienorm die deel uitmaakt van het Component Object Model (COM).) ondersteunt
-TRANSPOSE		= TRANSPONEREN			##	Geeft als resultaat de getransponeerde van een matrix
-VLOOKUP			= VERT.ZOEKEN			##	Zoekt in de meest linkse kolom van een matrix naar een bepaalde waarde en geeft als resultaat de waarde in de opgegeven cel
-
+ABS = ABS
+ACOS = BOOGCOS
+ACOSH = BOOGCOSH
+ACOT = BOOGCOT
+ACOTH = BOOGCOTH
+AGGREGATE = AGGREGAAT
+ARABIC = ARABISCH
+ASIN = BOOGSIN
+ASINH = BOOGSINH
+ATAN = BOOGTAN
+ATAN2 = BOOGTAN2
+ATANH = BOOGTANH
+BASE = BASIS
+CEILING.MATH = AFRONDEN.BOVEN.WISK
+CEILING.PRECISE = AFRONDEN.BOVEN.NAUWKEURIG
+COMBIN = COMBINATIES
+COMBINA = COMBIN.A
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = COSEC
+CSCH = COSECH
+DECIMAL = DECIMAAL
+DEGREES = GRADEN
+ECMA.CEILING = ECMA.AFRONDEN.BOVEN
+EVEN = EVEN
+EXP = EXP
+FACT = FACULTEIT
+FACTDOUBLE = DUBBELE.FACULTEIT
+FLOOR.MATH = AFRONDEN.BENEDEN.WISK
+FLOOR.PRECISE = AFRONDEN.BENEDEN.NAUWKEURIG
+GCD = GGD
+INT = INTEGER
+ISO.CEILING = ISO.AFRONDEN.BOVEN
+LCM = KGV
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMINANTMAT
+MINVERSE = INVERSEMAT
+MMULT = PRODUCTMAT
+MOD = REST
+MROUND = AFRONDEN.N.VEELVOUD
+MULTINOMIAL = MULTINOMIAAL
+MUNIT = EENHEIDMAT
+ODD = ONEVEN
+PI = PI
+POWER = MACHT
+PRODUCT = PRODUCT
+QUOTIENT = QUOTIENT
+RADIANS = RADIALEN
+RAND = ASELECT
+RANDBETWEEN = ASELECTTUSSEN
+ROMAN = ROMEINS
+ROUND = AFRONDEN
+ROUNDBAHTDOWN = BAHT.AFR.NAAR.BENEDEN
+ROUNDBAHTUP = BAHT.AFR.NAAR.BOVEN
+ROUNDDOWN = AFRONDEN.NAAR.BENEDEN
+ROUNDUP = AFRONDEN.NAAR.BOVEN
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOM.MACHTREEKS
+SIGN = POS.NEG
+SIN = SIN
+SINH = SINH
+SQRT = WORTEL
+SQRTPI = WORTEL.PI
+SUBTOTAL = SUBTOTAAL
+SUM = SOM
+SUMIF = SOM.ALS
+SUMIFS = SOMMEN.ALS
+SUMPRODUCT = SOMPRODUCT
+SUMSQ = KWADRATENSOM
+SUMX2MY2 = SOM.X2MINY2
+SUMX2PY2 = SOM.X2PLUSY2
+SUMXMY2 = SOM.XMINY.2
+TAN = TAN
+TANH = TANH
+TRUNC = GEHEEL
 
 ##
-##	Math and trigonometry functions			Wiskundige en trigonometrische functies
+## Statistische functies (Statistical Functions)
 ##
-ABS			= ABS				##	Geeft als resultaat de absolute waarde van een getal
-ACOS			= BOOGCOS			##	Geeft als resultaat de boogcosinus van een getal
-ACOSH			= BOOGCOSH			##	Geeft als resultaat de inverse cosinus hyperbolicus van een getal
-ASIN			= BOOGSIN			##	Geeft als resultaat de boogsinus van een getal
-ASINH			= BOOGSINH			##	Geeft als resultaat de inverse sinus hyperbolicus van een getal
-ATAN			= BOOGTAN			##	Geeft als resultaat de boogtangens van een getal
-ATAN2			= BOOGTAN2			##	Geeft als resultaat de boogtangens van de x- en y-coördinaten
-ATANH			= BOOGTANH			##	Geeft als resultaat de inverse tangens hyperbolicus van een getal
-CEILING			= AFRONDEN.BOVEN		##	Rondt de absolute waarde van een getal naar boven af op het dichtstbijzijnde gehele getal of het dichtstbijzijnde significante veelvoud
-COMBIN			= COMBINATIES			##	Geeft als resultaat het aantal combinaties voor een bepaald aantal objecten
-COS			= COS				##	Geeft als resultaat de cosinus van een getal
-COSH			= COSH				##	Geeft als resultaat de cosinus hyperbolicus van een getal
-DEGREES			= GRADEN			##	Converteert radialen naar graden
-EVEN			= EVEN				##	Rondt het getal af op het dichtstbijzijnde gehele even getal
-EXP			= EXP				##	Verheft e tot de macht van een bepaald getal
-FACT			= FACULTEIT			##	Geeft als resultaat de faculteit van een getal
-FACTDOUBLE		= DUBBELE.FACULTEIT		##	Geeft als resultaat de dubbele faculteit van een getal
-FLOOR			= AFRONDEN.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-GCD			= GGD				##	Geeft als resultaat de grootste gemene deler
-INT			= INTEGER			##	Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal
-LCM			= KGV				##	Geeft als resultaat het kleinste gemene veelvoud
-LN			= LN				##	Geeft als resultaat de natuurlijke logaritme van een getal
-LOG			= LOG				##	Geeft als resultaat de logaritme met het opgegeven grondtal van een getal
-LOG10			= LOG10				##	Geeft als resultaat de logaritme met grondtal 10 van een getal
-MDETERM			= DETERMINANTMAT		##	Geeft als resultaat de determinant van een matrix
-MINVERSE		= INVERSEMAT			##	Geeft als resultaat de inverse van een matrix
-MMULT			= PRODUCTMAT			##	Geeft als resultaat het product van twee matrices
-MOD			= REST				##	Geeft als resultaat het restgetal van een deling
-MROUND			= AFRONDEN.N.VEELVOUD		##	Geeft als resultaat een getal afgerond op het gewenste veelvoud
-MULTINOMIAL		= MULTINOMIAAL			##	Geeft als resultaat de multinomiaalcoëfficiënt van een reeks getallen
-ODD			= ONEVEN			##	Rondt de absolute waarde van het getal naar boven af op het dichtstbijzijnde gehele oneven getal
-PI			= PI				##	Geeft als resultaat de waarde van pi
-POWER			= MACHT				##	Verheft een getal tot een macht
-PRODUCT			= PRODUCT			##	Vermenigvuldigt de argumenten met elkaar
-QUOTIENT		= QUOTIENT			##	Geeft als resultaat de uitkomst van een deling als geheel getal
-RADIANS			= RADIALEN			##	Converteert graden naar radialen
-RAND			= ASELECT			##	Geeft als resultaat een willekeurig getal tussen 0 en 1
-RANDBETWEEN		= ASELECTTUSSEN			##	Geeft een willekeurig getal tussen de getallen die u hebt opgegeven
-ROMAN			= ROMEINS			##	Converteert een Arabisch getal naar een Romeins getal en geeft het resultaat weer in de vorm van tekst
-ROUND			= AFRONDEN			##	Rondt een getal af op het opgegeven aantal decimalen
-ROUNDDOWN		= AFRONDEN.NAAR.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-ROUNDUP			= AFRONDEN.NAAR.BOVEN		##	Rondt de absolute waarde van een getal naar boven af
-SERIESSUM		= SOM.MACHTREEKS		##	Geeft als resultaat de som van een machtreeks die is gebaseerd op de formule
-SIGN			= POS.NEG			##	Geeft als resultaat het teken van een getal
-SIN			= SIN				##	Geeft als resultaat de sinus van de opgegeven hoek
-SINH			= SINH				##	Geeft als resultaat de sinus hyperbolicus van een getal
-SQRT			= WORTEL			##	Geeft als resultaat de positieve vierkantswortel van een getal
-SQRTPI			= WORTEL.PI			##	Geeft als resultaat de vierkantswortel van (getal * pi)
-SUBTOTAL		= SUBTOTAAL			##	Geeft als resultaat een subtotaal voor een bereik
-SUM			= SOM				##	Telt de argumenten op
-SUMIF			= SOM.ALS			##	Telt de getallen bij elkaar op die voldoen aan een bepaald criterium
-SUMIFS			= SOMMEN.ALS			##	Telt de cellen in een bereik op die aan meerdere criteria voldoen
-SUMPRODUCT		= SOMPRODUCT			##	Geeft als resultaat de som van de producten van de corresponderende matrixelementen
-SUMSQ			= KWADRATENSOM			##	Geeft als resultaat de som van de kwadraten van de argumenten
-SUMX2MY2		= SOM.X2MINY2			##	Geeft als resultaat de som van het verschil tussen de kwadraten van corresponderende waarden in twee matrices
-SUMX2PY2		= SOM.X2PLUSY2			##	Geeft als resultaat de som van de kwadratensom van corresponderende waarden in twee matrices
-SUMXMY2			= SOM.XMINY.2			##	Geeft als resultaat de som van de kwadraten van de verschillen tussen de corresponderende waarden in twee matrices
-TAN			= TAN				##	Geeft als resultaat de tangens van een getal
-TANH			= TANH				##	Geeft als resultaat de tangens hyperbolicus van een getal
-TRUNC			= GEHEEL			##	Kapt een getal af tot een geheel getal
-
+AVEDEV = GEM.DEVIATIE
+AVERAGE = GEMIDDELDE
+AVERAGEA = GEMIDDELDEA
+AVERAGEIF = GEMIDDELDE.ALS
+AVERAGEIFS = GEMIDDELDEN.ALS
+BETA.DIST = BETA.VERD
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.VERD
+BINOM.DIST.RANGE = BINOM.VERD.BEREIK
+BINOM.INV = BINOMIALE.INV
+CHISQ.DIST = CHIKW.VERD
+CHISQ.DIST.RT = CHIKW.VERD.RECHTS
+CHISQ.INV = CHIKW.INV
+CHISQ.INV.RT = CHIKW.INV.RECHTS
+CHISQ.TEST = CHIKW.TEST
+CONFIDENCE.NORM = VERTROUWELIJKHEID.NORM
+CONFIDENCE.T = VERTROUWELIJKHEID.T
+CORREL = CORRELATIE
+COUNT = AANTAL
+COUNTA = AANTALARG
+COUNTBLANK = AANTAL.LEGE.CELLEN
+COUNTIF = AANTAL.ALS
+COUNTIFS = AANTALLEN.ALS
+COVARIANCE.P = COVARIANTIE.P
+COVARIANCE.S = COVARIANTIE.S
+DEVSQ = DEV.KWAD
+EXPON.DIST = EXPON.VERD.N
+F.DIST = F.VERD
+F.DIST.RT = F.VERD.RECHTS
+F.INV = F.INV
+F.INV.RT = F.INV.RECHTS
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHER.INV
+FORECAST.ETS = VOORSPELLEN.ETS
+FORECAST.ETS.CONFINT = VOORSPELLEN.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = VOORSPELLEN.ETS.SEASONALITY
+FORECAST.ETS.STAT = FORECAST.ETS.STAT
+FORECAST.LINEAR = VOORSPELLEN.LINEAR
+FREQUENCY = INTERVAL
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.VERD.N
+GAMMA.INV = GAMMA.INV.N
+GAMMALN = GAMMA.LN
+GAMMALN.PRECISE = GAMMA.LN.NAUWKEURIG
+GAUSS = GAUSS
+GEOMEAN = MEETK.GEM
+GROWTH = GROEI
+HARMEAN = HARM.GEM
+HYPGEOM.DIST = HYPGEOM.VERD
+INTERCEPT = SNIJPUNT
+KURT = KURTOSIS
+LARGE = GROOTSTE
+LINEST = LIJNSCH
+LOGEST = LOGSCH
+LOGNORM.DIST = LOGNORM.VERD
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.ALS.VOORWAARDEN
+MEDIAN = MEDIAAN
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.ALS.VOORWAARDEN
+MODE.MULT = MODUS.MEERV
+MODE.SNGL = MODUS.ENKELV
+NEGBINOM.DIST = NEGBINOM.VERD
+NORM.DIST = NORM.VERD.N
+NORM.INV = NORM.INV.N
+NORM.S.DIST = NORM.S.VERD
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIEL.EXC
+PERCENTILE.INC = PERCENTIEL.INC
+PERCENTRANK.EXC = PROCENTRANG.EXC
+PERCENTRANK.INC = PROCENTRANG.INC
+PERMUT = PERMUTATIES
+PERMUTATIONA = PERMUTATIE.A
+PHI = PHI
+POISSON.DIST = POISSON.VERD
+PROB = KANS
+QUARTILE.EXC = KWARTIEL.EXC
+QUARTILE.INC = KWARTIEL.INC
+RANK.AVG = RANG.GEMIDDELDE
+RANK.EQ = RANG.GELIJK
+RSQ = R.KWADRAAT
+SKEW = SCHEEFHEID
+SKEW.P = SCHEEFHEID.P
+SLOPE = RICHTING
+SMALL = KLEINSTE
+STANDARDIZE = NORMALISEREN
+STDEV.P = STDEV.P
+STDEV.S = STDEV.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STAND.FOUT.YX
+T.DIST = T.DIST
+T.DIST.2T = T.VERD.2T
+T.DIST.RT = T.VERD.RECHTS
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = GETRIMD.GEM
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.VERD
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions				Statistische functies
+## Tekstfuncties (Text Functions)
 ##
-AVEDEV			= GEM.DEVIATIE			##	Geeft als resultaat het gemiddelde van de absolute deviaties van gegevenspunten ten opzichte van hun gemiddelde waarde
-AVERAGE			= GEMIDDELDE			##	Geeft als resultaat het gemiddelde van de argumenten
-AVERAGEA		= GEMIDDELDEA			##	Geeft als resultaat het gemiddelde van de argumenten, inclusief getallen, tekst en logische waarden
-AVERAGEIF		= GEMIDDELDE.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen in een bereik die voldoen aan de opgegeven criteria
-AVERAGEIFS		= GEMIDDELDEN.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen die aan meerdere criteria voldoen
-BETADIST		= BETA.VERD			##	Geeft als resultaat de cumulatieve bèta-verdelingsfunctie
-BETAINV			= BETA.INV			##	Geeft als resultaat de inverse van de cumulatieve verdelingsfunctie voor een gegeven bèta-verdeling
-BINOMDIST		= BINOMIALE.VERD		##	Geeft als resultaat de binomiale verdeling
-CHIDIST			= CHI.KWADRAAT			##	Geeft als resultaat de eenzijdige kans van de chi-kwadraatverdeling
-CHIINV			= CHI.KWADRAAT.INV		##	Geeft als resultaat de inverse van een eenzijdige kans van de chi-kwadraatverdeling
-CHITEST			= CHI.TOETS			##	Geeft als resultaat de onafhankelijkheidstoets
-CONFIDENCE		= BETROUWBAARHEID		##	Geeft als resultaat het betrouwbaarheidsinterval van een gemiddelde waarde voor de elementen van een populatie
-CORREL			= CORRELATIE			##	Geeft als resultaat de correlatiecoëfficiënt van twee gegevensverzamelingen
-COUNT			= AANTAL			##	Telt het aantal getallen in de argumentenlijst
-COUNTA			= AANTALARG			##	Telt het aantal waarden in de argumentenlijst
-COUNTBLANK		= AANTAL.LEGE.CELLEN		##	Telt het aantal lege cellen in een bereik
-COUNTIF			= AANTAL.ALS			##	Telt in een bereik het aantal cellen die voldoen aan een bepaald criterium
-COUNTIFS		= AANTALLEN.ALS			##	Telt in een bereik het aantal cellen die voldoen aan meerdere criteria
-COVAR			= COVARIANTIE			##	Geeft als resultaat de covariantie, het gemiddelde van de producten van de gepaarde deviaties
-CRITBINOM		= CRIT.BINOM			##	Geeft als resultaat de kleinste waarde waarvoor de binomiale verdeling kleiner is dan of gelijk is aan het criterium
-DEVSQ			= DEV.KWAD			##	Geeft als resultaat de som van de deviaties in het kwadraat
-EXPONDIST		= EXPON.VERD			##	Geeft als resultaat de exponentiële verdeling
-FDIST			= F.VERDELING			##	Geeft als resultaat de F-verdeling
-FINV			= F.INVERSE			##	Geeft als resultaat de inverse van de F-verdeling
-FISHER			= FISHER			##	Geeft als resultaat de Fisher-transformatie
-FISHERINV		= FISHER.INV			##	Geeft als resultaat de inverse van de Fisher-transformatie
-FORECAST		= VOORSPELLEN			##	Geeft als resultaat een waarde op basis van een lineaire trend
-FREQUENCY		= FREQUENTIE			##	Geeft als resultaat een frequentieverdeling in de vorm van een verticale matrix
-FTEST			= F.TOETS			##	Geeft als resultaat een F-toets
-GAMMADIST		= GAMMA.VERD			##	Geeft als resultaat de gamma-verdeling
-GAMMAINV		= GAMMA.INV			##	Geeft als resultaat de inverse van de cumulatieve gamma-verdeling
-GAMMALN			= GAMMA.LN			##	Geeft als resultaat de natuurlijke logaritme van de gamma-functie, G(x)
-GEOMEAN			= MEETK.GEM			##	Geeft als resultaat het meetkundige gemiddelde
-GROWTH			= GROEI				##	Geeft als resultaat de waarden voor een exponentiële trend
-HARMEAN			= HARM.GEM			##	Geeft als resultaat het harmonische gemiddelde
-HYPGEOMDIST		= HYPERGEO.VERD			##	Geeft als resultaat de hypergeometrische verdeling
-INTERCEPT		= SNIJPUNT			##	Geeft als resultaat het snijpunt van de lineaire regressielijn met de y-as
-KURT			= KURTOSIS			##	Geeft als resultaat de kurtosis van een gegevensverzameling
-LARGE			= GROOTSTE			##	Geeft als resultaat de op k-1 na grootste waarde in een gegevensverzameling
-LINEST			= LIJNSCH			##	Geeft als resultaat de parameters van een lineaire trend
-LOGEST			= LOGSCH			##	Geeft als resultaat de parameters van een exponentiële trend
-LOGINV			= LOG.NORM.INV			##	Geeft als resultaat de inverse van de logaritmische normale verdeling
-LOGNORMDIST		= LOG.NORM.VERD			##	Geeft als resultaat de cumulatieve logaritmische normale verdeling
-MAX			= MAX				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten
-MAXA			= MAXA				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MEDIAN			= MEDIAAN			##	Geeft als resultaat de mediaan van de opgegeven getallen
-MIN			= MIN				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten
-MINA			= MINA				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MODE			= MODUS				##	Geeft als resultaat de meest voorkomende waarde in een gegevensverzameling
-NEGBINOMDIST		= NEG.BINOM.VERD		##	Geeft als resultaat de negatieve binomiaalverdeling
-NORMDIST		= NORM.VERD			##	Geeft als resultaat de cumulatieve normale verdeling
-NORMINV			= NORM.INV			##	Geeft als resultaat de inverse van de cumulatieve standaardnormale verdeling
-NORMSDIST		= STAND.NORM.VERD		##	Geeft als resultaat de cumulatieve standaardnormale verdeling
-NORMSINV		= STAND.NORM.INV		##	Geeft als resultaat de inverse van de cumulatieve normale verdeling
-PEARSON			= PEARSON			##	Geeft als resultaat de correlatiecoëfficiënt van Pearson
-PERCENTILE		= PERCENTIEL			##	Geeft als resultaat het k-de percentiel van waarden in een bereik
-PERCENTRANK		= PERCENT.RANG			##	Geeft als resultaat de positie, in procenten uitgedrukt, van een waarde in de rangorde van een gegevensverzameling
-PERMUT			= PERMUTATIES			##	Geeft als resultaat het aantal permutaties voor een gegeven aantal objecten
-POISSON			= POISSON			##	Geeft als resultaat de Poisson-verdeling
-PROB			= KANS				##	Geeft als resultaat de kans dat waarden zich tussen twee grenzen bevinden
-QUARTILE		= KWARTIEL			##	Geeft als resultaat het kwartiel van een gegevensverzameling
-RANK			= RANG				##	Geeft als resultaat het rangnummer van een getal in een lijst getallen
-RSQ			= R.KWADRAAT			##	Geeft als resultaat het kwadraat van de Pearson-correlatiecoëfficiënt
-SKEW			= SCHEEFHEID			##	Geeft als resultaat de mate van asymmetrie van een verdeling
-SLOPE			= RICHTING			##	Geeft als resultaat de richtingscoëfficiënt van een lineaire regressielijn
-SMALL			= KLEINSTE			##	Geeft als resultaat de op k-1 na kleinste waarde in een gegevensverzameling
-STANDARDIZE		= NORMALISEREN			##	Geeft als resultaat een genormaliseerde waarde
-STDEV			= STDEV				##	Maakt een schatting van de standaarddeviatie op basis van een steekproef
-STDEVA			= STDEVA			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-STDEVP			= STDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie
-STDEVPA			= STDEVPA			##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-STEYX			= STAND.FOUT.YX			##	Geeft als resultaat de standaardfout in de voorspelde y-waarde voor elke x in een regressie
-TDIST			= T.VERD			##	Geeft als resultaat de Student T-verdeling
-TINV			= T.INV				##	Geeft als resultaat de inverse van de Student T-verdeling
-TREND			= TREND				##	Geeft als resultaat de waarden voor een lineaire trend
-TRIMMEAN		= GETRIMD.GEM			##	Geeft als resultaat het gemiddelde van waarden in een gegevensverzameling
-TTEST			= T.TOETS			##	Geeft als resultaat de kans met behulp van de Student T-toets
-VAR			= VAR				##	Maakt een schatting van de variantie op basis van een steekproef
-VARA			= VARA				##	Maakt een schatting van de variantie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-VARP			= VARP				##	Berekent de variantie op basis van de volledige populatie
-VARPA			= VARPA				##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-WEIBULL			= WEIBULL			##	Geeft als resultaat de Weibull-verdeling
-ZTEST			= Z.TOETS			##	Geeft als resultaat de eenzijdige kanswaarde van een Z-toets
-
+BAHTTEXT = BAHT.TEKST
+CHAR = TEKEN
+CLEAN = WISSEN.CONTROL
+CODE = CODE
+CONCAT = TEKST.SAMENV
+DOLLAR = EURO
+EXACT = GELIJK
+FIND = VIND.ALLES
+FIXED = VAST
+ISTHAIDIGIT = IS.THAIS.CIJFER
+LEFT = LINKS
+LEN = LENGTE
+LOWER = KLEINE.LETTERS
+MID = DEEL
+NUMBERSTRING = GETALNOTATIE
+NUMBERVALUE = NUMERIEKE.WAARDE
+PHONETIC = FONETISCH
+PROPER = BEGINLETTERS
+REPLACE = VERVANGEN
+REPT = HERHALING
+RIGHT = RECHTS
+SEARCH = VIND.SPEC
+SUBSTITUTE = SUBSTITUEREN
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.COMBINEREN
+THAIDIGIT = THAIS.CIJFER
+THAINUMSOUND = THAIS.GETAL.GELUID
+THAINUMSTRING = THAIS.GETAL.REEKS
+THAISTRINGLENGTH = THAIS.REEKS.LENGTE
+TRIM = SPATIES.WISSEN
+UNICHAR = UNITEKEN
+UNICODE = UNICODE
+UPPER = HOOFDLETTERS
+VALUE = WAARDE
 
 ##
-##	Text functions					Tekstfuncties
+## Webfuncties (Web Functions)
 ##
-ASC			= ASC				##	Wijzigt Nederlandse letters of katakanatekens over de volle breedte (dubbel-bytetekens) binnen een tekenreeks in tekens over de halve breedte (enkel-bytetekens)
-BAHTTEXT		= BAHT.TEKST			##	Converteert een getal naar tekst met de valutanotatie ß (baht)
-CHAR			= TEKEN				##	Geeft als resultaat het teken dat hoort bij de opgegeven code
-CLEAN			= WISSEN.CONTROL		##	Verwijdert alle niet-afdrukbare tekens uit een tekst
-CODE			= CODE				##	Geeft als resultaat de numerieke code voor het eerste teken in een tekenreeks
-CONCATENATE		= TEKST.SAMENVOEGEN		##	Voegt verschillende tekstfragmenten samen tot één tekstfragment
-DOLLAR			= EURO				##	Converteert een getal naar tekst met de valutanotatie € (euro)
-EXACT			= GELIJK			##	Controleert of twee tekenreeksen identiek zijn
-FIND			= VIND.ALLES			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FINDB			= VIND.ALLES.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FIXED			= VAST				##	Maakt een getal als tekst met een vast aantal decimalen op
-JIS			= JIS				##	Wijzigt Nederlandse letters of katakanatekens over de halve breedte (enkel-bytetekens) binnen een tekenreeks in tekens over de volle breedte (dubbel-bytetekens)
-LEFT			= LINKS				##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEFTB			= LINKSB			##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEN			= LENGTE			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LENB			= LENGTEB			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LOWER			= KLEINE.LETTERS		##	Zet tekst om in kleine letters
-MID			= MIDDEN			##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-MIDB			= DEELB				##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-PHONETIC		= FONETISCH			##	Haalt de fonetische tekens (furigana) uit een tekenreeks op
-PROPER			= BEGINLETTERS			##	Zet de eerste letter van elk woord in een tekst om in een hoofdletter
-REPLACE			= VERVANG			##	Vervangt tekens binnen een tekst
-REPLACEB		= VERVANGENB			##	Vervangt tekens binnen een tekst
-REPT			= HERHALING			##	Herhaalt een tekst een aantal malen
-RIGHT			= RECHTS			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-RIGHTB			= RECHTSB			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-SEARCH			= VIND.SPEC			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SEARCHB			= VIND.SPEC.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SUBSTITUTE		= SUBSTITUEREN			##	Vervangt oude tekst door nieuwe tekst in een tekenreeks
-T			= T				##	Converteert de argumenten naar tekst
-TEXT			= TEKST				##	Maakt een getal op en converteert het getal naar tekst
-TRIM			= SPATIES.WISSEN		##	Verwijdert de spaties uit een tekst
-UPPER			= HOOFDLETTERS			##	Zet tekst om in hoofdletters
-VALUE			= WAARDE			##	Converteert tekst naar een getal
+ENCODEURL = URL.CODEREN
+FILTERXML = XML.FILTEREN
+WEBSERVICE = WEBSERVICE
+
+##
+## Compatibiliteitsfuncties (Compatibility Functions)
+##
+BETADIST = BETAVERD
+BETAINV = BETAINV
+BINOMDIST = BINOMIALE.VERD
+CEILING = AFRONDEN.BOVEN
+CHIDIST = CHI.KWADRAAT
+CHIINV = CHI.KWADRAAT.INV
+CHITEST = CHI.TOETS
+CONCATENATE = TEKST.SAMENVOEGEN
+CONFIDENCE = BETROUWBAARHEID
+COVAR = COVARIANTIE
+CRITBINOM = CRIT.BINOM
+EXPONDIST = EXPON.VERD
+FDIST = F.VERDELING
+FINV = F.INVERSE
+FLOOR = AFRONDEN.BENEDEN
+FORECAST = VOORSPELLEN
+FTEST = F.TOETS
+GAMMADIST = GAMMA.VERD
+GAMMAINV = GAMMA.INV
+HYPGEOMDIST = HYPERGEO.VERD
+LOGINV = LOG.NORM.INV
+LOGNORMDIST = LOG.NORM.VERD
+MODE = MODUS
+NEGBINOMDIST = NEG.BINOM.VERD
+NORMDIST = NORM.VERD
+NORMINV = NORM.INV
+NORMSDIST = STAND.NORM.VERD
+NORMSINV = STAND.NORM.INV
+PERCENTILE = PERCENTIEL
+PERCENTRANK = PERCENT.RANG
+POISSON = POISSON
+QUARTILE = KWARTIEL
+RANK = RANG
+STDEV = STDEV
+STDEVP = STDEVP
+TDIST = T.VERD
+TINV = TINV
+TTEST = T.TOETS
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = Z.TOETS
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/config
deleted file mode 100644
index c7f4152a3..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/config
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## PhpSpreadsheet
-##
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #VERDI!
-REF	= #REF!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/functions
deleted file mode 100644
index ab2a37937..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/no/functions
+++ /dev/null
@@ -1,416 +0,0 @@
-##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
-##
-##
-
-
-##
-##	Add-in and Automation functions				Funksjonene Tillegg og Automatisering
-##
-GETPIVOTDATA		= HENTPIVOTDATA				##	Returnerer data som er lagret i en pivottabellrapport
-
-
-##
-##	Cube functions						Kubefunksjoner
-##
-CUBEKPIMEMBER		= KUBEKPIMEDLEM				##	Returnerer navnet, egenskapen og målet for en viktig ytelsesindikator (KPI), og viser navnet og egenskapen i cellen. En KPI er en målbar enhet, for eksempel månedlig bruttoinntjening eller kvartalsvis inntjening per ansatt, og brukes til å overvåke ytelsen i en organisasjon.
-CUBEMEMBER		= KUBEMEDLEM				##	Returnerer et medlem eller en tuppel i et kubehierarki. Brukes til å validere at medlemmet eller tuppelen finnes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEMEGENSKAP			##	Returnerer verdien til en medlemsegenskap i kuben. Brukes til å validere at et medlemsnavn finnes i kuben, og til å returnere den angitte egenskapen for dette medlemmet.
-CUBERANKEDMEMBER	= KUBERANGERTMEDLEM			##	Returnerer det n-te, eller rangerte, medlemmet i et sett. Brukes til å returnere ett eller flere elementer i et sett, for eksempel de 10 beste studentene.
-CUBESET			= KUBESETT				##	Definerer et beregnet sett av medlemmer eller tuppeler ved å sende et settuttrykk til kuben på serveren, noe som oppretter settet og deretter returnerer dette settet til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESETTANTALL			##	Returnerer antallet elementer i et sett.
-CUBEVALUE		= KUBEVERDI				##	Returnerer en aggregert verdi fra en kube.
-
-
-##
-##	Database functions					Databasefunksjoner
-##
-DAVERAGE		= DGJENNOMSNITT				##	Returnerer gjennomsnittet av merkede databaseposter
-DCOUNT			= DANTALL				##	Teller celler som inneholder tall i en database
-DCOUNTA			= DANTALLA				##	Teller celler som ikke er tomme i en database
-DGET			= DHENT					##	Trekker ut fra en database en post som oppfyller angitte vilkår
-DMAX			= DMAKS					##	Returnerer maksimumsverdien fra merkede databaseposter
-DMIN			= DMIN					##	Returnerer minimumsverdien fra merkede databaseposter
-DPRODUCT		= DPRODUKT				##	Multipliserer verdiene i et bestemt felt med poster som oppfyller vilkårene i en database
-DSTDEV			= DSTDAV				##	Estimerer standardavviket basert på et utvalg av merkede databaseposter
-DSTDEVP			= DSTAVP				##	Beregner standardavviket basert på at merkede databaseposter utgjør hele populasjonen
-DSUM			= DSUMMER				##	Legger til tallene i feltkolonnen med poster, i databasen som oppfyller vilkårene
-DVAR			= DVARIANS				##	Estimerer variansen basert på et utvalg av merkede databaseposter
-DVARP			= DVARIANSP				##	Beregner variansen basert på at merkede databaseposter utgjør hele populasjonen
-
-
-##
-##	Date and time functions					Dato- og tidsfunksjoner
-##
-DATE			= DATO					##	Returnerer serienummeret som svarer til en bestemt dato
-DATEVALUE		= DATOVERDI				##	Konverterer en dato med tekstformat til et serienummer
-DAY			= DAG					##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGER360				##	Beregner antall dager mellom to datoer basert på et år med 360 dager
-EDATE			= DAG.ETTER				##	Returnerer serienummeret som svarer til datoen som er det indikerte antall måneder før eller etter startdatoen
-EOMONTH			= MÅNEDSSLUTT				##	Returnerer serienummeret som svarer til siste dag i måneden, før eller etter et angitt antall måneder
-HOUR			= TIME					##	Konverterer et serienummer til en time
-MINUTE			= MINUTT				##	Konverterer et serienummer til et minutt
-MONTH			= MÅNED					##	Konverterer et serienummer til en måned
-NETWORKDAYS		= NETT.ARBEIDSDAGER			##	Returnerer antall hele arbeidsdager mellom to datoer
-NOW			= NÅ					##	Returnerer serienummeret som svarer til gjeldende dato og klokkeslett
-SECOND			= SEKUND				##	Konverterer et serienummer til et sekund
-TIME			= TID					##	Returnerer serienummeret som svarer til et bestemt klokkeslett
-TIMEVALUE		= TIDSVERDI				##	Konverterer et klokkeslett i tekstformat til et serienummer
-TODAY			= IDAG					##	Returnerer serienummeret som svarer til dagens dato
-WEEKDAY			= UKEDAG				##	Konverterer et serienummer til en ukedag
-WEEKNUM			= UKENR					##	Konverterer et serienummer til et tall som representerer hvilket nummer uken har i et år
-WORKDAY			= ARBEIDSDAG				##	Returnerer serienummeret som svarer til datoen før eller etter et angitt antall arbeidsdager
-YEAR			= ÅR					##	Konverterer et serienummer til et år
-YEARFRAC		= ÅRDEL					##	Returnerer brøkdelen for året, som svarer til antall hele dager mellom startdato og sluttdato
-
-
-##
-##	Engineering functions					Tekniske funksjoner
-##
-BESSELI			= BESSELI				##	Returnerer den endrede Bessel-funksjonen In(x)
-BESSELJ			= BESSELJ				##	Returnerer Bessel-funksjonen Jn(x)
-BESSELK			= BESSELK				##	Returnerer den endrede Bessel-funksjonen Kn(x)
-BESSELY			= BESSELY				##	Returnerer Bessel-funksjonen Yn(x)
-BIN2DEC			= BINTILDES				##	Konverterer et binært tall til et desimaltall
-BIN2HEX			= BINTILHEKS				##	Konverterer et binært tall til et heksadesimaltall
-BIN2OCT			= BINTILOKT				##	Konverterer et binært tall til et oktaltall
-COMPLEX			= KOMPLEKS				##	Konverterer reelle og imaginære koeffisienter til et komplekst tall
-CONVERT			= KONVERTER				##	Konverterer et tall fra ett målsystem til et annet
-DEC2BIN			= DESTILBIN				##	Konverterer et desimaltall til et binærtall
-DEC2HEX			= DESTILHEKS				##	Konverterer et heltall i 10-tallsystemet til et heksadesimalt tall
-DEC2OCT			= DESTILOKT				##	Konverterer et heltall i 10-tallsystemet til et oktaltall
-DELTA			= DELTA					##	Undersøker om to verdier er like
-ERF			= FEILF					##	Returnerer feilfunksjonen
-ERFC			= FEILFK				##	Returnerer den komplementære feilfunksjonen
-GESTEP			= GRENSEVERDI				##	Tester om et tall er større enn en terskelverdi
-HEX2BIN			= HEKSTILBIN				##	Konverterer et heksadesimaltall til et binært tall
-HEX2DEC			= HEKSTILDES				##	Konverterer et heksadesimalt tall til et heltall i 10-tallsystemet
-HEX2OCT			= HEKSTILOKT				##	Konverterer et heksadesimalt tall til et oktaltall
-IMABS			= IMABS					##	Returnerer absoluttverdien (koeffisienten) til et komplekst tall
-IMAGINARY		= IMAGINÆR				##	Returnerer den imaginære koeffisienten til et komplekst tall
-IMARGUMENT		= IMARGUMENT				##	Returnerer argumentet theta, som er en vinkel uttrykt i radianer
-IMCONJUGATE		= IMKONJUGERT				##	Returnerer den komplekse konjugaten til et komplekst tall
-IMCOS			= IMCOS					##	Returnerer cosinus til et komplekst tall
-IMDIV			= IMDIV					##	Returnerer kvotienten til to komplekse tall
-IMEXP			= IMEKSP				##	Returnerer eksponenten til et komplekst tall
-IMLN			= IMLN					##	Returnerer den naturlige logaritmen for et komplekst tall
-IMLOG10			= IMLOG10				##	Returnerer logaritmen med grunntall 10 for et komplekst tall
-IMLOG2			= IMLOG2				##	Returnerer logaritmen med grunntall 2 for et komplekst tall
-IMPOWER			= IMOPPHØY				##	Returnerer et komplekst tall opphøyd til en heltallspotens
-IMPRODUCT		= IMPRODUKT				##	Returnerer produktet av komplekse tall
-IMREAL			= IMREELL				##	Returnerer den reelle koeffisienten til et komplekst tall
-IMSIN			= IMSIN					##	Returnerer sinus til et komplekst tall
-IMSQRT			= IMROT					##	Returnerer kvadratroten av et komplekst tall
-IMSUB			= IMSUB					##	Returnerer differansen mellom to komplekse tall
-IMSUM			= IMSUMMER				##	Returnerer summen av komplekse tall
-OCT2BIN			= OKTTILBIN				##	Konverterer et oktaltall til et binært tall
-OCT2DEC			= OKTTILDES				##	Konverterer et oktaltall til et desimaltall
-OCT2HEX			= OKTTILHEKS				##	Konverterer et oktaltall til et heksadesimaltall
-
-
-##
-##	Financial functions					Økonomiske funksjoner
-##
-ACCRINT			= PÅLØPT.PERIODISK.RENTE		##	Returnerer påløpte renter for et verdipapir som betaler periodisk rente
-ACCRINTM		= PÅLØPT.FORFALLSRENTE			##	Returnerer den påløpte renten for et verdipapir som betaler rente ved forfall
-AMORDEGRC		= AMORDEGRC				##	Returnerer avskrivningen for hver regnskapsperiode ved hjelp av en avskrivingskoeffisient
-AMORLINC		= AMORLINC				##	Returnerer avskrivingen for hver regnskapsperiode
-COUPDAYBS		= OBLIG.DAGER.FF			##	Returnerer antall dager fra begynnelsen av den rentebærende perioden til innløsningsdatoen
-COUPDAYS		= OBLIG.DAGER				##	Returnerer antall dager i den rentebærende perioden som inneholder innløsningsdatoen
-COUPDAYSNC		= OBLIG.DAGER.NF			##	Returnerer antall dager fra betalingsdato til neste renteinnbetalingsdato
-COUPNCD			= OBLIG.DAGER.EF			##	Returnerer obligasjonsdatoen som kommer etter oppgjørsdatoen
-COUPNUM			= OBLIG.ANTALL				##	Returnerer antall obligasjoner som skal betales mellom oppgjørsdatoen og forfallsdatoen
-COUPPCD			= OBLIG.DAG.FORRIGE			##	Returnerer obligasjonsdatoen som kommer før oppgjørsdatoen
-CUMIPMT			= SAMLET.RENTE				##	Returnerer den kumulative renten som er betalt mellom to perioder
-CUMPRINC		= SAMLET.HOVEDSTOL			##	Returnerer den kumulative hovedstolen som er betalt for et lån mellom to perioder
-DB			= DAVSKR				##	Returnerer avskrivningen for et aktivum i en angitt periode, foretatt med fast degressiv avskrivning
-DDB			= DEGRAVS				##	Returnerer avskrivningen for et aktivum for en gitt periode, ved hjelp av dobbel degressiv avskrivning eller en metode som du selv angir
-DISC			= DISKONTERT				##	Returnerer diskonteringsraten for et verdipapir
-DOLLARDE		= DOLLARDE				##	Konverterer en valutapris uttrykt som en brøk, til en valutapris uttrykt som et desimaltall
-DOLLARFR		= DOLLARBR				##	Konverterer en valutapris uttrykt som et desimaltall, til en valutapris uttrykt som en brøk
-DURATION		= VARIGHET				##	Returnerer årlig varighet for et verdipapir med renter som betales periodisk
-EFFECT			= EFFEKTIV.RENTE			##	Returnerer den effektive årlige rentesatsen
-FV			= SLUTTVERDI				##	Returnerer fremtidig verdi for en investering
-FVSCHEDULE		= SVPLAN				##	Returnerer den fremtidige verdien av en inngående hovedstol etter å ha anvendt en serie med sammensatte rentesatser
-INTRATE			= RENTESATS				##	Returnerer rentefoten av et fullfinansiert verdipapir
-IPMT			= RAVDRAG				##	Returnerer betalte renter på en investering for en gitt periode
-IRR			= IR					##	Returnerer internrenten for en serie kontantstrømmer
-ISPMT			= ER.AVDRAG				##	Beregner renten som er betalt for en investering i løpet av en bestemt periode
-MDURATION		= MVARIGHET				##	Returnerer Macauleys modifiserte varighet for et verdipapir med en antatt pålydende verdi på kr 100,00
-MIRR			= MODIR					##	Returnerer internrenten der positive og negative kontantstrømmer finansieres med forskjellige satser
-NOMINAL			= NOMINELL				##	Returnerer årlig nominell rentesats
-NPER			= PERIODER				##	Returnerer antall perioder for en investering
-NPV			= NNV					##	Returnerer netto nåverdi for en investering, basert på en serie periodiske kontantstrømmer og en rentesats
-ODDFPRICE		= AVVIKFP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde første periode
-ODDFYIELD		= AVVIKFP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde første periode
-ODDLPRICE		= AVVIKSP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde siste periode
-ODDLYIELD		= AVVIKSP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde siste periode
-PMT			= AVDRAG				##	Returnerer periodisk betaling for en annuitet
-PPMT			= AMORT					##	Returnerer betalingen på hovedstolen for en investering i en gitt periode
-PRICE			= PRIS					##	Returnerer prisen per pålydende kr 100 for et verdipapir som gir periodisk avkastning
-PRICEDISC		= PRIS.DISKONTERT			##	Returnerer prisen per pålydende kr 100 for et diskontert verdipapir
-PRICEMAT		= PRIS.FORFALL				##	Returnerer prisen per pålydende kr 100 av et verdipapir som betaler rente ved forfall
-PV			= NÅVERDI				##	Returnerer nåverdien av en investering
-RATE			= RENTE					##	Returnerer rentesatsen per periode for en annuitet
-RECEIVED		= MOTTATT.AVKAST			##	Returnerer summen som mottas ved forfallsdato for et fullinvestert verdipapir
-SLN			= LINAVS				##	Returnerer den lineære avskrivningen for et aktivum i én periode
-SYD			= ÅRSAVS				##	Returnerer årsavskrivningen for et aktivum i en angitt periode
-TBILLEQ			= TBILLEKV				##	Returnerer den obligasjonsekvivalente avkastningen for en statsobligasjon
-TBILLPRICE		= TBILLPRIS				##	Returnerer prisen per pålydende kr 100 for en statsobligasjon
-TBILLYIELD		= TBILLAVKASTNING			##	Returnerer avkastningen til en statsobligasjon
-VDB			= VERDIAVS				##	Returnerer avskrivningen for et aktivum i en angitt periode eller delperiode, ved hjelp av degressiv avskrivning
-XIRR			= XIR					##	Returnerer internrenten for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-XNPV			= XNNV					##	Returnerer netto nåverdi for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-YIELD			= AVKAST				##	Returnerer avkastningen på et verdipapir som betaler periodisk rente
-YIELDDISC		= AVKAST.DISKONTERT			##	Returnerer årlig avkastning for et diskontert verdipapir, for eksempel en statskasseveksel
-YIELDMAT		= AVKAST.FORFALL			##	Returnerer den årlige avkastningen for et verdipapir som betaler rente ved forfallsdato
-
-
-##
-##	Information functions					Informasjonsfunksjoner
-##
-CELL			= CELLE					##	Returnerer informasjon om formatering, plassering eller innholdet til en celle
-ERROR.TYPE		= FEIL.TYPE				##	Returnerer et tall som svarer til en feiltype
-INFO			= INFO					##	Returnerer informasjon om gjeldende operativmiljø
-ISBLANK			= ERTOM					##	Returnerer SANN hvis verdien er tom
-ISERR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst annen feilverdi enn #I/T
-ISERROR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst feilverdi
-ISEVEN			= ERPARTALL				##	Returnerer SANN hvis tallet er et partall
-ISLOGICAL		= ERLOGISK				##	Returnerer SANN hvis verdien er en logisk verdi
-ISNA			= ERIT					##	Returnerer SANN hvis verdien er feilverdien #I/T
-ISNONTEXT		= ERIKKETEKST				##	Returnerer SANN hvis verdien ikke er tekst
-ISNUMBER		= ERTALL				##	Returnerer SANN hvis verdien er et tall
-ISODD			= ERODDETALL				##	Returnerer SANN hvis tallet er et oddetall
-ISREF			= ERREF					##	Returnerer SANN hvis verdien er en referanse
-ISTEXT			= ERTEKST				##	Returnerer SANN hvis verdien er tekst
-N			= N					##	Returnerer en verdi som er konvertert til et tall
-NA			= IT					##	Returnerer feilverdien #I/T
-TYPE			= VERDITYPE				##	Returnerer et tall som indikerer datatypen til en verdi
-
-
-##
-##	Logical functions					Logiske funksjoner
-##
-AND			= OG					##	Returnerer SANN hvis alle argumentene er lik SANN
-FALSE			= USANN					##	Returnerer den logiske verdien USANN
-IF			= HVIS					##	Angir en logisk test som skal utføres
-IFERROR			= HVISFEIL				##	Returnerer en verdi du angir hvis en formel evaluerer til en feil. Ellers returnerer den resultatet av formelen.
-NOT			= IKKE					##	Reverserer logikken til argumentet
-OR			= ELLER					##	Returnerer SANN hvis ett eller flere argumenter er lik SANN
-TRUE			= SANN					##	Returnerer den logiske verdien SANN
-
-
-##
-##	Lookup and reference functions				Oppslag- og referansefunksjoner
-##
-ADDRESS			= ADRESSE				##	Returnerer en referanse som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER				##	Returnerer antall områder i en referanse
-CHOOSE			= VELG					##	Velger en verdi fra en liste med verdier
-COLUMN			= KOLONNE				##	Returnerer kolonnenummeret for en referanse
-COLUMNS			= KOLONNER				##	Returnerer antall kolonner i en referanse
-HLOOKUP			= FINN.KOLONNE				##	Leter i den øverste raden i en matrise og returnerer verdien for den angitte cellen
-HYPERLINK		= HYPERKOBLING				##	Oppretter en snarvei eller et hopp som åpner et dokument som er lagret på en nettverksserver, et intranett eller Internett
-INDEX			= INDEKS				##	Bruker en indeks til å velge en verdi fra en referanse eller matrise
-INDIRECT		= INDIREKTE				##	Returnerer en referanse angitt av en tekstverdi
-LOOKUP			= SLÅ.OPP				##	Slår opp verdier i en vektor eller matrise
-MATCH			= SAMMENLIGNE				##	Slår opp verdier i en referanse eller matrise
-OFFSET			= FORSKYVNING				##	Returnerer en referanseforskyvning fra en gitt referanse
-ROW			= RAD					##	Returnerer radnummeret for en referanse
-ROWS			= RADER					##	Returnerer antall rader i en referanse
-RTD			= RTD					##	Henter sanntidsdata fra et program som støtter COM-automatisering (automatisering: En måte å arbeide på med programobjekter fra et annet program- eller utviklingsverktøy. Tidligere kalt OLE-automatisering. Automatisering er en bransjestandard og en funksjon i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONER				##	Returnerer transponeringen av en matrise
-VLOOKUP			= FINN.RAD				##	Leter i den første kolonnen i en matrise og flytter bortover raden for å returnere verdien til en celle
-
-
-##
-##	Math and trigonometry functions				Matematikk- og trigonometrifunksjoner
-##
-ABS			= ABS					##	Returnerer absoluttverdien til et tall
-ACOS			= ARCCOS				##	Returnerer arcus cosinus til et tall
-ACOSH			= ARCCOSH				##	Returnerer den inverse hyperbolske cosinus til et tall
-ASIN			= ARCSIN				##	Returnerer arcus sinus til et tall
-ASINH			= ARCSINH				##	Returnerer den inverse hyperbolske sinus til et tall
-ATAN			= ARCTAN				##	Returnerer arcus tangens til et tall
-ATAN2			= ARCTAN2				##	Returnerer arcus tangens fra x- og y-koordinater
-ATANH			= ARCTANH				##	Returnerer den inverse hyperbolske tangens til et tall
-CEILING			= AVRUND.GJELDENDE.MULTIPLUM		##	Runder av et tall til nærmeste heltall eller til nærmeste signifikante multiplum
-COMBIN			= KOMBINASJON				##	Returnerer antall kombinasjoner for ett gitt antall objekter
-COS			= COS					##	Returnerer cosinus til et tall
-COSH			= COSH					##	Returnerer den hyperbolske cosinus til et tall
-DEGREES			= GRADER				##	Konverterer radianer til grader
-EVEN			= AVRUND.TIL.PARTALL			##	Runder av et tall oppover til nærmeste heltall som er et partall
-EXP			= EKSP					##	Returnerer e opphøyd i en angitt potens
-FACT			= FAKULTET				##	Returnerer fakultet til et tall
-FACTDOUBLE		= DOBBELFAKT				##	Returnerer et talls doble fakultet
-FLOOR			= AVRUND.GJELDENDE.MULTIPLUM.NED	##	Avrunder et tall nedover, mot null
-GCD			= SFF					##	Returnerer høyeste felles divisor
-INT			= HELTALL				##	Avrunder et tall nedover til nærmeste heltall
-LCM			= MFM					##	Returnerer minste felles multiplum
-LN			= LN					##	Returnerer den naturlige logaritmen til et tall
-LOG			= LOG					##	Returnerer logaritmen for et tall til et angitt grunntall
-LOG10			= LOG10					##	Returnerer logaritmen med grunntall 10 for et tall
-MDETERM			= MDETERM				##	Returnerer matrisedeterminanten til en matrise
-MINVERSE		= MINVERS				##	Returnerer den inverse matrisen til en matrise
-MMULT			= MMULT					##	Returnerer matriseproduktet av to matriser
-MOD			= REST					##	Returnerer resten fra en divisjon
-MROUND			= MRUND					##	Returnerer et tall avrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMINELL				##	Returnerer det multinominelle for et sett med tall
-ODD			= AVRUND.TIL.ODDETALL			##	Runder av et tall oppover til nærmeste heltall som er et oddetall
-PI			= PI					##	Returnerer verdien av pi
-POWER			= OPPHØYD.I				##	Returnerer resultatet av et tall opphøyd i en potens
-PRODUCT			= PRODUKT				##	Multipliserer argumentene
-QUOTIENT		= KVOTIENT				##	Returnerer heltallsdelen av en divisjon
-RADIANS			= RADIANER				##	Konverterer grader til radianer
-RAND			= TILFELDIG				##	Returnerer et tilfeldig tall mellom 0 og 1
-RANDBETWEEN		= TILFELDIGMELLOM			##	Returnerer et tilfeldig tall innenfor et angitt område
-ROMAN			= ROMERTALL				##	Konverterer vanlige tall til romertall, som tekst
-ROUND			= AVRUND				##	Avrunder et tall til et angitt antall sifre
-ROUNDDOWN		= AVRUND.NED				##	Avrunder et tall nedover, mot null
-ROUNDUP			= AVRUND.OPP				##	Runder av et tall oppover, bort fra null
-SERIESSUM		= SUMMER.REKKE				##	Returnerer summen av en geometrisk rekke, basert på formelen
-SIGN			= FORTEGN				##	Returnerer fortegnet for et tall
-SIN			= SIN					##	Returnerer sinus til en gitt vinkel
-SINH			= SINH					##	Returnerer den hyperbolske sinus til et tall
-SQRT			= ROT					##	Returnerer en positiv kvadratrot
-SQRTPI			= ROTPI					##	Returnerer kvadratroten av (tall * pi)
-SUBTOTAL		= DELSUM				##	Returnerer en delsum i en liste eller database
-SUM			= SUMMER				##	Legger sammen argumentene
-SUMIF			= SUMMERHVIS				##	Legger sammen cellene angitt ved et gitt vilkår
-SUMIFS			= SUMMER.HVIS.SETT			##	Legger sammen cellene i et område som oppfyller flere vilkår
-SUMPRODUCT		= SUMMERPRODUKT				##	Returnerer summen av produktene av tilsvarende matrisekomponenter
-SUMSQ			= SUMMERKVADRAT				##	Returnerer kvadratsummen av argumentene
-SUMX2MY2		= SUMMERX2MY2				##	Returnerer summen av differansen av kvadratene for tilsvarende verdier i to matriser
-SUMX2PY2		= SUMMERX2PY2				##	Returnerer summen av kvadratsummene for tilsvarende verdier i to matriser
-SUMXMY2			= SUMMERXMY2				##	Returnerer summen av kvadratene av differansen for tilsvarende verdier i to matriser
-TAN			= TAN					##	Returnerer tangens for et tall
-TANH			= TANH					##	Returnerer den hyperbolske tangens for et tall
-TRUNC			= AVKORT				##	Korter av et tall til et heltall
-
-
-##
-##	Statistical functions					Statistiske funksjoner
-##
-AVEDEV			= GJENNOMSNITTSAVVIK			##	Returnerer datapunktenes gjennomsnittlige absoluttavvik fra middelverdien
-AVERAGE			= GJENNOMSNITT				##	Returnerer gjennomsnittet for argumentene
-AVERAGEA		= GJENNOMSNITTA				##	Returnerer gjennomsnittet for argumentene, inkludert tall, tekst og logiske verdier
-AVERAGEIF		= GJENNOMSNITTHVIS			##	Returnerer gjennomsnittet (aritmetisk gjennomsnitt) av alle cellene i et område som oppfyller et bestemt vilkår
-AVERAGEIFS		= GJENNOMSNITT.HVIS.SETT		##	Returnerer gjennomsnittet (aritmetisk middelverdi) av alle celler som oppfyller flere vilkår.
-BETADIST		= BETA.FORDELING			##	Returnerer den kumulative betafordelingsfunksjonen
-BETAINV			= INVERS.BETA.FORDELING			##	Returnerer den inverse verdien til fordelingsfunksjonen for en angitt betafordeling
-BINOMDIST		= BINOM.FORDELING			##	Returnerer den individuelle binomiske sannsynlighetsfordelingen
-CHIDIST			= KJI.FORDELING				##	Returnerer den ensidige sannsynligheten for en kjikvadrert fordeling
-CHIINV			= INVERS.KJI.FORDELING			##	Returnerer den inverse av den ensidige sannsynligheten for den kjikvadrerte fordelingen
-CHITEST			= KJI.TEST				##	Utfører testen for uavhengighet
-CONFIDENCE		= KONFIDENS				##	Returnerer konfidensintervallet til gjennomsnittet for en populasjon
-CORREL			= KORRELASJON				##	Returnerer korrelasjonskoeffisienten mellom to datasett
-COUNT			= ANTALL				##	Teller hvor mange tall som er i argumentlisten
-COUNTA			= ANTALLA				##	Teller hvor mange verdier som er i argumentlisten
-COUNTBLANK		= TELLBLANKE				##	Teller antall tomme celler i et område.
-COUNTIF			= ANTALL.HVIS				##	Teller antall celler i et område som oppfyller gitte vilkår
-COUNTIFS		= ANTALL.HVIS.SETT			##	Teller antallet ikke-tomme celler i et område som oppfyller flere vilkår
-COVAR			= KOVARIANS				##	Returnerer kovariansen, gjennomsnittet av produktene av parvise avvik
-CRITBINOM		= GRENSE.BINOM				##	Returnerer den minste verdien der den kumulative binomiske fordelingen er mindre enn eller lik en vilkårsverdi
-DEVSQ			= AVVIK.KVADRERT			##	Returnerer summen av kvadrerte avvik
-EXPONDIST		= EKSP.FORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING				##	Returnerer F-sannsynlighetsfordelingen
-FINV			= FFORDELING.INVERS			##	Returnerer den inverse av den sannsynlige F-fordelingen
-FISHER			= FISHER				##	Returnerer Fisher-transformasjonen
-FISHERINV		= FISHERINV				##	Returnerer den inverse av Fisher-transformasjonen
-FORECAST		= PROGNOSE				##	Returnerer en verdi langs en lineær trend
-FREQUENCY		= FREKVENS				##	Returnerer en frekvensdistribusjon som en loddrett matrise
-FTEST			= FTEST					##	Returnerer resultatet av en F-test
-GAMMADIST		= GAMMAFORDELING			##	Returnerer gammafordelingen
-GAMMAINV		= GAMMAINV				##	Returnerer den inverse av den gammakumulative fordelingen
-GAMMALN			= GAMMALN				##	Returnerer den naturlige logaritmen til gammafunksjonen G(x)
-GEOMEAN			= GJENNOMSNITT.GEOMETRISK		##	Returnerer den geometriske middelverdien
-GROWTH			= VEKST					##	Returnerer verdier langs en eksponentiell trend
-HARMEAN			= GJENNOMSNITT.HARMONISK		##	Returnerer den harmoniske middelverdien
-HYPGEOMDIST		= HYPGEOM.FORDELING			##	Returnerer den hypergeometriske fordelingen
-INTERCEPT		= SKJÆRINGSPUNKT			##	Returnerer skjæringspunktet til den lineære regresjonslinjen
-KURT			= KURT					##	Returnerer kurtosen til et datasett
-LARGE			= N.STØRST				##	Returnerer den n-te største verdien i et datasett
-LINEST			= RETTLINJE				##	Returnerer parameterne til en lineær trend
-LOGEST			= KURVE					##	Returnerer parameterne til en eksponentiell trend
-LOGINV			= LOGINV				##	Returnerer den inverse lognormale fordelingen
-LOGNORMDIST		= LOGNORMFORD				##	Returnerer den kumulative lognormale fordelingen
-MAX			= STØRST				##	Returnerer maksimumsverdien i en argumentliste
-MAXA			= MAKSA					##	Returnerer maksimumsverdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MEDIAN			= MEDIAN				##	Returnerer medianen til tallene som er gitt
-MIN			= MIN					##	Returnerer minimumsverdien i en argumentliste
-MINA			= MINA					##	Returnerer den minste verdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MODE			= MODUS					##	Returnerer den vanligste verdien i et datasett
-NEGBINOMDIST		= NEGBINOM.FORDELING			##	Returnerer den negative binomiske fordelingen
-NORMDIST		= NORMALFORDELING			##	Returnerer den kumulative normalfordelingen
-NORMINV			= NORMINV				##	Returnerer den inverse kumulative normalfordelingen
-NORMSDIST		= NORMSFORDELING			##	Returnerer standard kumulativ normalfordeling
-NORMSINV		= NORMSINV				##	Returnerer den inverse av den den kumulative standard normalfordelingen
-PEARSON			= PEARSON				##	Returnerer produktmomentkorrelasjonskoeffisienten, Pearson
-PERCENTILE		= PERSENTIL				##	Returnerer den n-te persentil av verdiene i et område
-PERCENTRANK		= PROSENTDEL				##	Returnerer prosentrangeringen av en verdi i et datasett
-PERMUT			= PERMUTER				##	Returnerer antall permutasjoner for et gitt antall objekter
-POISSON			= POISSON				##	Returnerer Poissons sannsynlighetsfordeling
-PROB			= SANNSYNLIG				##	Returnerer sannsynligheten for at verdier i et område ligger mellom to grenser
-QUARTILE		= KVARTIL				##	Returnerer kvartilen til et datasett
-RANK			= RANG					##	Returnerer rangeringen av et tall, eller plassen tallet har i en rekke
-RSQ			= RKVADRAT				##	Returnerer kvadratet av produktmomentkorrelasjonskoeffisienten (Pearsons r)
-SKEW			= SKJEVFORDELING			##	Returnerer skjevheten i en fordeling
-SLOPE			= STIGNINGSTALL				##	Returnerer stigningtallet for den lineære regresjonslinjen
-SMALL			= N.MINST				##	Returnerer den n-te minste verdien i et datasett
-STANDARDIZE		= NORMALISER				##	Returnerer en normalisert verdi
-STDEV			= STDAV					##	Estimere standardavvik på grunnlag av et utvalg
-STDEVA			= STDAVVIKA				##	Estimerer standardavvik basert på et utvalg, inkludert tall, tekst og logiske verdier
-STDEVP			= STDAVP				##	Beregner standardavvik basert på hele populasjonen
-STDEVPA			= STDAVVIKPA				##	Beregner standardavvik basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-STEYX			= STANDARDFEIL				##	Returnerer standardfeilen for den predikerte y-verdien for hver x i regresjonen
-TDIST			= TFORDELING				##	Returnerer en Student t-fordeling
-TINV			= TINV					##	Returnerer den inverse Student t-fordelingen
-TREND			= TREND					##	Returnerer verdier langs en lineær trend
-TRIMMEAN		= TRIMMET.GJENNOMSNITT			##	Returnerer den interne middelverdien til et datasett
-TTEST			= TTEST					##	Returnerer sannsynligheten assosiert med en Student t-test
-VAR			= VARIANS				##	Estimerer varians basert på et utvalg
-VARA			= VARIANSA				##	Estimerer varians basert på et utvalg, inkludert tall, tekst og logiske verdier
-VARP			= VARIANSP				##	Beregner varians basert på hele populasjonen
-VARPA			= VARIANSPA				##	Beregner varians basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-WEIBULL			= WEIBULL.FORDELING			##	Returnerer Weibull-fordelingen
-ZTEST			= ZTEST					##	Returnerer den ensidige sannsynlighetsverdien for en z-test
-
-
-##
-##	Text functions						Tekstfunksjoner
-##
-ASC			= STIGENDE				##	Endrer fullbreddes (dobbeltbyte) engelske bokstaver eller katakana i en tegnstreng, til halvbreddes (enkeltbyte) tegn
-BAHTTEXT		= BAHTTEKST				##	Konverterer et tall til tekst, og bruker valutaformatet ß (baht)
-CHAR			= TEGNKODE				##	Returnerer tegnet som svarer til kodenummeret
-CLEAN			= RENSK					##	Fjerner alle tegn som ikke kan skrives ut, fra teksten
-CODE			= KODE					##	Returnerer en numerisk kode for det første tegnet i en tekststreng
-CONCATENATE		= KJEDE.SAMMEN				##	Slår sammen flere tekstelementer til ett tekstelement
-DOLLAR			= VALUTA				##	Konverterer et tall til tekst, og bruker valutaformatet $ (dollar)
-EXACT			= EKSAKT				##	Kontrollerer om to tekstverdier er like
-FIND			= FINN					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FINDB			= FINNB					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FIXED			= FASTSATT				##	Formaterer et tall som tekst med et bestemt antall desimaler
-JIS			= JIS					##	Endrer halvbreddes (enkeltbyte) engelske bokstaver eller katakana i en tegnstreng, til fullbreddes (dobbeltbyte) tegn
-LEFT			= VENSTRE				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEFTB			= VENSTREB				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEN			= LENGDE				##	Returnerer antall tegn i en tekststreng
-LENB			= LENGDEB				##	Returnerer antall tegn i en tekststreng
-LOWER			= SMÅ					##	Konverterer tekst til små bokstaver
-MID			= DELTEKST				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-MIDB			= DELTEKSTB				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-PHONETIC		= FURIGANA				##	Trekker ut fonetiske tegn (furigana) fra en tekststreng
-PROPER			= STOR.FORBOKSTAV			##	Gir den første bokstaven i hvert ord i en tekstverdi stor forbokstav
-REPLACE			= ERSTATT				##	Erstatter tegn i en tekst
-REPLACEB		= ERSTATTB				##	Erstatter tegn i en tekst
-REPT			= GJENTA				##	Gjentar tekst et gitt antall ganger
-RIGHT			= HØYRE					##	Returnerer tegnene lengst til høyre i en tekstverdi
-RIGHTB			= HØYREB				##	Returnerer tegnene lengst til høyre i en tekstverdi
-SEARCH			= SØK					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SEARCHB			= SØKB					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SUBSTITUTE		= BYTT.UT				##	Bytter ut gammel tekst med ny tekst i en tekststreng
-T			= T					##	Konverterer argumentene til tekst
-TEXT			= TEKST					##	Formaterer et tall og konverterer det til tekst
-TRIM			= TRIMME				##	Fjerner mellomrom fra tekst
-UPPER			= STORE					##	Konverterer tekst til store bokstaver
-VALUE			= VERDI					##	Konverterer et tekstargument til et tall
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config
index 00f8b9a34..1d8468ba3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Jezyk polski (Polish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= zł
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #ZERO!
-DIV0	= #DZIEL/0!
-VALUE	= #ARG!
-REF	= #ADR!
-NAME	= #NAZWA?
-NUM	= #LICZBA!
-NA	= #N/D!
+NULL = #ZERO!
+DIV0 = #DZIEL/0!
+VALUE = #ARG!
+REF = #ADR!
+NAME = #NAZWA?
+NUM = #LICZBA!
+NA = #N/D!
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions
index 907a4ff0f..d1b43b2ec 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions
@@ -1,416 +1,536 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Jezyk polski (Polish)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Funkcje dodatków i automatyzacji
+## Funkcje baz danych (Cube Functions)
 ##
-GETPIVOTDATA		= WEŹDANETABELI			##	Zwraca dane przechowywane w raporcie tabeli przestawnej.
-
+CUBEKPIMEMBER = ELEMENT.KPI.MODUŁU
+CUBEMEMBER = ELEMENT.MODUŁU
+CUBEMEMBERPROPERTY = WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU
+CUBERANKEDMEMBER = USZEREGOWANY.ELEMENT.MODUŁU
+CUBESET = ZESTAW.MODUŁÓW
+CUBESETCOUNT = LICZNIK.MODUŁÓW.ZESTAWU
+CUBEVALUE = WARTOŚĆ.MODUŁU
 
 ##
-##	Cube functions					Funkcje modułów
+## Funkcje baz danych (Database Functions)
 ##
-CUBEKPIMEMBER		= ELEMENT.KPI.MODUŁU		##	Zwraca nazwę, właściwość i miarę kluczowego wskaźnika wydajności (KPI) oraz wyświetla nazwę i właściwość w komórce. Wskaźnik KPI jest miarą ilościową, taką jak miesięczny zysk brutto lub kwartalna fluktuacja pracowników, używaną do monitorowania wydajności organizacji.
-CUBEMEMBER		= ELEMENT.MODUŁU		##	Zwraca element lub krotkę z hierarchii modułu. Służy do sprawdzania, czy element lub krotka istnieje w module.
-CUBEMEMBERPROPERTY	= WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU	##	Zwraca wartość właściwości elementu w module. Służy do sprawdzania, czy nazwa elementu istnieje w module, i zwracania określonej właściwości dla tego elementu.
-CUBERANKEDMEMBER	= USZEREGOWANY.ELEMENT.MODUŁU	##	Zwraca n-ty (albo uszeregowany) element zestawu. Służy do zwracania elementu lub elementów zestawu, na przykład najlepszego sprzedawcy lub 10 najlepszych studentów.
-CUBESET			= ZESTAW.MODUŁÓW		##	Definiuje obliczony zestaw elementów lub krotek, wysyłając wyrażenie zestawu do serwera modułu, który tworzy zestaw i zwraca go do programu Microsoft Office Excel.
-CUBESETCOUNT		= LICZNIK.MODUŁÓW.ZESTAWU	##	Zwraca liczbę elementów zestawu.
-CUBEVALUE		= WARTOŚĆ.MODUŁU		##	Zwraca zagregowaną wartość z modułu.
-
+DAVERAGE = BD.ŚREDNIA
+DCOUNT = BD.ILE.REKORDÓW
+DCOUNTA = BD.ILE.REKORDÓW.A
+DGET = BD.POLE
+DMAX = BD.MAX
+DMIN = BD.MIN
+DPRODUCT = BD.ILOCZYN
+DSTDEV = BD.ODCH.STANDARD
+DSTDEVP = BD.ODCH.STANDARD.POPUL
+DSUM = BD.SUMA
+DVAR = BD.WARIANCJA
+DVARP = BD.WARIANCJA.POPUL
 
 ##
-##	Database functions				Funkcje baz danych
+## Funkcje daty i godziny (Date & Time Functions)
 ##
-DAVERAGE		= BD.ŚREDNIA			##	Zwraca wartość średniej wybranych wpisów bazy danych.
-DCOUNT			= BD.ILE.REKORDÓW		##	Zlicza komórki zawierające liczby w bazie danych.
-DCOUNTA			= BD.ILE.REKORDÓW.A		##	Zlicza niepuste komórki w bazie danych.
-DGET			= BD.POLE			##	Wyodrębnia z bazy danych jeden rekord spełniający określone kryteria.
-DMAX			= BD.MAX			##	Zwraca wartość maksymalną z wybranych wpisów bazy danych.
-DMIN			= BD.MIN			##	Zwraca wartość minimalną z wybranych wpisów bazy danych.
-DPRODUCT		= BD.ILOCZYN			##	Mnoży wartości w konkretnym, spełniającym kryteria polu rekordów bazy danych.
-DSTDEV			= BD.ODCH.STANDARD		##	Szacuje odchylenie standardowe na podstawie próbki z wybranych wpisów bazy danych.
-DSTDEVP			= BD.ODCH.STANDARD.POPUL	##	Oblicza odchylenie standardowe na podstawie całej populacji wybranych wpisów bazy danych.
-DSUM			= BD.SUMA			##	Dodaje liczby w kolumnie pól rekordów bazy danych, które spełniają kryteria.
-DVAR			= BD.WARIANCJA			##	Szacuje wariancję na podstawie próbki z wybranych wpisów bazy danych.
-DVARP			= BD.WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji wybranych wpisów bazy danych.
-
+DATE = DATA
+DATEDIF = DATA.RÓŻNICA
+DATESTRING = DATA.CIĄG.ZNAK
+DATEVALUE = DATA.WARTOŚĆ
+DAY = DZIEŃ
+DAYS = DNI
+DAYS360 = DNI.360
+EDATE = NR.SER.DATY
+EOMONTH = NR.SER.OST.DN.MIES
+HOUR = GODZINA
+ISOWEEKNUM = ISO.NUM.TYG
+MINUTE = MINUTA
+MONTH = MIESIĄC
+NETWORKDAYS = DNI.ROBOCZE
+NETWORKDAYS.INTL = DNI.ROBOCZE.NIESTAND
+NOW = TERAZ
+SECOND = SEKUNDA
+THAIDAYOFWEEK = TAJ.DZIEŃ.TYGODNIA
+THAIMONTHOFYEAR = TAJ.MIESIĄC.ROKU
+THAIYEAR = TAJ.ROK
+TIME = CZAS
+TIMEVALUE = CZAS.WARTOŚĆ
+TODAY = DZIŚ
+WEEKDAY = DZIEŃ.TYG
+WEEKNUM = NUM.TYG
+WORKDAY = DZIEŃ.ROBOCZY
+WORKDAY.INTL = DZIEŃ.ROBOCZY.NIESTAND
+YEAR = ROK
+YEARFRAC = CZĘŚĆ.ROKU
 
 ##
-##	Date and time functions				Funkcje dat, godzin i czasu
+## Funkcje inżynierskie (Engineering Functions)
 ##
-DATE			= DATA				##	Zwraca liczbę seryjną dla wybranej daty.
-DATEVALUE		= DATA.WARTOŚĆ			##	Konwertuje datę w formie tekstu na liczbę seryjną.
-DAY			= DZIEŃ				##	Konwertuje liczbę seryjną na dzień miesiąca.
-DAYS360			= DNI.360			##	Oblicza liczbę dni między dwiema datami na podstawie roku 360-dniowego.
-EDATE			= UPŁDNI			##	Zwraca liczbę seryjną daty jako wskazaną liczbę miesięcy przed określoną datą początkową lub po niej.
-EOMONTH			= EOMONTH			##	Zwraca liczbę seryjną ostatniego dnia miesiąca przed określoną liczbą miesięcy lub po niej.
-HOUR			= GODZINA			##	Konwertuje liczbę seryjną na godzinę.
-MINUTE			= MINUTA			##	Konwertuje liczbę seryjną na minutę.
-MONTH			= MIESIĄC			##	Konwertuje liczbę seryjną na miesiąc.
-NETWORKDAYS		= NETWORKDAYS			##	Zwraca liczbę pełnych dni roboczych między dwiema datami.
-NOW			= TERAZ				##	Zwraca liczbę seryjną bieżącej daty i godziny.
-SECOND			= SEKUNDA			##	Konwertuje liczbę seryjną na sekundę.
-TIME			= CZAS				##	Zwraca liczbę seryjną określonego czasu.
-TIMEVALUE		= CZAS.WARTOŚĆ			##	Konwertuje czas w formie tekstu na liczbę seryjną.
-TODAY			= DZIŚ				##	Zwraca liczbę seryjną dla daty bieżącej.
-WEEKDAY			= DZIEŃ.TYG			##	Konwertuje liczbę seryjną na dzień tygodnia.
-WEEKNUM			= WEEKNUM			##	Konwertuje liczbę seryjną na liczbę reprezentującą numer tygodnia w roku.
-WORKDAY			= WORKDAY			##	Zwraca liczbę seryjną dla daty przed określoną liczbą dni roboczych lub po niej.
-YEAR			= ROK				##	Konwertuje liczbę seryjną na rok.
-YEARFRAC		= YEARFRAC			##	Zwraca część roku reprezentowaną przez pełną liczbę dni między datą początkową a datą końcową.
-
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = DWÓJK.NA.DZIES
+BIN2HEX = DWÓJK.NA.SZESN
+BIN2OCT = DWÓJK.NA.ÓSM
+BITAND = BITAND
+BITLSHIFT = BIT.PRZESUNIĘCIE.W.LEWO
+BITOR = BITOR
+BITRSHIFT = BIT.PRZESUNIĘCIE.W.PRAWO
+BITXOR = BITXOR
+COMPLEX = LICZBA.ZESP
+CONVERT = KONWERTUJ
+DEC2BIN = DZIES.NA.DWÓJK
+DEC2HEX = DZIES.NA.SZESN
+DEC2OCT = DZIES.NA.ÓSM
+DELTA = CZY.RÓWNE
+ERF = FUNKCJA.BŁ
+ERF.PRECISE = FUNKCJA.BŁ.DOKŁ
+ERFC = KOMP.FUNKCJA.BŁ
+ERFC.PRECISE = KOMP.FUNKCJA.BŁ.DOKŁ
+GESTEP = SPRAWDŹ.PRÓG
+HEX2BIN = SZESN.NA.DWÓJK
+HEX2DEC = SZESN.NA.DZIES
+HEX2OCT = SZESN.NA.ÓSM
+IMABS = MODUŁ.LICZBY.ZESP
+IMAGINARY = CZ.UROJ.LICZBY.ZESP
+IMARGUMENT = ARG.LICZBY.ZESP
+IMCONJUGATE = SPRZĘŻ.LICZBY.ZESP
+IMCOS = COS.LICZBY.ZESP
+IMCOSH = COSH.LICZBY.ZESP
+IMCOT = COT.LICZBY.ZESP
+IMCSC = CSC.LICZBY.ZESP
+IMCSCH = CSCH.LICZBY.ZESP
+IMDIV = ILORAZ.LICZB.ZESP
+IMEXP = EXP.LICZBY.ZESP
+IMLN = LN.LICZBY.ZESP
+IMLOG10 = LOG10.LICZBY.ZESP
+IMLOG2 = LOG2.LICZBY.ZESP
+IMPOWER = POTĘGA.LICZBY.ZESP
+IMPRODUCT = ILOCZYN.LICZB.ZESP
+IMREAL = CZ.RZECZ.LICZBY.ZESP
+IMSEC = SEC.LICZBY.ZESP
+IMSECH = SECH.LICZBY.ZESP
+IMSIN = SIN.LICZBY.ZESP
+IMSINH = SINH.LICZBY.ZESP
+IMSQRT = PIERWIASTEK.LICZBY.ZESP
+IMSUB = RÓŻN.LICZB.ZESP
+IMSUM = SUMA.LICZB.ZESP
+IMTAN = TAN.LICZBY.ZESP
+OCT2BIN = ÓSM.NA.DWÓJK
+OCT2DEC = ÓSM.NA.DZIES
+OCT2HEX = ÓSM.NA.SZESN
 
 ##
-##	Engineering functions				Funkcje inżynierskie
+## Funkcje finansowe (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Zwraca wartość zmodyfikowanej funkcji Bessela In(x).
-BESSELJ			= BESSELJ			##	Zwraca wartość funkcji Bessela Jn(x).
-BESSELK			= BESSELK			##	Zwraca wartość zmodyfikowanej funkcji Bessela Kn(x).
-BESSELY			= BESSELY			##	Zwraca wartość funkcji Bessela Yn(x).
-BIN2DEC			= BIN2DEC			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci dziesiętnej.
-BIN2HEX			= BIN2HEX			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci szesnastkowej.
-BIN2OCT			= BIN2OCT			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci ósemkowej.
-COMPLEX			= COMPLEX			##	Konwertuje część rzeczywistą i urojoną na liczbę zespoloną.
-CONVERT			= CONVERT			##	Konwertuje liczbę z jednego systemu miar na inny.
-DEC2BIN			= DEC2BIN			##	Konwertuje liczbę w postaci dziesiętnej na postać dwójkową.
-DEC2HEX			= DEC2HEX			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci szesnastkowej.
-DEC2OCT			= DEC2OCT			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci ósemkowej.
-DELTA			= DELTA				##	Sprawdza, czy dwie wartości są równe.
-ERF			= ERF				##	Zwraca wartość funkcji błędu.
-ERFC			= ERFC				##	Zwraca wartość komplementarnej funkcji błędu.
-GESTEP			= GESTEP			##	Sprawdza, czy liczba jest większa niż wartość progowa.
-HEX2BIN			= HEX2BIN			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dwójkowej.
-HEX2DEC			= HEX2DEC			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dziesiętnej.
-HEX2OCT			= HEX2OCT			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci ósemkowej.
-IMABS			= IMABS				##	Zwraca wartość bezwzględną (moduł) liczby zespolonej.
-IMAGINARY		= IMAGINARY			##	Zwraca wartość części urojonej liczby zespolonej.
-IMARGUMENT		= IMARGUMENT			##	Zwraca wartość argumentu liczby zespolonej, przy czym kąt wyrażony jest w radianach.
-IMCONJUGATE		= IMCONJUGATE			##	Zwraca wartość liczby sprzężonej danej liczby zespolonej.
-IMCOS			= IMCOS				##	Zwraca wartość cosinusa liczby zespolonej.
-IMDIV			= IMDIV				##	Zwraca wartość ilorazu dwóch liczb zespolonych.
-IMEXP			= IMEXP				##	Zwraca postać wykładniczą liczby zespolonej.
-IMLN			= IMLN				##	Zwraca wartość logarytmu naturalnego liczby zespolonej.
-IMLOG10			= IMLOG10			##	Zwraca wartość logarytmu dziesiętnego liczby zespolonej.
-IMLOG2			= IMLOG2			##	Zwraca wartość logarytmu liczby zespolonej przy podstawie 2.
-IMPOWER			= IMPOWER			##	Zwraca wartość liczby zespolonej podniesionej do potęgi całkowitej.
-IMPRODUCT		= IMPRODUCT			##	Zwraca wartość iloczynu liczb zespolonych.
-IMREAL			= IMREAL			##	Zwraca wartość części rzeczywistej liczby zespolonej.
-IMSIN			= IMSIN				##	Zwraca wartość sinusa liczby zespolonej.
-IMSQRT			= IMSQRT			##	Zwraca wartość pierwiastka kwadratowego z liczby zespolonej.
-IMSUB			= IMSUB				##	Zwraca wartość różnicy dwóch liczb zespolonych.
-IMSUM			= IMSUM				##	Zwraca wartość sumy liczb zespolonych.
-OCT2BIN			= OCT2BIN			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dwójkowej.
-OCT2DEC			= OCT2DEC			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dziesiętnej.
-OCT2HEX			= OCT2HEX			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci szesnastkowej.
-
+ACCRINT = NAL.ODS
+ACCRINTM = NAL.ODS.WYKUP
+AMORDEGRC = AMORT.NIELIN
+AMORLINC = AMORT.LIN
+COUPDAYBS = WYPŁ.DNI.OD.POCZ
+COUPDAYS = WYPŁ.DNI
+COUPDAYSNC = WYPŁ.DNI.NAST
+COUPNCD = WYPŁ.DATA.NAST
+COUPNUM = WYPŁ.LICZBA
+COUPPCD = WYPŁ.DATA.POPRZ
+CUMIPMT = SPŁAC.ODS
+CUMPRINC = SPŁAC.KAPIT
+DB = DB
+DDB = DDB
+DISC = STOPA.DYSK
+DOLLARDE = CENA.DZIES
+DOLLARFR = CENA.UŁAM
+DURATION = ROCZ.PRZYCH
+EFFECT = EFEKTYWNA
+FV = FV
+FVSCHEDULE = WART.PRZYSZŁ.KAP
+INTRATE = STOPA.PROC
+IPMT = IPMT
+IRR = IRR
+ISPMT = ISPMT
+MDURATION = ROCZ.PRZYCH.M
+MIRR = MIRR
+NOMINAL = NOMINALNA
+NPER = NPER
+NPV = NPV
+ODDFPRICE = CENA.PIERW.OKR
+ODDFYIELD = RENT.PIERW.OKR
+ODDLPRICE = CENA.OST.OKR
+ODDLYIELD = RENT.OST.OKR
+PDURATION = O.CZAS.TRWANIA
+PMT = PMT
+PPMT = PPMT
+PRICE = CENA
+PRICEDISC = CENA.DYSK
+PRICEMAT = CENA.WYKUP
+PV = PV
+RATE = RATE
+RECEIVED = KWOTA.WYKUP
+RRI = RÓWNOW.STOPA.PROC
+SLN = SLN
+SYD = SYD
+TBILLEQ = RENT.EKW.BS
+TBILLPRICE = CENA.BS
+TBILLYIELD = RENT.BS
+VDB = VDB
+XIRR = XIRR
+XNPV = XNPV
+YIELD = RENTOWNOŚĆ
+YIELDDISC = RENT.DYSK
+YIELDMAT = RENT.WYKUP
 
 ##
-##	Financial functions				Funkcje finansowe
+## Funkcje informacyjne (Information Functions)
 ##
-ACCRINT			= ACCRINT			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem okresowym.
-ACCRINTM		= ACCRINTM			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem w terminie wykupu.
-AMORDEGRC		= AMORDEGRC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego z wykorzystaniem współczynnika amortyzacji.
-AMORLINC		= AMORLINC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego.
-COUPDAYBS		= COUPDAYBS			##	Zwraca liczbę dni od początku okresu dywidendy do dnia rozliczeniowego.
-COUPDAYS		= COUPDAYS			##	Zwraca liczbę dni w okresie dywidendy, z uwzględnieniem dnia rozliczeniowego.
-COUPDAYSNC		= COUPDAYSNC			##	Zwraca liczbę dni od dnia rozliczeniowego do daty następnego dnia dywidendy.
-COUPNCD			= COUPNCD			##	Zwraca dzień następnej dywidendy po dniu rozliczeniowym.
-COUPNUM			= COUPNUM			##	Zwraca liczbę dywidend płatnych między dniem rozliczeniowym a dniem wykupu.
-COUPPCD			= COUPPCD			##	Zwraca dzień poprzedniej dywidendy przed dniem rozliczeniowym.
-CUMIPMT			= CUMIPMT			##	Zwraca wartość procentu składanego płatnego między dwoma okresami.
-CUMPRINC		= CUMPRINC			##	Zwraca wartość kapitału skumulowanego spłaty pożyczki między dwoma okresami.
-DB			= DB				##	Zwraca amortyzację środka trwałego w danym okresie metodą degresywną z zastosowaniem stałej bazowej.
-DDB			= DDB				##	Zwraca amortyzację środka trwałego za podany okres metodą degresywną z zastosowaniem podwójnej bazowej lub metodą określoną przez użytkownika.
-DISC			= DISC				##	Zwraca wartość stopy dyskontowej papieru wartościowego.
-DOLLARDE		= DOLLARDE			##	Konwertuje cenę w postaci ułamkowej na cenę wyrażoną w postaci dziesiętnej.
-DOLLARFR		= DOLLARFR			##	Konwertuje cenę wyrażoną w postaci dziesiętnej na cenę wyrażoną w postaci ułamkowej.
-DURATION		= DURATION			##	Zwraca wartość rocznego przychodu z papieru wartościowego o okresowych wypłatach oprocentowania.
-EFFECT			= EFFECT			##	Zwraca wartość efektywnej rocznej stopy procentowej.
-FV			= FV				##	Zwraca przyszłą wartość lokaty.
-FVSCHEDULE		= FVSCHEDULE			##	Zwraca przyszłą wartość kapitału początkowego wraz z szeregiem procentów składanych.
-INTRATE			= INTRATE			##	Zwraca wartość stopy procentowej papieru wartościowego całkowicie ulokowanego.
-IPMT			= IPMT				##	Zwraca wysokość spłaty oprocentowania lokaty za dany okres.
-IRR			= IRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii przepływów gotówkowych.
-ISPMT			= ISPMT				##	Oblicza wysokość spłaty oprocentowania za dany okres lokaty.
-MDURATION		= MDURATION			##	Zwraca wartość zmodyfikowanego okresu Macauleya dla papieru wartościowego o założonej wartości nominalnej 100 zł.
-MIRR			= MIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla przypadku, gdy dodatnie i ujemne przepływy gotówkowe mają różne stopy.
-NOMINAL			= NOMINAL			##	Zwraca wysokość nominalnej rocznej stopy procentowej.
-NPER			= NPER				##	Zwraca liczbę okresów dla lokaty.
-NPV			= NPV				##	Zwraca wartość bieżącą netto lokaty na podstawie szeregu okresowych przepływów gotówkowych i stopy dyskontowej.
-ODDFPRICE		= ODDFPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym pierwszym okresem.
-ODDFYIELD		= ODDFYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym pierwszym okresem.
-ODDLPRICE		= ODDLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym ostatnim okresem.
-ODDLYIELD		= ODDLYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym ostatnim okresem.
-PMT			= PMT				##	Zwraca wartość okresowej płatności raty rocznej.
-PPMT			= PPMT				##	Zwraca wysokość spłaty kapitału w przypadku lokaty dla danego okresu.
-PRICE			= PRICE				##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem okresowym.
-PRICEDISC		= PRICEDISC			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego zdyskontowanego.
-PRICEMAT		= PRICEMAT			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem w terminie wykupu.
-PV			= PV				##	Zwraca wartość bieżącą lokaty.
-RATE			= RATE				##	Zwraca wysokość stopy procentowej w okresie raty rocznej.
-RECEIVED		= RECEIVED			##	Zwraca wartość kapitału otrzymanego przy wykupie papieru wartościowego całkowicie ulokowanego.
-SLN			= SLN				##	Zwraca amortyzację środka trwałego za jeden okres metodą liniową.
-SYD			= SYD				##	Zwraca amortyzację środka trwałego za dany okres metodą sumy cyfr lat amortyzacji.
-TBILLEQ			= TBILLEQ			##	Zwraca rentowność ekwiwalentu obligacji dla bonu skarbowego.
-TBILLPRICE		= TBILLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej bonu skarbowego.
-TBILLYIELD		= TBILLYIELD			##	Zwraca rentowność bonu skarbowego.
-VDB			= VDB				##	Oblicza amortyzację środka trwałego w danym okresie lub jego części metodą degresywną.
-XIRR			= XIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-XNPV			= XNPV				##	Zwraca wartość bieżącą netto dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-YIELD			= YIELD				##	Zwraca rentowność papieru wartościowego z oprocentowaniem okresowym.
-YIELDDISC		= YIELDDISC			##	Zwraca roczną rentowność zdyskontowanego papieru wartościowego, na przykład bonu skarbowego.
-YIELDMAT		= YIELDMAT			##	Zwraca roczną rentowność papieru wartościowego oprocentowanego przy wykupie.
-
+CELL = KOMÓRKA
+ERROR.TYPE = NR.BŁĘDU
+INFO = INFO
+ISBLANK = CZY.PUSTA
+ISERR = CZY.BŁ
+ISERROR = CZY.BŁĄD
+ISEVEN = CZY.PARZYSTE
+ISFORMULA = CZY.FORMUŁA
+ISLOGICAL = CZY.LOGICZNA
+ISNA = CZY.BRAK
+ISNONTEXT = CZY.NIE.TEKST
+ISNUMBER = CZY.LICZBA
+ISODD = CZY.NIEPARZYSTE
+ISREF = CZY.ADR
+ISTEXT = CZY.TEKST
+N = N
+NA = BRAK
+SHEET = ARKUSZ
+SHEETS = ARKUSZE
+TYPE = TYP
 
 ##
-##	Information functions				Funkcje informacyjne
+## Funkcje logiczne (Logical Functions)
 ##
-CELL			= KOMÓRKA			##	Zwraca informacje o formacie, położeniu lub zawartości komórki.
-ERROR.TYPE		= NR.BŁĘDU			##	Zwraca liczbę odpowiadającą typowi błędu.
-INFO			= INFO				##	Zwraca informację o aktualnym środowisku pracy.
-ISBLANK			= CZY.PUSTA			##	Zwraca wartość PRAWDA, jeśli wartość jest pusta.
-ISERR			= CZY.BŁ			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu, z wyjątkiem #N/D!.
-ISERROR			= CZY.BŁĄD			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu.
-ISEVEN			= ISEVEN			##	Zwraca wartość PRAWDA, jeśli liczba jest parzysta.
-ISLOGICAL		= CZY.LOGICZNA			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością logiczną.
-ISNA			= CZY.BRAK			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością błędu #N/D!.
-ISNONTEXT		= CZY.NIE.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość nie jest tekstem.
-ISNUMBER		= CZY.LICZBA			##	Zwraca wartość PRAWDA, jeśli wartość jest liczbą.
-ISODD			= ISODD				##	Zwraca wartość PRAWDA, jeśli liczba jest nieparzysta.
-ISREF			= CZY.ADR			##	Zwraca wartość PRAWDA, jeśli wartość jest odwołaniem.
-ISTEXT			= CZY.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość jest tekstem.
-N			= L				##	Zwraca wartość przekonwertowaną na postać liczbową.
-NA			= BRAK				##	Zwraca wartość błędu #N/D!.
-TYPE			= TYP				##	Zwraca liczbę wskazującą typ danych wartości.
-
+AND = ORAZ
+FALSE = FAŁSZ
+IF = JEŻELI
+IFERROR = JEŻELI.BŁĄD
+IFNA = JEŻELI.ND
+IFS = WARUNKI
+NOT = NIE
+OR = LUB
+SWITCH = PRZEŁĄCZ
+TRUE = PRAWDA
+XOR = XOR
 
 ##
-##	Logical functions				Funkcje logiczne
+## Funkcje wyszukiwania i odwołań (Lookup & Reference Functions)
 ##
-AND			= ORAZ				##	Zwraca wartość PRAWDA, jeśli wszystkie argumenty mają wartość PRAWDA.
-FALSE			= FAŁSZ				##	Zwraca wartość logiczną FAŁSZ.
-IF			= JEŻELI			##	Określa warunek logiczny do sprawdzenia.
-IFERROR			= JEŻELI.BŁĄD			##	Zwraca określoną wartość, jeśli wynikiem obliczenia formuły jest błąd; w przeciwnym przypadku zwraca wynik formuły.
-NOT			= NIE				##	Odwraca wartość logiczną argumentu.
-OR			= LUB				##	Zwraca wartość PRAWDA, jeśli co najmniej jeden z argumentów ma wartość PRAWDA.
-TRUE			= PRAWDA			##	Zwraca wartość logiczną PRAWDA.
-
+ADDRESS = ADRES
+AREAS = OBSZARY
+CHOOSE = WYBIERZ
+COLUMN = NR.KOLUMNY
+COLUMNS = LICZBA.KOLUMN
+FORMULATEXT = FORMUŁA.TEKST
+GETPIVOTDATA = WEŹDANETABELI
+HLOOKUP = WYSZUKAJ.POZIOMO
+HYPERLINK = HIPERŁĄCZE
+INDEX = INDEKS
+INDIRECT = ADR.POŚR
+LOOKUP = WYSZUKAJ
+MATCH = PODAJ.POZYCJĘ
+OFFSET = PRZESUNIĘCIE
+ROW = WIERSZ
+ROWS = ILE.WIERSZY
+RTD = DANE.CZASU.RZECZ
+TRANSPOSE = TRANSPONUJ
+VLOOKUP = WYSZUKAJ.PIONOWO
 
 ##
-##	Lookup and reference functions			Funkcje wyszukiwania i odwołań
+## Funkcje matematyczne i trygonometryczne (Math & Trig Functions)
 ##
-ADDRESS			= ADRES				##	Zwraca odwołanie do jednej komórki w arkuszu jako wartość tekstową.
-AREAS			= OBSZARY			##	Zwraca liczbę obszarów występujących w odwołaniu.
-CHOOSE			= WYBIERZ			##	Wybiera wartość z listy wartości.
-COLUMN			= NR.KOLUMNY			##	Zwraca numer kolumny z odwołania.
-COLUMNS			= LICZBA.KOLUMN			##	Zwraca liczbę kolumn dla danego odwołania.
-HLOOKUP			= WYSZUKAJ.POZIOMO		##	Przegląda górny wiersz tablicy i zwraca wartość wskazanej komórki.
-HYPERLINK		= HIPERŁĄCZE			##	Tworzy skrót lub skok, który pozwala otwierać dokument przechowywany na serwerze sieciowym, w sieci intranet lub w Internecie.
-INDEX			= INDEKS			##	Używa indeksu do wybierania wartości z odwołania lub tablicy.
-INDIRECT		= ADR.POŚR			##	Zwraca odwołanie określone przez wartość tekstową.
-LOOKUP			= WYSZUKAJ			##	Wyszukuje wartości w wektorze lub tablicy.
-MATCH			= PODAJ.POZYCJĘ			##	Wyszukuje wartości w odwołaniu lub w tablicy.
-OFFSET			= PRZESUNIĘCIE			##	Zwraca adres przesunięty od danego odwołania.
-ROW			= WIERSZ			##	Zwraca numer wiersza odwołania.
-ROWS			= ILE.WIERSZY			##	Zwraca liczbę wierszy dla danego odwołania.
-RTD			= RTD				##	Pobiera dane w czasie rzeczywistym z programu obsługującego automatyzację COM (Automatyzacja: Sposób pracy z obiektami aplikacji pochodzącymi z innej aplikacji lub narzędzia projektowania. Nazywana wcześniej Automatyzacją OLE, Automatyzacja jest standardem przemysłowym i funkcją obiektowego modelu składników (COM, Component Object Model).).
-TRANSPOSE		= TRANSPONUJ			##	Zwraca transponowaną tablicę.
-VLOOKUP			= WYSZUKAJ.PIONOWO		##	Przeszukuje pierwszą kolumnę tablicy i przechodzi wzdłuż wiersza, aby zwrócić wartość komórki.
-
+ABS = MODUŁ.LICZBY
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGUJ
+ARABIC = ARABSKIE
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = PODSTAWA
+CEILING.MATH = ZAOKR.W.GÓRĘ.MATEMATYCZNE
+CEILING.PRECISE = ZAOKR.W.GÓRĘ.DOKŁ
+COMBIN = KOMBINACJE
+COMBINA = KOMBINACJE.A
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DZIESIĘTNA
+DEGREES = STOPNIE
+ECMA.CEILING = ECMA.ZAOKR.W.GÓRĘ
+EVEN = ZAOKR.DO.PARZ
+EXP = EXP
+FACT = SILNIA
+FACTDOUBLE = SILNIA.DWUKR
+FLOOR.MATH = ZAOKR.W.DÓŁ.MATEMATYCZNE
+FLOOR.PRECISE = ZAOKR.W.DÓŁ.DOKŁ
+GCD = NAJW.WSP.DZIEL
+INT = ZAOKR.DO.CAŁK
+ISO.CEILING = ISO.ZAOKR.W.GÓRĘ
+LCM = NAJMN.WSP.WIEL
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = WYZNACZNIK.MACIERZY
+MINVERSE = MACIERZ.ODW
+MMULT = MACIERZ.ILOCZYN
+MOD = MOD
+MROUND = ZAOKR.DO.WIELOKR
+MULTINOMIAL = WIELOMIAN
+MUNIT = MACIERZ.JEDNOSTKOWA
+ODD = ZAOKR.DO.NPARZ
+PI = PI
+POWER = POTĘGA
+PRODUCT = ILOCZYN
+QUOTIENT = CZ.CAŁK.DZIELENIA
+RADIANS = RADIANY
+RAND = LOS
+RANDBETWEEN = LOS.ZAKR
+ROMAN = RZYMSKIE
+ROUND = ZAOKR
+ROUNDBAHTDOWN = ZAOKR.DÓŁ.BAT
+ROUNDBAHTUP = ZAOKR.GÓRA.BAT
+ROUNDDOWN = ZAOKR.DÓŁ
+ROUNDUP = ZAOKR.GÓRA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMA.SZER.POT
+SIGN = ZNAK.LICZBY
+SIN = SIN
+SINH = SINH
+SQRT = PIERWIASTEK
+SQRTPI = PIERW.PI
+SUBTOTAL = SUMY.CZĘŚCIOWE
+SUM = SUMA
+SUMIF = SUMA.JEŻELI
+SUMIFS = SUMA.WARUNKÓW
+SUMPRODUCT = SUMA.ILOCZYNÓW
+SUMSQ = SUMA.KWADRATÓW
+SUMX2MY2 = SUMA.X2.M.Y2
+SUMX2PY2 = SUMA.X2.P.Y2
+SUMXMY2 = SUMA.XMY.2
+TAN = TAN
+TANH = TANH
+TRUNC = LICZBA.CAŁK
 
 ##
-##	Math and trigonometry functions			Funkcje matematyczne i trygonometryczne
+## Funkcje statystyczne (Statistical Functions)
 ##
-ABS			= MODUŁ.LICZBY			##	Zwraca wartość absolutną liczby.
-ACOS			= ACOS				##	Zwraca arcus cosinus liczby.
-ACOSH			= ACOSH				##	Zwraca arcus cosinus hiperboliczny liczby.
-ASIN			= ASIN				##	Zwraca arcus sinus liczby.
-ASINH			= ASINH				##	Zwraca arcus sinus hiperboliczny liczby.
-ATAN			= ATAN				##	Zwraca arcus tangens liczby.
-ATAN2			= ATAN2				##	Zwraca arcus tangens liczby na podstawie współrzędnych x i y.
-ATANH			= ATANH				##	Zwraca arcus tangens hiperboliczny liczby.
-CEILING			= ZAOKR.W.GÓRĘ			##	Zaokrągla liczbę do najbliższej liczby całkowitej lub do najbliższej wielokrotności dokładności.
-COMBIN			= KOMBINACJE			##	Zwraca liczbę kombinacji dla danej liczby obiektów.
-COS			= COS				##	Zwraca cosinus liczby.
-COSH			= COSH				##	Zwraca cosinus hiperboliczny liczby.
-DEGREES			= STOPNIE			##	Konwertuje radiany na stopnie.
-EVEN			= ZAOKR.DO.PARZ			##	Zaokrągla liczbę w górę do najbliższej liczby parzystej.
-EXP			= EXP				##	Zwraca wartość liczby e podniesionej do potęgi określonej przez podaną liczbę.
-FACT			= SILNIA			##	Zwraca silnię liczby.
-FACTDOUBLE		= FACTDOUBLE			##	Zwraca podwójną silnię liczby.
-FLOOR			= ZAOKR.W.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-GCD			= GCD				##	Zwraca największy wspólny dzielnik.
-INT			= ZAOKR.DO.CAŁK			##	Zaokrągla liczbę w dół do najbliższej liczby całkowitej.
-LCM			= LCM				##	Zwraca najmniejszą wspólną wielokrotność.
-LN			= LN				##	Zwraca logarytm naturalny podanej liczby.
-LOG			= LOG				##	Zwraca logarytm danej liczby przy zadanej podstawie.
-LOG10			= LOG10				##	Zwraca logarytm dziesiętny liczby.
-MDETERM			= WYZNACZNIK.MACIERZY		##	Zwraca wyznacznik macierzy tablicy.
-MINVERSE		= MACIERZ.ODW			##	Zwraca odwrotność macierzy tablicy.
-MMULT			= MACIERZ.ILOCZYN		##	Zwraca iloczyn macierzy dwóch tablic.
-MOD			= MOD				##	Zwraca resztę z dzielenia.
-MROUND			= MROUND			##	Zwraca liczbę zaokrągloną do żądanej wielokrotności.
-MULTINOMIAL		= MULTINOMIAL			##	Zwraca wielomian dla zbioru liczb.
-ODD			= ZAOKR.DO.NPARZ		##	Zaokrągla liczbę w górę do najbliższej liczby nieparzystej.
-PI			= PI				##	Zwraca wartość liczby Pi.
-POWER			= POTĘGA			##	Zwraca liczbę podniesioną do potęgi.
-PRODUCT			= ILOCZYN			##	Mnoży argumenty.
-QUOTIENT		= QUOTIENT			##	Zwraca iloraz (całkowity).
-RADIANS			= RADIANY			##	Konwertuje stopnie na radiany.
-RAND			= LOS				##	Zwraca liczbę pseudolosową z zakresu od 0 do 1.
-RANDBETWEEN		= RANDBETWEEN			##	Zwraca liczbę pseudolosową z zakresu określonego przez podane argumenty.
-ROMAN			= RZYMSKIE			##	Konwertuje liczbę arabską na rzymską jako tekst.
-ROUND			= ZAOKR				##	Zaokrągla liczbę do określonej liczby cyfr.
-ROUNDDOWN		= ZAOKR.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-ROUNDUP			= ZAOKR.GÓRA			##	Zaokrągla liczbę w górę, w kierunku od zera.
-SERIESSUM		= SERIESSUM			##	Zwraca sumę szeregu potęgowego na podstawie wzoru.
-SIGN			= ZNAK.LICZBY			##	Zwraca znak liczby.
-SIN			= SIN				##	Zwraca sinus danego kąta.
-SINH			= SINH				##	Zwraca sinus hiperboliczny liczby.
-SQRT			= PIERWIASTEK			##	Zwraca dodatni pierwiastek kwadratowy.
-SQRTPI			= SQRTPI			##	Zwraca pierwiastek kwadratowy iloczynu (liczba * Pi).
-SUBTOTAL		= SUMY.POŚREDNIE		##	Zwraca sumę częściową listy lub bazy danych.
-SUM			= SUMA				##	Dodaje argumenty.
-SUMIF			= SUMA.JEŻELI			##	Dodaje komórki określone przez podane kryterium.
-SUMIFS			= SUMA.WARUNKÓW			##	Dodaje komórki w zakresie, które spełniają wiele kryteriów.
-SUMPRODUCT		= SUMA.ILOCZYNÓW		##	Zwraca sumę iloczynów odpowiednich elementów tablicy.
-SUMSQ			= SUMA.KWADRATÓW		##	Zwraca sumę kwadratów argumentów.
-SUMX2MY2		= SUMA.X2.M.Y2			##	Zwraca sumę różnic kwadratów odpowiednich wartości w dwóch tablicach.
-SUMX2PY2		= SUMA.X2.P.Y2			##	Zwraca sumę sum kwadratów odpowiednich wartości w dwóch tablicach.
-SUMXMY2			= SUMA.XMY.2			##	Zwraca sumę kwadratów różnic odpowiednich wartości w dwóch tablicach.
-TAN			= TAN				##	Zwraca tangens liczby.
-TANH			= TANH				##	Zwraca tangens hiperboliczny liczby.
-TRUNC			= LICZBA.CAŁK			##	Przycina liczbę do wartości całkowitej.
-
+AVEDEV = ODCH.ŚREDNIE
+AVERAGE = ŚREDNIA
+AVERAGEA = ŚREDNIA.A
+AVERAGEIF = ŚREDNIA.JEŻELI
+AVERAGEIFS = ŚREDNIA.WARUNKÓW
+BETA.DIST = ROZKŁ.BETA
+BETA.INV = ROZKŁ.BETA.ODWR
+BINOM.DIST = ROZKŁ.DWUM
+BINOM.DIST.RANGE = ROZKŁ.DWUM.ZAKRES
+BINOM.INV = ROZKŁ.DWUM.ODWR
+CHISQ.DIST = ROZKŁ.CHI
+CHISQ.DIST.RT = ROZKŁ.CHI.PS
+CHISQ.INV = ROZKŁ.CHI.ODWR
+CHISQ.INV.RT = ROZKŁ.CHI.ODWR.PS
+CHISQ.TEST = CHI.TEST
+CONFIDENCE.NORM = UFNOŚĆ.NORM
+CONFIDENCE.T = UFNOŚĆ.T
+CORREL = WSP.KORELACJI
+COUNT = ILE.LICZB
+COUNTA = ILE.NIEPUSTYCH
+COUNTBLANK = LICZ.PUSTE
+COUNTIF = LICZ.JEŻELI
+COUNTIFS = LICZ.WARUNKI
+COVARIANCE.P = KOWARIANCJA.POPUL
+COVARIANCE.S = KOWARIANCJA.PRÓBKI
+DEVSQ = ODCH.KWADRATOWE
+EXPON.DIST = ROZKŁ.EXP
+F.DIST = ROZKŁ.F
+F.DIST.RT = ROZKŁ.F.PS
+F.INV = ROZKŁ.F.ODWR
+F.INV.RT = ROZKŁ.F.ODWR.PS
+F.TEST = F.TEST
+FISHER = ROZKŁAD.FISHER
+FISHERINV = ROZKŁAD.FISHER.ODW
+FORECAST.ETS = REGLINX.ETS
+FORECAST.ETS.CONFINT = REGLINX.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = REGLINX.ETS.SEZONOWOŚĆ
+FORECAST.ETS.STAT = REGLINX.ETS.STATYSTYKA
+FORECAST.LINEAR = REGLINX.LINIOWA
+FREQUENCY = CZĘSTOŚĆ
+GAMMA = GAMMA
+GAMMA.DIST = ROZKŁ.GAMMA
+GAMMA.INV = ROZKŁ.GAMMA.ODWR
+GAMMALN = ROZKŁAD.LIN.GAMMA
+GAMMALN.PRECISE = ROZKŁAD.LIN.GAMMA.DOKŁ
+GAUSS = GAUSS
+GEOMEAN = ŚREDNIA.GEOMETRYCZNA
+GROWTH = REGEXPW
+HARMEAN = ŚREDNIA.HARMONICZNA
+HYPGEOM.DIST = ROZKŁ.HIPERGEOM
+INTERCEPT = ODCIĘTA
+KURT = KURTOZA
+LARGE = MAX.K
+LINEST = REGLINP
+LOGEST = REGEXPP
+LOGNORM.DIST = ROZKŁ.LOG
+LOGNORM.INV = ROZKŁ.LOG.ODWR
+MAX = MAX
+MAXA = MAX.A
+MAXIFS = MAKS.WARUNKÓW
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MIN.A
+MINIFS = MIN.WARUNKÓW
+MODE.MULT = WYST.NAJCZĘŚCIEJ.TABL
+MODE.SNGL = WYST.NAJCZĘŚCIEJ.WART
+NEGBINOM.DIST = ROZKŁ.DWUM.PRZEC
+NORM.DIST = ROZKŁ.NORMALNY
+NORM.INV = ROZKŁ.NORMALNY.ODWR
+NORM.S.DIST = ROZKŁ.NORMALNY.S
+NORM.S.INV = ROZKŁ.NORMALNY.S.ODWR
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTYL.PRZEDZ.OTW
+PERCENTILE.INC = PERCENTYL.PRZEDZ.ZAMK
+PERCENTRANK.EXC = PROC.POZ.PRZEDZ.OTW
+PERCENTRANK.INC = PROC.POZ.PRZEDZ.ZAMK
+PERMUT = PERMUTACJE
+PERMUTATIONA = PERMUTACJE.A
+PHI = PHI
+POISSON.DIST = ROZKŁ.POISSON
+PROB = PRAWDPD
+QUARTILE.EXC = KWARTYL.PRZEDZ.OTW
+QUARTILE.INC = KWARTYL.PRZEDZ.ZAMK
+RANK.AVG = POZYCJA.ŚR
+RANK.EQ = POZYCJA.NAJW
+RSQ = R.KWADRAT
+SKEW = SKOŚNOŚĆ
+SKEW.P = SKOŚNOŚĆ.P
+SLOPE = NACHYLENIE
+SMALL = MIN.K
+STANDARDIZE = NORMALIZUJ
+STDEV.P = ODCH.STAND.POPUL
+STDEV.S = ODCH.STANDARD.PRÓBKI
+STDEVA = ODCH.STANDARDOWE.A
+STDEVPA = ODCH.STANDARD.POPUL.A
+STEYX = REGBŁSTD
+T.DIST = ROZKŁ.T
+T.DIST.2T = ROZKŁ.T.DS
+T.DIST.RT = ROZKŁ.T.PS
+T.INV = ROZKŁ.T.ODWR
+T.INV.2T = ROZKŁ.T.ODWR.DS
+T.TEST = T.TEST
+TREND = REGLINW
+TRIMMEAN = ŚREDNIA.WEWN
+VAR.P = WARIANCJA.POP
+VAR.S = WARIANCJA.PRÓBKI
+VARA = WARIANCJA.A
+VARPA = WARIANCJA.POPUL.A
+WEIBULL.DIST = ROZKŁ.WEIBULL
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions				Funkcje statystyczne
+## Funkcje tekstowe (Text Functions)
 ##
-AVEDEV			= ODCH.ŚREDNIE			##	Zwraca średnią wartość odchyleń absolutnych punktów danych od ich wartości średniej.
-AVERAGE			= ŚREDNIA			##	Zwraca wartość średnią argumentów.
-AVERAGEA		= ŚREDNIA.A			##	Zwraca wartość średnią argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-AVERAGEIF		= ŚREDNIA.JEŻELI		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek w zakresie, które spełniają podane kryteria.
-AVERAGEIFS		= ŚREDNIA.WARUNKÓW		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek, które spełniają jedno lub więcej kryteriów.
-BETADIST		= ROZKŁAD.BETA			##	Zwraca skumulowaną funkcję gęstości prawdopodobieństwa beta.
-BETAINV			= ROZKŁAD.BETA.ODW		##	Zwraca odwrotność skumulowanej funkcji gęstości prawdopodobieństwa beta.
-BINOMDIST		= ROZKŁAD.DWUM			##	Zwraca pojedynczy składnik dwumianowego rozkładu prawdopodobieństwa.
-CHIDIST			= ROZKŁAD.CHI			##	Zwraca wartość jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHIINV			= ROZKŁAD.CHI.ODW		##	Zwraca odwrotność wartości jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHITEST			= TEST.CHI			##	Zwraca test niezależności.
-CONFIDENCE		= UFNOŚĆ			##	Zwraca interwał ufności dla średniej populacji.
-CORREL			= WSP.KORELACJI			##	Zwraca współczynnik korelacji dwóch zbiorów danych.
-COUNT			= ILE.LICZB			##	Zlicza liczby znajdujące się na liście argumentów.
-COUNTA			= ILE.NIEPUSTYCH		##	Zlicza wartości znajdujące się na liście argumentów.
-COUNTBLANK		= LICZ.PUSTE			##	Zwraca liczbę pustych komórek w pewnym zakresie.
-COUNTIF			= LICZ.JEŻELI			##	Zlicza komórki wewnątrz zakresu, które spełniają podane kryteria.
-COUNTIFS		= LICZ.WARUNKI			##	Zlicza komórki wewnątrz zakresu, które spełniają wiele kryteriów.
-COVAR			= KOWARIANCJA			##	Zwraca kowariancję, czyli średnią wartość iloczynów odpowiednich odchyleń.
-CRITBINOM		= PRÓG.ROZKŁAD.DWUM		##	Zwraca najmniejszą wartość, dla której skumulowany rozkład dwumianowy jest mniejszy niż wartość kryterium lub równy jej.
-DEVSQ			= ODCH.KWADRATOWE		##	Zwraca sumę kwadratów odchyleń.
-EXPONDIST		= ROZKŁAD.EXP			##	Zwraca rozkład wykładniczy.
-FDIST			= ROZKŁAD.F			##	Zwraca rozkład prawdopodobieństwa F.
-FINV			= ROZKŁAD.F.ODW			##	Zwraca odwrotność rozkładu prawdopodobieństwa F.
-FISHER			= ROZKŁAD.FISHER		##	Zwraca transformację Fishera.
-FISHERINV		= ROZKŁAD.FISHER.ODW		##	Zwraca odwrotność transformacji Fishera.
-FORECAST		= REGLINX			##	Zwraca wartość trendu liniowego.
-FREQUENCY		= CZĘSTOŚĆ			##	Zwraca rozkład częstotliwości jako tablicę pionową.
-FTEST			= TEST.F			##	Zwraca wynik testu F.
-GAMMADIST		= ROZKŁAD.GAMMA			##	Zwraca rozkład gamma.
-GAMMAINV		= ROZKŁAD.GAMMA.ODW		##	Zwraca odwrotność skumulowanego rozkładu gamma.
-GAMMALN			= ROZKŁAD.LIN.GAMMA		##	Zwraca logarytm naturalny funkcji gamma, Γ(x).
-GEOMEAN			= ŚREDNIA.GEOMETRYCZNA		##	Zwraca średnią geometryczną.
-GROWTH			= REGEXPW			##	Zwraca wartości trendu wykładniczego.
-HARMEAN			= ŚREDNIA.HARMONICZNA		##	Zwraca średnią harmoniczną.
-HYPGEOMDIST		= ROZKŁAD.HIPERGEOM		##	Zwraca rozkład hipergeometryczny.
-INTERCEPT		= ODCIĘTA			##	Zwraca punkt przecięcia osi pionowej z linią regresji liniowej.
-KURT			= KURTOZA			##	Zwraca kurtozę zbioru danych.
-LARGE			= MAX.K				##	Zwraca k-tą największą wartość ze zbioru danych.
-LINEST			= REGLINP			##	Zwraca parametry trendu liniowego.
-LOGEST			= REGEXPP			##	Zwraca parametry trendu wykładniczego.
-LOGINV			= ROZKŁAD.LOG.ODW		##	Zwraca odwrotność rozkładu logarytmu naturalnego.
-LOGNORMDIST		= ROZKŁAD.LOG			##	Zwraca skumulowany rozkład logarytmu naturalnego.
-MAX			= MAX				##	Zwraca maksymalną wartość listy argumentów.
-MAXA			= MAX.A				##	Zwraca maksymalną wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MEDIAN			= MEDIANA			##	Zwraca medianę podanych liczb.
-MIN			= MIN				##	Zwraca minimalną wartość listy argumentów.
-MINA			= MIN.A				##	Zwraca najmniejszą wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MODE			= WYST.NAJCZĘŚCIEJ		##	Zwraca wartość najczęściej występującą w zbiorze danych.
-NEGBINOMDIST		= ROZKŁAD.DWUM.PRZEC		##	Zwraca ujemny rozkład dwumianowy.
-NORMDIST		= ROZKŁAD.NORMALNY		##	Zwraca rozkład normalny skumulowany.
-NORMINV			= ROZKŁAD.NORMALNY.ODW		##	Zwraca odwrotność rozkładu normalnego skumulowanego.
-NORMSDIST		= ROZKŁAD.NORMALNY.S		##	Zwraca standardowy rozkład normalny skumulowany.
-NORMSINV		= ROZKŁAD.NORMALNY.S.ODW	##	Zwraca odwrotność standardowego rozkładu normalnego skumulowanego.
-PEARSON			= PEARSON			##	Zwraca współczynnik korelacji momentu iloczynu Pearsona.
-PERCENTILE		= PERCENTYL			##	Wyznacza k-ty percentyl wartości w zakresie.
-PERCENTRANK		= PROCENT.POZYCJA		##	Zwraca procentową pozycję wartości w zbiorze danych.
-PERMUT			= PERMUTACJE			##	Zwraca liczbę permutacji dla danej liczby obiektów.
-POISSON			= ROZKŁAD.POISSON		##	Zwraca rozkład Poissona.
-PROB			= PRAWDPD			##	Zwraca prawdopodobieństwo, że wartości w zakresie leżą pomiędzy dwiema granicami.
-QUARTILE		= KWARTYL			##	Wyznacza kwartyl zbioru danych.
-RANK			= POZYCJA			##	Zwraca pozycję liczby na liście liczb.
-RSQ			= R.KWADRAT			##	Zwraca kwadrat współczynnika korelacji momentu iloczynu Pearsona.
-SKEW			= SKOŚNOŚĆ			##	Zwraca skośność rozkładu.
-SLOPE			= NACHYLENIE			##	Zwraca nachylenie linii regresji liniowej.
-SMALL			= MIN.K				##	Zwraca k-tą najmniejszą wartość ze zbioru danych.
-STANDARDIZE		= NORMALIZUJ			##	Zwraca wartość znormalizowaną.
-STDEV			= ODCH.STANDARDOWE		##	Szacuje odchylenie standardowe na podstawie próbki.
-STDEVA			= ODCH.STANDARDOWE.A		##	Szacuje odchylenie standardowe na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-STDEVP			= ODCH.STANDARD.POPUL		##	Oblicza odchylenie standardowe na podstawie całej populacji.
-STDEVPA			= ODCH.STANDARD.POPUL.A		##	Oblicza odchylenie standardowe na podstawie całej populacji, z uwzględnieniem liczb, teksów i wartości logicznych.
-STEYX			= REGBŁSTD			##	Zwraca błąd standardowy przewidzianej wartości y dla każdej wartości x w regresji.
-TDIST			= ROZKŁAD.T			##	Zwraca rozkład t-Studenta.
-TINV			= ROZKŁAD.T.ODW			##	Zwraca odwrotność rozkładu t-Studenta.
-TREND			= REGLINW			##	Zwraca wartości trendu liniowego.
-TRIMMEAN		= ŚREDNIA.WEWN			##	Zwraca średnią wartość dla wnętrza zbioru danych.
-TTEST			= TEST.T			##	Zwraca prawdopodobieństwo związane z testem t-Studenta.
-VAR			= WARIANCJA			##	Szacuje wariancję na podstawie próbki.
-VARA			= WARIANCJA.A			##	Szacuje wariancję na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-VARP			= WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji.
-VARPA			= WARIANCJA.POPUL.A		##	Oblicza wariancję na podstawie całej populacji, z uwzględnieniem liczb, tekstów i wartości logicznych.
-WEIBULL			= ROZKŁAD.WEIBULL		##	Zwraca rozkład Weibulla.
-ZTEST			= TEST.Z			##	Zwraca wartość jednostronnego prawdopodobieństwa testu z.
-
+BAHTTEXT = BAT.TEKST
+CHAR = ZNAK
+CLEAN = OCZYŚĆ
+CODE = KOD
+CONCAT = ZŁĄCZ.TEKST
+DOLLAR = KWOTA
+EXACT = PORÓWNAJ
+FIND = ZNAJDŹ
+FIXED = ZAOKR.DO.TEKST
+ISTHAIDIGIT = CZY.CYFRA.TAJ
+LEFT = LEWY
+LEN = DŁ
+LOWER = LITERY.MAŁE
+MID = FRAGMENT.TEKSTU
+NUMBERSTRING = LICZBA.CIĄG.ZNAK
+NUMBERVALUE = WARTOŚĆ.LICZBOWA
+PROPER = Z.WIELKIEJ.LITERY
+REPLACE = ZASTĄP
+REPT = POWT
+RIGHT = PRAWY
+SEARCH = SZUKAJ.TEKST
+SUBSTITUTE = PODSTAW
+T = T
+TEXT = TEKST
+TEXTJOIN = POŁĄCZ.TEKSTY
+THAIDIGIT = TAJ.CYFRA
+THAINUMSOUND = TAJ.DŹWIĘK.NUM
+THAINUMSTRING = TAJ.CIĄG.NUM
+THAISTRINGLENGTH = TAJ.DŁUGOŚĆ.CIĄGU
+TRIM = USUŃ.ZBĘDNE.ODSTĘPY
+UNICHAR = ZNAK.UNICODE
+UNICODE = UNICODE
+UPPER = LITERY.WIELKIE
+VALUE = WARTOŚĆ
 
 ##
-##	Text functions					Funkcje tekstowe
+## Funkcje sieci Web (Web Functions)
 ##
-ASC			= ASC				##	Zamienia litery angielskie lub katakana o pełnej szerokości (dwubajtowe) w ciągu znaków na znaki o szerokości połówkowej (jednobajtowe).
-BAHTTEXT		= BAHTTEXT			##	Konwertuje liczbę na tekst, stosując format walutowy ß (baht).
-CHAR			= ZNAK				##	Zwraca znak o podanym numerze kodu.
-CLEAN			= OCZYŚĆ			##	Usuwa z tekstu wszystkie znaki, które nie mogą być drukowane.
-CODE			= KOD				##	Zwraca kod numeryczny pierwszego znaku w ciągu tekstowym.
-CONCATENATE		= ZŁĄCZ.TEKSTY			##	Łączy kilka oddzielnych tekstów w jeden tekst.
-DOLLAR			= KWOTA				##	Konwertuje liczbę na tekst, stosując format walutowy $ (dolar).
-EXACT			= PORÓWNAJ			##	Sprawdza identyczność dwóch wartości tekstowych.
-FIND			= ZNAJDŹ			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FINDB			= ZNAJDŹB			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FIXED			= ZAOKR.DO.TEKST		##	Formatuje liczbę jako tekst przy stałej liczbie miejsc dziesiętnych.
-JIS			= JIS				##	Zmienia litery angielskie lub katakana o szerokości połówkowej (jednobajtowe) w ciągu znaków na znaki o pełnej szerokości (dwubajtowe).
-LEFT			= LEWY				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEFTB			= LEWYB				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEN			= DŁ				##	Zwraca liczbę znaków ciągu tekstowego.
-LENB			= DŁ.B				##	Zwraca liczbę znaków ciągu tekstowego.
-LOWER			= LITERY.MAŁE			##	Konwertuje wielkie litery tekstu na małe litery.
-MID			= FRAGMENT.TEKSTU		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-MIDB			= FRAGMENT.TEKSTU.B		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-PHONETIC		= PHONETIC			##	Wybiera znaki fonetyczne (furigana) z ciągu tekstowego.
-PROPER			= Z.WIELKIEJ.LITERY		##	Zastępuje pierwszą literę każdego wyrazu tekstu wielką literą.
-REPLACE			= ZASTĄP			##	Zastępuje znaki w tekście.
-REPLACEB		= ZASTĄP.B			##	Zastępuje znaki w tekście.
-REPT			= POWT				##	Powiela tekst daną liczbę razy.
-RIGHT			= PRAWY				##	Zwraca skrajne prawe znaki z wartości tekstowej.
-RIGHTB			= PRAWYB			##	Zwraca skrajne prawe znaki z wartości tekstowej.
-SEARCH			= SZUKAJ.TEKST			##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SEARCHB			= SZUKAJ.TEKST.B		##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SUBSTITUTE		= PODSTAW			##	Podstawia nowy tekst w miejsce poprzedniego tekstu w ciągu tekstowym.
-T			= T				##	Konwertuje argumenty na tekst.
-TEXT			= TEKST				##	Formatuje liczbę i konwertuje ją na tekst.
-TRIM			= USUŃ.ZBĘDNE.ODSTĘPY		##	Usuwa spacje z tekstu.
-UPPER			= LITERY.WIELKIE		##	Konwertuje znaki tekstu na wielkie litery.
-VALUE			= WARTOŚĆ			##	Konwertuje argument tekstowy na liczbę.
+ENCODEURL = ENCODEURL
+FILTERXML = FILTERXML
+WEBSERVICE = WEBSERVICE
+
+##
+## Funkcje zgodności (Compatibility Functions)
+##
+BETADIST = ROZKŁAD.BETA
+BETAINV = ROZKŁAD.BETA.ODW
+BINOMDIST = ROZKŁAD.DWUM
+CEILING = ZAOKR.W.GÓRĘ
+CHIDIST = ROZKŁAD.CHI
+CHIINV = ROZKŁAD.CHI.ODW
+CHITEST = TEST.CHI
+CONCATENATE = ZŁĄCZ.TEKSTY
+CONFIDENCE = UFNOŚĆ
+COVAR = KOWARIANCJA
+CRITBINOM = PRÓG.ROZKŁAD.DWUM
+EXPONDIST = ROZKŁAD.EXP
+FDIST = ROZKŁAD.F
+FINV = ROZKŁAD.F.ODW
+FLOOR = ZAOKR.W.DÓŁ
+FORECAST = REGLINX
+FTEST = TEST.F
+GAMMADIST = ROZKŁAD.GAMMA
+GAMMAINV = ROZKŁAD.GAMMA.ODW
+HYPGEOMDIST = ROZKŁAD.HIPERGEOM
+LOGINV = ROZKŁAD.LOG.ODW
+LOGNORMDIST = ROZKŁAD.LOG
+MODE = WYST.NAJCZĘŚCIEJ
+NEGBINOMDIST = ROZKŁAD.DWUM.PRZEC
+NORMDIST = ROZKŁAD.NORMALNY
+NORMINV = ROZKŁAD.NORMALNY.ODW
+NORMSDIST = ROZKŁAD.NORMALNY.S
+NORMSINV = ROZKŁAD.NORMALNY.S.ODW
+PERCENTILE = PERCENTYL
+PERCENTRANK = PROCENT.POZYCJA
+POISSON = ROZKŁAD.POISSON
+QUARTILE = KWARTYL
+RANK = POZYCJA
+STDEV = ODCH.STANDARDOWE
+STDEVP = ODCH.STANDARD.POPUL
+TDIST = ROZKŁAD.T
+TINV = ROZKŁAD.T.ODW
+TTEST = TEST.T
+VAR = WARIANCJA
+VARP = WARIANCJA.POPUL
+WEIBULL = ROZKŁAD.WEIBULL
+ZTEST = TEST.Z
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config
index 904f99f1a..c39057c73 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Português Brasileiro (Brazilian Portuguese)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= R$
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
+NULL = #NULO!
+DIV0
+VALUE = #VALOR!
+REF
+NAME = #NOME?
+NUM = #NÚM!
+NA = #N/D
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
index a062a7fad..5781b0c70 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
@@ -1,408 +1,528 @@
+############################################################
 ##
-##	Add-in and Automation functions			Funções Suplemento e Automação
+## PhpSpreadsheet - function name translations
 ##
-GETPIVOTDATA		= INFODADOSTABELADINÂMICA	##	Retorna os dados armazenados em um relatório de tabela dinâmica
+## Português Brasileiro (Brazilian Portuguese)
+##
+############################################################
 
 
 ##
-##	Cube functions					Funções de Cubo
+## Funções de cubo (Cube Functions)
 ##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Retorna o nome de um KPI (indicador de desempenho-chave), uma propriedade e uma medida e exibe o nome e a propriedade na célula. Um KPI é uma medida quantificável, como o lucro bruto mensal ou a rotatividade trimestral dos funcionários, usada para monitorar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Retorna um membro ou tupla em uma hierarquia de cubo. Use para validar se o membro ou tupla existe no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Retorna o valor da propriedade de um membro no cubo. Usada para validar a existência do nome do membro no cubo e para retornar a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Retorna o enésimo membro, ou o membro ordenado, em um conjunto. Use para retornar um ou mais elementos em um conjunto, assim como o melhor vendedor ou os dez melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou tuplas enviando uma expressão do conjunto para o cubo no servidor, que cria o conjunto e o retorna para o Microsoft Office Excel.
-CUBESETCOUNT		= CONTAGEMCONJUNTOCUBO		##	Retorna o número de itens em um conjunto.
-CUBEVALUE		= VALORCUBO			##	Retorna um valor agregado de um cubo.
-
+CUBEKPIMEMBER = MEMBROKPICUBO
+CUBEMEMBER = MEMBROCUBO
+CUBEMEMBERPROPERTY = PROPRIEDADEMEMBROCUBO
+CUBERANKEDMEMBER = MEMBROCLASSIFICADOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = CONTAGEMCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
 
 ##
-##	Database functions				Funções de banco de dados
+## Funções de banco de dados (Database Functions)
 ##
-DAVERAGE		= BDMÉDIA			##	Retorna a média das entradas selecionadas de um banco de dados
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números em um banco de dados
-DCOUNTA			= BDCONTARA			##	Conta células não vazias em um banco de dados
-DGET			= BDEXTRAIR			##	Extrai de um banco de dados um único registro que corresponde a um critério específico
-DMAX			= BDMÁX				##	Retorna o valor máximo de entradas selecionadas de um banco de dados
-DMIN			= BDMÍN				##	Retorna o valor mínimo de entradas selecionadas de um banco de dados
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores em um campo específico de registros que correspondem ao critério em um banco de dados
-DSTDEV			= BDEST				##	Estima o desvio padrão com base em uma amostra de entradas selecionadas de um banco de dados
-DSTDEVP			= BDDESVPA			##	Calcula o desvio padrão com base na população inteira de entradas selecionadas de um banco de dados
-DSUM			= BDSOMA			##	Adiciona os números à coluna de campos de registros do banco de dados que correspondem ao critério
-DVAR			= BDVAREST			##	Estima a variância com base em uma amostra de entradas selecionadas de um banco de dados
-DVARP			= BDVARP			##	Calcula a variância com base na população inteira de entradas selecionadas de um banco de dados
-
+DAVERAGE = BDMÉDIA
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTARA
+DGET = BDEXTRAIR
+DMAX = BDMÁX
+DMIN = BDMÍN
+DPRODUCT = BDMULTIPL
+DSTDEV = BDEST
+DSTDEVP = BDDESVPA
+DSUM = BDSOMA
+DVAR = BDVAREST
+DVARP = BDVARP
 
 ##
-##	Date and time functions				Funções de data e hora
+## Funções de data e hora (Date & Time Functions)
 ##
-DATE			= DATA				##	Retorna o número de série de uma data específica
-DATEVALUE		= DATA.VALOR			##	Converte uma data na forma de texto para um número de série
-DAY			= DIA				##	Converte um número de série em um dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base em um ano de 360 dias
-EDATE			= DATAM				##	Retorna o número de série da data que é o número indicado de meses antes ou depois da data inicial
-EOMONTH			= FIMMÊS			##	Retorna o número de série do último dia do mês antes ou depois de um número especificado de meses
-HOUR			= HORA				##	Converte um número de série em uma hora
-MINUTE			= MINUTO			##	Converte um número de série em um minuto
-MONTH			= MÊS				##	Converte um número de série em um mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Retorna o número de dias úteis inteiros entre duas datas
-NOW			= AGORA				##	Retorna o número de série seqüencial da data e hora atuais
-SECOND			= SEGUNDO			##	Converte um número de série em um segundo
-TIME			= HORA				##	Retorna o número de série de uma hora específica
-TIMEVALUE		= VALOR.TEMPO			##	Converte um horário na forma de texto para um número de série
-TODAY			= HOJE				##	Retorna o número de série da data de hoje
-WEEKDAY			= DIA.DA.SEMANA			##	Converte um número de série em um dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série em um número que representa onde a semana cai numericamente em um ano
-WORKDAY			= DIATRABALHO			##	Retorna o número de série da data antes ou depois de um número específico de dias úteis
-YEAR			= ANO				##	Converte um número de série em um ano
-YEARFRAC		= FRAÇÃOANO			##	Retorna a fração do ano que representa o número de dias entre data_inicial e data_final
-
+DATE = DATA
+DATEDIF = DATADIF
+DATESTRING = DATA.SÉRIE
+DATEVALUE = DATA.VALOR
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = DATAM
+EOMONTH = FIMMÊS
+HOUR = HORA
+ISOWEEKNUM = NÚMSEMANAISO
+MINUTE = MINUTO
+MONTH = MÊS
+NETWORKDAYS = DIATRABALHOTOTAL
+NETWORKDAYS.INTL = DIATRABALHOTOTAL.INTL
+NOW = AGORA
+SECOND = SEGUNDO
+TIME = TEMPO
+TIMEVALUE = VALOR.TEMPO
+TODAY = HOJE
+WEEKDAY = DIA.DA.SEMANA
+WEEKNUM = NÚMSEMANA
+WORKDAY = DIATRABALHO
+WORKDAY.INTL = DIATRABALHO.INTL
+YEAR = ANO
+YEARFRAC = FRAÇÃOANO
 
 ##
-##	Engineering functions				Funções de engenharia
+## Funções de engenharia (Engineering Functions)
 ##
-BESSELI			= BESSELI			##	Retorna a função de Bessel In(x) modificada
-BESSELJ			= BESSELJ			##	Retorna a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Retorna a função de Bessel Kn(x) modificada
-BESSELY			= BESSELY			##	Retorna a função de Bessel Yn(x)
-BIN2DEC			= BIN2DEC			##	Converte um número binário em decimal
-BIN2HEX			= BIN2HEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BIN2OCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEX			##	Converte coeficientes reais e imaginários e um número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida para outro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNERRO			##	Retorna a função de erro
-ERFC			= FUNERROCOMPL			##	Retorna a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Retorna o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Retorna o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Retorna o argumento teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Retorna o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Retorna o cosseno de um número complexo
-IMDIV			= IMDIV				##	Retorna o quociente de dois números complexos
-IMEXP			= IMEXP				##	Retorna o exponencial de um número complexo
-IMLN			= IMLN				##	Retorna o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Retorna o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Retorna o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Retorna um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Retorna o produto de números complexos
-IMREAL			= IMREAL			##	Retorna o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Retorna o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Retorna a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Retorna a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Retorna a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINADEC
+BIN2HEX = BINAHEX
+BIN2OCT = BINAOCT
+BITAND = BITAND
+BITLSHIFT = DESLOCESQBIT
+BITOR = BITOR
+BITRSHIFT = DESLOCDIRBIT
+BITXOR = BITXOR
+COMPLEX = COMPLEXO
+CONVERT = CONVERTER
+DEC2BIN = DECABIN
+DEC2HEX = DECAHEX
+DEC2OCT = DECAOCT
+DELTA = DELTA
+ERF = FUNERRO
+ERF.PRECISE = FUNERRO.PRECISO
+ERFC = FUNERROCOMPL
+ERFC.PRECISE = FUNERROCOMPL.PRECISO
+GESTEP = DEGRAU
+HEX2BIN = HEXABIN
+HEX2DEC = HEXADEC
+HEX2OCT = HEXAOCT
+IMABS = IMABS
+IMAGINARY = IMAGINÁRIO
+IMARGUMENT = IMARG
+IMCONJUGATE = IMCONJ
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCOSEC
+IMCSCH = IMCOSECH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOT
+IMPRODUCT = IMPROD
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSENO
+IMSINH = IMSENH
+IMSQRT = IMRAIZ
+IMSUB = IMSUBTR
+IMSUM = IMSOMA
+IMTAN = IMTAN
+OCT2BIN = OCTABIN
+OCT2DEC = OCTADEC
+OCT2HEX = OCTAHEX
 
 ##
-##	Financial functions				Funções financeiras
+## Funções financeiras (Financial Functions)
 ##
-ACCRINT			= JUROSACUM			##	Retorna a taxa de juros acumulados de um título que paga uma taxa periódica de juros
-ACCRINTM		= JUROSACUMV			##	Retorna os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Retorna a depreciação para cada período contábil usando o coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Retorna a depreciação para cada período contábil
-COUPDAYBS		= CUPDIASINLIQ			##	Retorna o número de dias do início do período de cupom até a data de liquidação
-COUPDAYS		= CUPDIAS			##	Retorna o número de dias no período de cupom que contém a data de quitação
-COUPDAYSNC		= CUPDIASPRÓX			##	Retorna o número de dias da data de liquidação até a data do próximo cupom
-COUPNCD			= CUPDATAPRÓX			##	Retorna a próxima data de cupom após a data de quitação
-COUPNUM			= CUPNÚM			##	Retorna o número de cupons pagáveis entre as datas de quitação e vencimento
-COUPPCD			= CUPDATAANT			##	Retorna a data de cupom anterior à data de quitação
-CUMIPMT			= PGTOJURACUM			##	Retorna os juros acumulados pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Retorna o capital acumulado pago sobre um empréstimo entre dois períodos
-DB			= BD				##	Retorna a depreciação de um ativo para um período especificado, usando o método de balanço de declínio fixo
-DDB			= BDD				##	Retorna a depreciação de um ativo com relação a um período especificado usando o método de saldos decrescentes duplos ou qualquer outro método especificado por você
-DISC			= DESC				##	Retorna a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em formato de moeda, na forma fracionária, em um preço na forma decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço, apresentado na forma decimal, em um preço apresentado na forma fracionária
-DURATION		= DURAÇÃO			##	Retorna a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFETIVA			##	Retorna a taxa de juros anual efetiva
-FV			= VF				##	Retorna o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Retorna o valor futuro de um capital inicial após a aplicação de uma série de taxas de juros compostas
-INTRATE			= TAXAJUROS			##	Retorna a taxa de juros de um título totalmente investido
-IPMT			= IPGTO				##	Retorna o pagamento de juros para um investimento em um determinado período
-IRR			= TIR				##	Retorna a taxa interna de retorno de uma série de fluxos de caixa
-ISPMT			= ÉPGTO				##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Retorna a duração de Macauley modificada para um título com um valor de paridade equivalente a R$ 100
-MIRR			= MTIR				##	Calcula a taxa interna de retorno em que fluxos de caixa positivos e negativos são financiados com diferentes taxas
-NOMINAL			= NOMINAL			##	Retorna a taxa de juros nominal anual
-NPER			= NPER				##	Retorna o número de períodos de um investimento
-NPV			= VPL				##	Retorna o valor líquido atual de um investimento com base em uma série de fluxos de caixa periódicos e em uma taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um primeiro período indefinido
-ODDFYIELD		= LUCROPRIMINC			##	Retorna o rendimento de um título com um primeiro período indefinido
-ODDLPRICE		= PREÇOÚLTINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um último período de cupom indefinido
-ODDLYIELD		= LUCROÚLTINC			##	Retorna o rendimento de um título com um último período indefinido
-PMT			= PGTO				##	Retorna o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Retorna o pagamento de capital para determinado período de investimento
-PRICE			= PREÇO				##	Retorna a preço por R$ 100,00 de valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Retorna o preço por R$ 100,00 de valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Retorna o preço por R$ 100,00 de valor nominal de um título que paga juros no vencimento
-PV			= VP				##	Retorna o valor presente de um investimento
-RATE			= TAXA				##	Retorna a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Retorna a quantia recebida no vencimento de um título totalmente investido
-SLN			= DPD				##	Retorna a depreciação em linha reta de um ativo durante um período
-SYD			= SDA				##	Retorna a depreciação dos dígitos da soma dos anos de um ativo para um período especificado
-TBILLEQ			= OTN				##	Retorna o rendimento de um título equivalente a uma obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Retorna o preço por R$ 100,00 de valor nominal de uma obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Retorna o rendimento de uma obrigação do Tesouro
-VDB			= BDV				##	Retorna a depreciação de um ativo para um período especificado ou parcial usando um método de balanço declinante
-XIRR			= XTIR				##	Fornece a taxa interna de retorno para um programa de fluxos de caixa que não é necessariamente periódico
-XNPV			= XVPL				##	Retorna o valor presente líquido de um programa de fluxos de caixa que não é necessariamente periódico
-YIELD			= LUCRO				##	Retorna o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Retorna o rendimento anual de um título descontado. Por exemplo, uma obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Retorna o lucro anual de um título que paga juros no vencimento
-
+ACCRINT = JUROSACUM
+ACCRINTM = JUROSACUMV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = CUPDIASINLIQ
+COUPDAYS = CUPDIAS
+COUPDAYSNC = CUPDIASPRÓX
+COUPNCD = CUPDATAPRÓX
+COUPNUM = CUPNÚM
+COUPPCD = CUPDATAANT
+CUMIPMT = PGTOJURACUM
+CUMPRINC = PGTOCAPACUM
+DB = BD
+DDB = BDD
+DISC = DESC
+DOLLARDE = MOEDADEC
+DOLLARFR = MOEDAFRA
+DURATION = DURAÇÃO
+EFFECT = EFETIVA
+FV = VF
+FVSCHEDULE = VFPLANO
+INTRATE = TAXAJUROS
+IPMT = IPGTO
+IRR = TIR
+ISPMT = ÉPGTO
+MDURATION = MDURAÇÃO
+MIRR = MTIR
+NOMINAL = NOMINAL
+NPER = NPER
+NPV = VPL
+ODDFPRICE = PREÇOPRIMINC
+ODDFYIELD = LUCROPRIMINC
+ODDLPRICE = PREÇOÚLTINC
+ODDLYIELD = LUCROÚLTINC
+PDURATION = DURAÇÃOP
+PMT = PGTO
+PPMT = PPGTO
+PRICE = PREÇO
+PRICEDISC = PREÇODESC
+PRICEMAT = PREÇOVENC
+PV = VP
+RATE = TAXA
+RECEIVED = RECEBER
+RRI = TAXAJURO
+SLN = DPD
+SYD = SDA
+TBILLEQ = OTN
+TBILLPRICE = OTNVALOR
+TBILLYIELD = OTNLUCRO
+VDB = BDV
+XIRR = XTIR
+XNPV = XVPL
+YIELD = LUCRO
+YIELDDISC = LUCRODESC
+YIELDMAT = LUCROVENC
 
 ##
-##	Information functions				Funções de informação
+## Funções de informação (Information Functions)
 ##
-CELL			= CÉL				##	Retorna informações sobre formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Retorna um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Retorna informações sobre o ambiente operacional atual
-ISBLANK			= ÉCÉL.VAZIA			##	Retorna VERDADEIRO se o valor for vazio
-ISERR			= ÉERRO				##	Retorna VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= ÉERROS			##	Retorna VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Retorna VERDADEIRO se o número for par
-ISLOGICAL		= ÉLÓGICO			##	Retorna VERDADEIRO se o valor for um valor lógico
-ISNA			= É.NÃO.DISP			##	Retorna VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Retorna VERDADEIRO se o valor for diferente de texto
-ISNUMBER		= ÉNÚM				##	Retorna VERDADEIRO se o valor for um número
-ISODD			= ÉIMPAR			##	Retorna VERDADEIRO se o número for ímpar
-ISREF			= ÉREF				##	Retorna VERDADEIRO se o valor for uma referência
-ISTEXT			= ÉTEXTO			##	Retorna VERDADEIRO se o valor for texto
-N			= N				##	Retorna um valor convertido em um número
-NA			= NÃO.DISP			##	Retorna o valor de erro #N/D
-TYPE			= TIPO				##	Retorna um número indicando o tipo de dados de um valor
-
+CELL = CÉL
+ERROR.TYPE = TIPO.ERRO
+INFO = INFORMAÇÃO
+ISBLANK = ÉCÉL.VAZIA
+ISERR = ÉERRO
+ISERROR = ÉERROS
+ISEVEN = ÉPAR
+ISFORMULA = ÉFÓRMULA
+ISLOGICAL = ÉLÓGICO
+ISNA = É.NÃO.DISP
+ISNONTEXT = É.NÃO.TEXTO
+ISNUMBER = ÉNÚM
+ISODD = ÉIMPAR
+ISREF = ÉREF
+ISTEXT = ÉTEXTO
+N = N
+NA = NÃO.DISP
+SHEET = PLAN
+SHEETS = PLANS
+TYPE = TIPO
 
 ##
-##	Logical functions				Funções lógicas
+## Funções lógicas (Logical Functions)
 ##
-AND			= E				##	Retorna VERDADEIRO se todos os seus argumentos forem VERDADEIROS
-FALSE			= FALSO				##	Retorna o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SEERRO			##	Retornará um valor que você especifica se uma fórmula for avaliada para um erro; do contrário, retornará o resultado da fórmula
-NOT			= NÃO				##	Inverte o valor lógico do argumento
-OR			= OU				##	Retorna VERDADEIRO se um dos argumentos for VERDADEIRO
-TRUE			= VERDADEIRO			##	Retorna o valor lógico VERDADEIRO
-
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SEERRO
+IFNA = SENÃODISP
+IFS = SES
+NOT = NÃO
+OR = OU
+SWITCH = PARÂMETRO
+TRUE = VERDADEIRO
+XOR = XOR
 
 ##
-##	Lookup and reference functions			Funções de pesquisa e referência
+## Funções de pesquisa e referência (Lookup & Reference Functions)
 ##
-ADDRESS			= ENDEREÇO			##	Retorna uma referência como texto para uma única célula em uma planilha
-AREAS			= ÁREAS				##	Retorna o número de áreas em uma referência
-CHOOSE			= ESCOLHER			##	Escolhe um valor a partir de uma lista de valores
-COLUMN			= COL				##	Retorna o número da coluna de uma referência
-COLUMNS			= COLS				##	Retorna o número de colunas em uma referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e retorna o valor da célula especificada
-HYPERLINK		= HYPERLINK			##	Cria um atalho ou salto que abre um documento armazenado em um servidor de rede, uma intranet ou na Internet
-INDEX			= ÍNDICE			##	Usa um índice para escolher um valor de uma referência ou matriz
-INDIRECT		= INDIRETO			##	Retorna uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores em um vetor ou em uma matriz
-MATCH			= CORRESP			##	Procura valores em uma referência ou em uma matriz
-OFFSET			= DESLOC			##	Retorna um deslocamento de referência com base em uma determinada referência
-ROW			= LIN				##	Retorna o número da linha de uma referência
-ROWS			= LINS				##	Retorna o número de linhas em uma referência
-RTD			= RTD				##	Recupera dados em tempo real de um programa que ofereça suporte a automação COM (automação: uma forma de trabalhar com objetos de um aplicativo a partir de outro aplicativo ou ferramenta de desenvolvimento. Chamada inicialmente de automação OLE, a automação é um padrão industrial e um recurso do modelo de objeto componente (COM).)
-TRANSPOSE		= TRANSPOR			##	Retorna a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e move ao longo da linha para retornar o valor de uma célula
-
+ADDRESS = ENDEREÇO
+AREAS = ÁREAS
+CHOOSE = ESCOLHER
+COLUMN = COL
+COLUMNS = COLS
+FORMULATEXT = FÓRMULATEXTO
+GETPIVOTDATA = INFODADOSTABELADINÂMICA
+HLOOKUP = PROCH
+HYPERLINK = HIPERLINK
+INDEX = ÍNDICE
+INDIRECT = INDIRETO
+LOOKUP = PROC
+MATCH = CORRESP
+OFFSET = DESLOC
+ROW = LIN
+ROWS = LINS
+RTD = RTD
+TRANSPOSE = TRANSPOR
+VLOOKUP = PROCV
+*RC = LC
 
 ##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
+## Funções matemáticas e trigonométricas (Math & Trig Functions)
 ##
-ABS			= ABS				##	Retorna o valor absoluto de um número
-ACOS			= ACOS				##	Retorna o arco cosseno de um número
-ACOSH			= ACOSH				##	Retorna o cosseno hiperbólico inverso de um número
-ASIN			= ASEN				##	Retorna o arco seno de um número
-ASINH			= ASENH				##	Retorna o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Retorna o arco tangente de um número
-ATAN2			= ATAN2				##	Retorna o arco tangente das coordenadas x e y especificadas
-ATANH			= ATANH				##	Retorna a tangente hiperbólica inversa de um número
-CEILING			= TETO				##	Arredonda um número para o inteiro mais próximo ou para o múltiplo mais próximo de significância
-COMBIN			= COMBIN			##	Retorna o número de combinações de um determinado número de objetos
-COS			= COS				##	Retorna o cosseno de um número
-COSH			= COSH				##	Retorna o cosseno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número para cima até o inteiro par mais próximo
-EXP			= EXP				##	Retorna e elevado à potência de um número especificado
-FACT			= FATORIAL			##	Retorna o fatorial de um número
-FACTDOUBLE		= FATDUPLO			##	Retorna o fatorial duplo de um número
-FLOOR			= ARREDMULTB			##	Arredonda um número para baixo até zero
-GCD			= MDC				##	Retorna o máximo divisor comum
-INT			= INT				##	Arredonda um número para baixo até o número inteiro mais próximo
-LCM			= MMC				##	Retorna o mínimo múltiplo comum
-LN			= LN				##	Retorna o logaritmo natural de um número
-LOG			= LOG				##	Retorna o logaritmo de um número de uma base especificada
-LOG10			= LOG10				##	Retorna o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Retorna o determinante de uma matriz de uma variável do tipo matriz
-MINVERSE		= MATRIZ.INVERSO		##	Retorna a matriz inversa de uma matriz
-MMULT			= MATRIZ.MULT			##	Retorna o produto de duas matrizes
-MOD			= RESTO				##	Retorna o resto da divisão
-MROUND			= MARRED			##	Retorna um número arredondado ao múltiplo desejado
-MULTINOMIAL		= MULTINOMIAL			##	Retorna o multinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda um número para cima até o inteiro ímpar mais próximo
-PI			= PI				##	Retorna o valor de Pi
-POWER			= POTÊNCIA			##	Fornece o resultado de um número elevado a uma potência
-PRODUCT			= MULT				##	Multiplica seus argumentos
-QUOTIENT		= QUOCIENTE			##	Retorna a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Retorna um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Retorna um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um algarismo arábico em romano, como texto
-ROUND			= ARRED				##	Arredonda um número até uma quantidade especificada de dígitos
-ROUNDDOWN		= ARREDONDAR.PARA.BAIXO		##	Arredonda um número para baixo até zero
-ROUNDUP			= ARREDONDAR.PARA.CIMA		##	Arredonda um número para cima, afastando-o de zero
-SERIESSUM		= SOMASEQÜÊNCIA			##	Retorna a soma de uma série polinomial baseada na fórmula
-SIGN			= SINAL				##	Retorna o sinal de um número
-SIN			= SEN				##	Retorna o seno de um ângulo dado
-SINH			= SENH				##	Retorna o seno hiperbólico de um número
-SQRT			= RAIZ				##	Retorna uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Retorna a raiz quadrada de (núm* pi)
-SUBTOTAL		= SUBTOTAL			##	Retorna um subtotal em uma lista ou em um banco de dados
-SUM			= SOMA				##	Soma seus argumentos
-SUMIF			= SOMASE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMASE			##	Adiciona as células em um intervalo que atende a vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Retorna a soma dos produtos de componentes correspondentes de matrizes
-SUMSQ			= SOMAQUAD			##	Retorna a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Retorna a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Retorna a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Retorna a soma dos quadrados das diferenças dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Retorna a tangente de um número
-TANH			= TANH				##	Retorna a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um inteiro
-
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = ARÁBICO
+ASIN = ASEN
+ASINH = ASENH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = TETO.MAT
+CEILING.PRECISE = TETO.PRECISO
+COMBIN = COMBIN
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = COSEC
+CSCH = COSECH
+DECIMAL = DECIMAL
+DEGREES = GRAUS
+ECMA.CEILING = ECMA.TETO
+EVEN = PAR
+EXP = EXP
+FACT = FATORIAL
+FACTDOUBLE = FATDUPLO
+FLOOR.MATH = ARREDMULTB.MAT
+FLOOR.PRECISE = ARREDMULTB.PRECISO
+GCD = MDC
+INT = INT
+ISO.CEILING = ISO.TETO
+LCM = MMC
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATRIZ.DETERM
+MINVERSE = MATRIZ.INVERSO
+MMULT = MATRIZ.MULT
+MOD = MOD
+MROUND = MARRED
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MUNIT
+ODD = ÍMPAR
+PI = PI
+POWER = POTÊNCIA
+PRODUCT = MULT
+QUOTIENT = QUOCIENTE
+RADIANS = RADIANOS
+RAND = ALEATÓRIO
+RANDBETWEEN = ALEATÓRIOENTRE
+ROMAN = ROMANO
+ROUND = ARRED
+ROUNDDOWN = ARREDONDAR.PARA.BAIXO
+ROUNDUP = ARREDONDAR.PARA.CIMA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMASEQÜÊNCIA
+SIGN = SINAL
+SIN = SEN
+SINH = SENH
+SQRT = RAIZ
+SQRTPI = RAIZPI
+SUBTOTAL = SUBTOTAL
+SUM = SOMA
+SUMIF = SOMASE
+SUMIFS = SOMASES
+SUMPRODUCT = SOMARPRODUTO
+SUMSQ = SOMAQUAD
+SUMX2MY2 = SOMAX2DY2
+SUMX2PY2 = SOMAX2SY2
+SUMXMY2 = SOMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
 
 ##
-##	Statistical functions				Funções estatísticas
+## Funções estatísticas (Statistical Functions)
 ##
-AVEDEV			= DESV.MÉDIO			##	Retorna a média aritmética dos desvios médios dos pontos de dados a partir de sua média
-AVERAGE			= MÉDIA				##	Retorna a média dos argumentos
-AVERAGEA		= MÉDIAA			##	Retorna a média dos argumentos, inclusive números, texto e valores lógicos
-AVERAGEIF		= MÉDIASE			##	Retorna a média (média aritmética) de todas as células em um intervalo que atendem a um determinado critério
-AVERAGEIFS		= MÉDIASES			##	Retorna a média (média aritmética) de todas as células que atendem a múltiplos critérios.
-BETADIST		= DISTBETA			##	Retorna a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Retorna o inverso da função de distribuição cumulativa para uma distribuição beta especificada
-BINOMDIST		= DISTRBINOM			##	Retorna a probabilidade de distribuição binomial do termo individual
-CHIDIST			= DIST.QUI			##	Retorna a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.QUI			##	Retorna o inverso da probabilidade uni-caudal da distribuição qui-quadrada
-CHITEST			= TESTE.QUI			##	Retorna o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Retorna o intervalo de confiança para uma média da população
-CORREL			= CORREL			##	Retorna o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONT.NÚM			##	Calcula quantos números há na lista de argumentos
-COUNTA			= CONT.VALORES			##	Calcula quantos valores há na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células vazias no intervalo especificado
-COUNTIF			= CONT.SE			##	Calcula o número de células não vazias em um intervalo que corresponde a determinados critérios
-COUNTIFS		= CONT.SES			##	Conta o número de células dentro de um intervalo que atende a múltiplos critérios
-COVAR			= COVAR				##	Retorna a covariância, a média dos produtos dos desvios pares
-CRITBINOM		= CRIT.BINOM			##	Retorna o menor valor para o qual a distribuição binomial cumulativa é menor ou igual ao valor padrão
-DEVSQ			= DESVQ				##	Retorna a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Retorna a distribuição exponencial
-FDIST			= DISTF				##	Retorna a distribuição de probabilidade F
-FINV			= INVF				##	Retorna o inverso da distribuição de probabilidades F
-FISHER			= FISHER			##	Retorna a transformação Fisher
-FISHERINV		= FISHERINV			##	Retorna o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Retorna um valor ao longo de uma linha reta
-FREQUENCY		= FREQÜÊNCIA			##	Retorna uma distribuição de freqüência como uma matriz vertical
-FTEST			= TESTEF			##	Retorna o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Retorna a distribuição gama
-GAMMAINV		= INVGAMA			##	Retorna o inverso da distribuição cumulativa gama
-GAMMALN			= LNGAMA			##	Retorna o logaritmo natural da função gama, G(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Retorna a média geométrica
-GROWTH			= CRESCIMENTO			##	Retorna valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÔNICA		##	Retorna a média harmônica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Retorna a distribuição hipergeométrica
-INTERCEPT		= INTERCEPÇÃO			##	Retorna a intercepção da linha de regressão linear
-KURT			= CURT				##	Retorna a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Retorna o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Retorna os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Retorna os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Retorna o inverso da distribuição lognormal
-LOGNORMDIST		= DIST.LOGNORMAL		##	Retorna a distribuição lognormal cumulativa
-MAX			= MÁXIMO			##	Retorna o valor máximo em uma lista de argumentos
-MAXA			= MÁXIMOA			##	Retorna o maior valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MEDIAN			= MED				##	Retorna a mediana dos números indicados
-MIN			= MÍNIMO			##	Retorna o valor mínimo em uma lista de argumentos
-MINA			= MÍNIMOA			##	Retorna o menor valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MODE			= MODO				##	Retorna o valor mais comum em um conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Retorna a distribuição binomial negativa
-NORMDIST		= DIST.NORM			##	Retorna a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Retorna o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Retorna a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Retorna o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Retorna o coeficiente de correlação do momento do produto Pearson
-PERCENTILE		= PERCENTIL			##	Retorna o k-ésimo percentil de valores em um intervalo
-PERCENTRANK		= ORDEM.PORCENTUAL		##	Retorna a ordem percentual de um valor em um conjunto de dados
-PERMUT			= PERMUT			##	Retorna o número de permutações de um determinado número de objetos
-POISSON			= POISSON			##	Retorna a distribuição Poisson
-PROB			= PROB				##	Retorna a probabilidade de valores em um intervalo estarem entre dois limites
-QUARTILE		= QUARTIL			##	Retorna o quartil do conjunto de dados
-RANK			= ORDEM				##	Retorna a posição de um número em uma lista de números
-RSQ			= RQUAD				##	Retorna o quadrado do coeficiente de correlação do momento do produto de Pearson
-SKEW			= DISTORÇÃO			##	Retorna a distorção de uma distribuição
-SLOPE			= INCLINAÇÃO			##	Retorna a inclinação da linha de regressão linear
-SMALL			= MENOR				##	Retorna o menor valor k-ésimo do conjunto de dados
-STANDARDIZE		= PADRONIZAR			##	Retorna um valor normalizado
-STDEV			= DESVPAD			##	Estima o desvio padrão com base em uma amostra
-STDEVA			= DESVPADA			##	Estima o desvio padrão com base em uma amostra, inclusive números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio padrão com base na população total, inclusive números, texto e valores lógicos
-STEYX			= EPADYX			##	Retorna o erro padrão do valor-y previsto para cada x da regressão
-TDIST			= DISTT				##	Retorna a distribuição t de Student
-TINV			= INVT				##	Retorna o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Retorna valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Retorna a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Retorna a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Estima a variância com base em uma amostra
-VARA			= VARA				##	Estima a variância com base em uma amostra, inclusive números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população inteira
-VARPA			= VARPA				##	Calcula a variância com base na população total, inclusive números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Retorna a distribuição Weibull
-ZTEST			= TESTEZ			##	Retorna o valor de probabilidade uni-caudal de um teste-z
-
+AVEDEV = DESV.MÉDIO
+AVERAGE = MÉDIA
+AVERAGEA = MÉDIAA
+AVERAGEIF = MÉDIASE
+AVERAGEIFS = MÉDIASES
+BETA.DIST = DIST.BETA
+BETA.INV = INV.BETA
+BINOM.DIST = DISTR.BINOM
+BINOM.DIST.RANGE = INTERV.DISTR.BINOM
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DIST.QUIQUA
+CHISQ.DIST.RT = DIST.QUIQUA.CD
+CHISQ.INV = INV.QUIQUA
+CHISQ.INV.RT = INV.QUIQUA.CD
+CHISQ.TEST = TESTE.QUIQUA
+CONFIDENCE.NORM = INT.CONFIANÇA.NORM
+CONFIDENCE.T = INT.CONFIANÇA.T
+CORREL = CORREL
+COUNT = CONT.NÚM
+COUNTA = CONT.VALORES
+COUNTBLANK = CONTAR.VAZIO
+COUNTIF = CONT.SE
+COUNTIFS = CONT.SES
+COVARIANCE.P = COVARIAÇÃO.P
+COVARIANCE.S = COVARIAÇÃO.S
+DEVSQ = DESVQ
+EXPON.DIST = DISTR.EXPON
+F.DIST = DIST.F
+F.DIST.RT = DIST.F.CD
+F.INV = INV.F
+F.INV.RT = INV.F.CD
+F.TEST = TESTE.F
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PREVISÃO.ETS
+FORECAST.ETS.CONFINT = PREVISÃO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISÃO.ETS.SAZONALIDADE
+FORECAST.ETS.STAT = PREVISÃO.ETS.STAT
+FORECAST.LINEAR = PREVISÃO.LINEAR
+FREQUENCY = FREQÜÊNCIA
+GAMMA = GAMA
+GAMMA.DIST = DIST.GAMA
+GAMMA.INV = INV.GAMA
+GAMMALN = LNGAMA
+GAMMALN.PRECISE = LNGAMA.PRECISO
+GAUSS = GAUSS
+GEOMEAN = MÉDIA.GEOMÉTRICA
+GROWTH = CRESCIMENTO
+HARMEAN = MÉDIA.HARMÔNICA
+HYPGEOM.DIST = DIST.HIPERGEOM.N
+INTERCEPT = INTERCEPÇÃO
+KURT = CURT
+LARGE = MAIOR
+LINEST = PROJ.LIN
+LOGEST = PROJ.LOG
+LOGNORM.DIST = DIST.LOGNORMAL.N
+LOGNORM.INV = INV.LOGNORMAL
+MAX = MÁXIMO
+MAXA = MÁXIMOA
+MAXIFS = MÁXIMOSES
+MEDIAN = MED
+MIN = MÍNIMO
+MINA = MÍNIMOA
+MINIFS = MÍNIMOSES
+MODE.MULT = MODO.MULT
+MODE.SNGL = MODO.ÚNICO
+NEGBINOM.DIST = DIST.BIN.NEG.N
+NORM.DIST = DIST.NORM.N
+NORM.INV = INV.NORM.N
+NORM.S.DIST = DIST.NORMP.N
+NORM.S.INV = INV.NORMP.N
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = ORDEM.PORCENTUAL.EXC
+PERCENTRANK.INC = ORDEM.PORCENTUAL.INC
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTAS
+PHI = PHI
+POISSON.DIST = DIST.POISSON
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = ORDEM.MÉD
+RANK.EQ = ORDEM.EQ
+RSQ = RQUAD
+SKEW = DISTORÇÃO
+SKEW.P = DISTORÇÃO.P
+SLOPE = INCLINAÇÃO
+SMALL = MENOR
+STANDARDIZE = PADRONIZAR
+STDEV.P = DESVPAD.P
+STDEV.S = DESVPAD.A
+STDEVA = DESVPADA
+STDEVPA = DESVPADPA
+STEYX = EPADYX
+T.DIST = DIST.T
+T.DIST.2T = DIST.T.BC
+T.DIST.RT = DIST.T.CD
+T.INV = INV.T
+T.INV.2T = INV.T.BC
+T.TEST = TESTE.T
+TREND = TENDÊNCIA
+TRIMMEAN = MÉDIA.INTERNA
+VAR.P = VAR.P
+VAR.S = VAR.A
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DIST.WEIBULL
+Z.TEST = TESTE.Z
 
 ##
-##	Text functions			Funções de texto
+## Funções de texto (Text Functions)
 ##
-ASC			= ASC				##	Altera letras do inglês ou katakana de largura total (bytes duplos) dentro de uma seqüência de caracteres para caracteres de meia largura (byte único)
-BAHTTEXT		= BAHTTEXT			##	Converte um número em um texto, usando o formato de moeda ß (baht)
-CHAR			= CARACT			##	Retorna o caractere especificado pelo número de código
-CLEAN			= TIRAR				##	Remove todos os caracteres do texto que não podem ser impressos
-CODE			= CÓDIGO			##	Retorna um código numérico para o primeiro caractere de uma seqüência de caracteres de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto em um único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, usando o formato de moeda $ (dólar)
-EXACT			= EXATO				##	Verifica se dois valores de texto são idênticos
-FIND			= PROCURAR			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FINDB			= PROCURARB			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FIXED			= DEF.NÚM.DEC			##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras do inglês ou katakana de meia largura (byte único) dentro de uma seqüência de caracteres para caracteres de largura total (bytes duplos)
-LEFT			= ESQUERDA			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Retorna o número de caracteres em uma seqüência de texto
-LENB			= NÚM.CARACTB			##	Retorna o número de caracteres em uma seqüência de texto
-LOWER			= MINÚSCULA			##	Converte texto para minúsculas
-MID			= EXT.TEXTO			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-MIDB			= EXT.TEXTOB			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-PHONETIC		= FONÉTICA			##	Extrai os caracteres fonéticos (furigana) de uma seqüência de caracteres de texto
-PROPER			= PRI.MAIÚSCULA			##	Coloca a primeira letra de cada palavra em maiúscula em um valor de texto
-REPLACE			= MUDAR				##	Muda os caracteres dentro do texto
-REPLACEB		= MUDARB			##	Muda os caracteres dentro do texto
-REPT			= REPT				##	Repete o texto um determinado número de vezes
-RIGHT			= DIREITA			##	Retorna os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Retorna os caracteres mais à direita de um valor de texto
-SEARCH			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SEARCHB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SUBSTITUTE		= SUBSTITUIR			##	Substitui um novo texto por um texto antigo em uma seqüência de texto
-T			= T				##	Converte os argumentos em texto
-TEXT			= TEXTO				##	Formata um número e o converte em texto
-TRIM			= ARRUMAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULA			##	Converte o texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto em um número
+BAHTTEXT = BAHTTEXT
+CHAR = CARACT
+CLEAN = TIRAR
+CODE = CÓDIGO
+CONCAT = CONCAT
+DOLLAR = MOEDA
+EXACT = EXATO
+FIND = PROCURAR
+FIXED = DEF.NÚM.DEC
+LEFT = ESQUERDA
+LEN = NÚM.CARACT
+LOWER = MINÚSCULA
+MID = EXT.TEXTO
+NUMBERSTRING = SEQÜÊNCIA.NÚMERO
+NUMBERVALUE = VALORNUMÉRICO
+PHONETIC = FONÉTICA
+PROPER = PRI.MAIÚSCULA
+REPLACE = MUDAR
+REPT = REPT
+RIGHT = DIREITA
+SEARCH = LOCALIZAR
+SUBSTITUTE = SUBSTITUIR
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRTEXTO
+TRIM = ARRUMAR
+UNICHAR = CARACTUNICODE
+UNICODE = UNICODE
+UPPER = MAIÚSCULA
+VALUE = VALOR
+
+##
+## Funções da Web (Web Functions)
+##
+ENCODEURL = CODIFURL
+FILTERXML = FILTROXML
+WEBSERVICE = SERVIÇOWEB
+
+##
+## Funções de compatibilidade (Compatibility Functions)
+##
+BETADIST = DISTBETA
+BETAINV = BETA.ACUM.INV
+BINOMDIST = DISTRBINOM
+CEILING = TETO
+CHIDIST = DIST.QUI
+CHIINV = INV.QUI
+CHITEST = TESTE.QUI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INT.CONFIANÇA
+COVAR = COVAR
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTEXPON
+FDIST = DISTF
+FINV = INVF
+FLOOR = ARREDMULTB
+FORECAST = PREVISÃO
+FTEST = TESTEF
+GAMMADIST = DISTGAMA
+GAMMAINV = INVGAMA
+HYPGEOMDIST = DIST.HIPERGEOM
+LOGINV = INVLOG
+LOGNORMDIST = DIST.LOGNORMAL
+MODE = MODO
+NEGBINOMDIST = DIST.BIN.NEG
+NORMDIST = DISTNORM
+NORMINV = INV.NORM
+NORMSDIST = DISTNORMP
+NORMSINV = INV.NORMP
+PERCENTILE = PERCENTIL
+PERCENTRANK = ORDEM.PORCENTUAL
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = ORDEM
+STDEV = DESVPAD
+STDEVP = DESVPADP
+TDIST = DISTT
+TINV = INVT
+TTEST = TESTET
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = TESTEZ
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config
index cd85c17aa..e661830b3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Português (Portuguese)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
+NULL = #NULO!
+DIV0
+VALUE = #VALOR!
+REF
+NAME = #NOME?
+NUM = #NÚM!
+NA = #N/D
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
index ba4eb471b..70a3bb0c7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
@@ -1,408 +1,538 @@
+############################################################
 ##
-##	Add-in and Automation functions			Funções de Suplemento e Automatização
+## PhpSpreadsheet - function name translations
 ##
-GETPIVOTDATA		= OBTERDADOSDIN			##	Devolve dados armazenados num relatório de Tabela Dinâmica
+## Português (Portuguese)
+##
+############################################################
 
 
 ##
-##	Cube functions					Funções de cubo
+## Funções de cubo (Cube Functions)
 ##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Devolve o nome, propriedade e medição de um KPI (key performance indicator) e apresenta o nome e a propriedade na célula. Um KPI é uma medida quantificável, como, por exemplo, o lucro mensal bruto ou a rotatividade trimestral de pessoal, utilizada para monitorizar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Devolve um membro ou cadeia de identificação numa hierarquia de cubo. Utilizada para validar a existência do membro ou cadeia de identificação no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Devolve o valor de uma propriedade de membro no cubo. Utilizada para validar a existência de um nome de membro no cubo e para devolver a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Devolve o enésimo ou a classificação mais alta num conjunto. Utilizada para devolver um ou mais elementos num conjunto, tal como o melhor vendedor ou os 10 melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou cadeias de identificação enviando uma expressão de conjunto para o cubo no servidor, que cria o conjunto e, em seguida, devolve o conjunto ao Microsoft Office Excel.
-CUBESETCOUNT		= CONTARCONJUNTOCUBO		##	Devolve o número de itens num conjunto.
-CUBEVALUE		= VALORCUBO			##	Devolve um valor agregado do cubo.
-
+CUBEKPIMEMBER = MEMBROKPICUBO
+CUBEMEMBER = MEMBROCUBO
+CUBEMEMBERPROPERTY = PROPRIEDADEMEMBROCUBO
+CUBERANKEDMEMBER = MEMBROCLASSIFICADOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = CONTARCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
 
 ##
-##	Database functions				Funções de base de dados
+## Funções de base de dados (Database Functions)
 ##
-DAVERAGE		= BDMÉDIA			##	Devolve a média das entradas da base de dados seleccionadas
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números numa base de dados
-DCOUNTA			= BDCONTAR.VAL			##	Conta as células que não estejam em branco numa base de dados
-DGET			= BDOBTER			##	Extrai de uma base de dados um único registo que corresponde aos critérios especificados
-DMAX			= BDMÁX				##	Devolve o valor máximo das entradas da base de dados seleccionadas
-DMIN			= BDMÍN				##	Devolve o valor mínimo das entradas da base de dados seleccionadas
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores de um determinado campo de registos que correspondem aos critérios numa base de dados
-DSTDEV			= BDDESVPAD			##	Calcula o desvio-padrão com base numa amostra de entradas da base de dados seleccionadas
-DSTDEVP			= BDDESVPADP			##	Calcula o desvio-padrão com base na população total das entradas da base de dados seleccionadas
-DSUM			= BDSOMA			##	Adiciona os números na coluna de campo dos registos de base de dados que correspondem aos critérios
-DVAR			= BDVAR				##	Calcula a variância com base numa amostra das entradas de base de dados seleccionadas
-DVARP			= BDVARP			##	Calcula a variância com base na população total das entradas de base de dados seleccionadas
-
+DAVERAGE = BDMÉDIA
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTAR.VAL
+DGET = BDOBTER
+DMAX = BDMÁX
+DMIN = BDMÍN
+DPRODUCT = BDMULTIPL
+DSTDEV = BDDESVPAD
+DSTDEVP = BDDESVPADP
+DSUM = BDSOMA
+DVAR = BDVAR
+DVARP = BDVARP
 
 ##
-##	Date and time functions				Funções de data e hora
+## Funções de data e hora (Date & Time Functions)
 ##
-DATE			= DATA				##	Devolve o número de série de uma determinada data
-DATEVALUE		= DATA.VALOR			##	Converte uma data em forma de texto num número de série
-DAY			= DIA				##	Converte um número de série num dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base num ano com 360 dias
-EDATE			= DATAM				##	Devolve um número de série de data que corresponde ao número de meses indicado antes ou depois da data de início
-EOMONTH			= FIMMÊS			##	Devolve o número de série do último dia do mês antes ou depois de um número de meses especificado
-HOUR			= HORA				##	Converte um número de série numa hora
-MINUTE			= MINUTO			##	Converte um número de série num minuto
-MONTH			= MÊS				##	Converte um número de série num mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Devolve o número total de dias úteis entre duas datas
-NOW			= AGORA				##	Devolve o número de série da data e hora actuais
-SECOND			= SEGUNDO			##	Converte um número de série num segundo
-TIME			= TEMPO				##	Devolve o número de série de um determinado tempo
-TIMEVALUE		= VALOR.TEMPO			##	Converte um tempo em forma de texto num número de série
-TODAY			= HOJE				##	Devolve o número de série da data actual
-WEEKDAY			= DIA.SEMANA			##	Converte um número de série num dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série num número que representa o número da semana num determinado ano
-WORKDAY			= DIA.TRABALHO			##	Devolve o número de série da data antes ou depois de um número de dias úteis especificado
-YEAR			= ANO				##	Converte um número de série num ano
-YEARFRAC		= FRACÇÃOANO			##	Devolve a fracção de ano que representa o número de dias inteiros entre a data_de_início e a data_de_fim
-
+DATE = DATA
+DATEDIF = DATADIF
+DATESTRING = DATA.CADEIA
+DATEVALUE = DATA.VALOR
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = DATAM
+EOMONTH = FIMMÊS
+HOUR = HORA
+ISOWEEKNUM = NUMSEMANAISO
+MINUTE = MINUTO
+MONTH = MÊS
+NETWORKDAYS = DIATRABALHOTOTAL
+NETWORKDAYS.INTL = DIATRABALHOTOTAL.INTL
+NOW = AGORA
+SECOND = SEGUNDO
+THAIDAYOFWEEK = DIA.DA.SEMANA.TAILANDÊS
+THAIMONTHOFYEAR = MÊS.DO.ANO.TAILANDÊS
+THAIYEAR = ANO.TAILANDÊS
+TIME = TEMPO
+TIMEVALUE = VALOR.TEMPO
+TODAY = HOJE
+WEEKDAY = DIA.SEMANA
+WEEKNUM = NÚMSEMANA
+WORKDAY = DIATRABALHO
+WORKDAY.INTL = DIATRABALHO.INTL
+YEAR = ANO
+YEARFRAC = FRAÇÃOANO
 
 ##
-##	Engineering functions				Funções de engenharia
+## Funções de engenharia (Engineering Functions)
 ##
-BESSELI			= BESSELI			##	Devolve a função de Bessel modificada In(x)
-BESSELJ			= BESSELJ			##	Devolve a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Devolve a função de Bessel modificada Kn(x)
-BESSELY			= BESSELY			##	Devolve a função de Bessel Yn(x)
-BIN2DEC			= BINADEC			##	Converte um número binário em decimal
-BIN2HEX			= BINAHEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BINAOCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEXO			##	Converte coeficientes reais e imaginários num número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida noutro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNCERRO			##	Devolve a função de erro
-ERFC			= FUNCERROCOMPL			##	Devolve a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Devolve o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Devolve o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Devolve o argumento Teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Devolve o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Devolve o co-seno de um número complexo
-IMDIV			= IMDIV				##	Devolve o quociente de dois números complexos
-IMEXP			= IMEXP				##	Devolve o exponencial de um número complexo
-IMLN			= IMLN				##	Devolve o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Devolve o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Devolve o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Devolve um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Devolve o produto de números complexos
-IMREAL			= IMREAL			##	Devolve o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Devolve o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Devolve a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Devolve a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Devolve a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINADEC
+BIN2HEX = BINAHEX
+BIN2OCT = BINAOCT
+BITAND = BIT.E
+BITLSHIFT = BITDESL.ESQ
+BITOR = BIT.OU
+BITRSHIFT = BITDESL.DIR
+BITXOR = BIT.XOU
+COMPLEX = COMPLEXO
+CONVERT = CONVERTER
+DEC2BIN = DECABIN
+DEC2HEX = DECAHEX
+DEC2OCT = DECAOCT
+DELTA = DELTA
+ERF = FUNCERRO
+ERF.PRECISE = FUNCERRO.PRECISO
+ERFC = FUNCERROCOMPL
+ERFC.PRECISE = FUNCERROCOMPL.PRECISO
+GESTEP = DEGRAU
+HEX2BIN = HEXABIN
+HEX2DEC = HEXADEC
+HEX2OCT = HEXAOCT
+IMABS = IMABS
+IMAGINARY = IMAGINÁRIO
+IMARGUMENT = IMARG
+IMCONJUGATE = IMCONJ
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOT
+IMPRODUCT = IMPROD
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSENO
+IMSINH = IMSENOH
+IMSQRT = IMRAIZ
+IMSUB = IMSUBTR
+IMSUM = IMSOMA
+IMTAN = IMTAN
+OCT2BIN = OCTABIN
+OCT2DEC = OCTADEC
+OCT2HEX = OCTAHEX
 
 ##
-##	Financial functions				Funções financeiras
+## Funções financeiras (Financial Functions)
 ##
-ACCRINT			= JUROSACUM			##	Devolve os juros acumulados de um título que paga juros periódicos
-ACCRINTM		= JUROSACUMV			##	Devolve os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Devolve a depreciação correspondente a cada período contabilístico utilizando um coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Devolve a depreciação correspondente a cada período contabilístico
-COUPDAYBS		= CUPDIASINLIQ			##	Devolve o número de dias entre o início do período do cupão e a data de regularização
-COUPDAYS		= CUPDIAS			##	Devolve o número de dias no período do cupão que contém a data de regularização
-COUPDAYSNC		= CUPDIASPRÓX			##	Devolve o número de dias entre a data de regularização e a data do cupão seguinte
-COUPNCD			= CUPDATAPRÓX			##	Devolve a data do cupão seguinte após a data de regularização
-COUPNUM			= CUPNÚM			##	Devolve o número de cupões a serem pagos entre a data de regularização e a data de vencimento
-COUPPCD			= CUPDATAANT			##	Devolve a data do cupão anterior antes da data de regularização
-CUMIPMT			= PGTOJURACUM			##	Devolve os juros cumulativos pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Devolve o capital cumulativo pago a título de empréstimo entre dois períodos
-DB			= BD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas fixas
-DDB			= BDD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas duplas ou qualquer outro método especificado
-DISC			= DESC				##	Devolve a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em unidade monetária, expresso como uma fracção, num preço em unidade monetária, expresso como um número decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço em unidade monetária, expresso como um número decimal, num preço em unidade monetária, expresso como uma fracção
-DURATION		= DURAÇÃO			##	Devolve a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFECTIVA			##	Devolve a taxa de juros anual efectiva
-FV			= VF				##	Devolve o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Devolve o valor futuro de um capital inicial após a aplicação de uma série de taxas de juro compostas
-INTRATE			= TAXAJUROS			##	Devolve a taxa de juros de um título investido na totalidade
-IPMT			= IPGTO				##	Devolve o pagamento dos juros de um investimento durante um determinado período
-IRR			= TIR				##	Devolve a taxa de rentabilidade interna para uma série de fluxos monetários
-ISPMT			= É.PGTO			##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Devolve a duração modificada de Macauley de um título com um valor de paridade equivalente a € 100
-MIRR			= MTIR				##	Devolve a taxa interna de rentabilidade em que os fluxos monetários positivos e negativos são financiados com taxas diferentes
-NOMINAL			= NOMINAL			##	Devolve a taxa de juros nominal anual
-NPER			= NPER				##	Devolve o número de períodos de um investimento
-NPV			= VAL				##	Devolve o valor actual líquido de um investimento com base numa série de fluxos monetários periódicos e numa taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Devolve o preço por € 100 do valor nominal de um título com um período inicial incompleto
-ODDFYIELD		= LUCROPRIMINC			##	Devolve o lucro de um título com um período inicial incompleto
-ODDLPRICE		= PREÇOÚLTINC			##	Devolve o preço por € 100 do valor nominal de um título com um período final incompleto
-ODDLYIELD		= LUCROÚLTINC			##	Devolve o lucro de um título com um período final incompleto
-PMT			= PGTO				##	Devolve o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Devolve o pagamento sobre o capital de um investimento num determinado período
-PRICE			= PREÇO				##	Devolve o preço por € 100 do valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Devolve o preço por € 100 do valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Devolve o preço por € 100 do valor nominal de um título que paga juros no vencimento
-PV			= VA				##	Devolve o valor actual de um investimento
-RATE			= TAXA				##	Devolve a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Devolve o montante recebido no vencimento de um título investido na totalidade
-SLN			= AMORT				##	Devolve uma depreciação linear de um activo durante um período
-SYD			= AMORTD			##	Devolve a depreciação por algarismos da soma dos anos de um activo durante um período especificado
-TBILLEQ			= OTN				##	Devolve o lucro de um título equivalente a uma Obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Devolve o preço por € 100 de valor nominal de uma Obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Devolve o lucro de uma Obrigação do Tesouro
-VDB			= BDV				##	Devolve a depreciação de um activo relativo a um período específico ou parcial utilizando um método de quotas degressivas
-XIRR			= XTIR				##	Devolve a taxa interna de rentabilidade de um plano de fluxos monetários que não seja necessariamente periódica
-XNPV			= XVAL				##	Devolve o valor actual líquido de um plano de fluxos monetários que não seja necessariamente periódico
-YIELD			= LUCRO				##	Devolve o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Devolve o lucro anual de um título emitido abaixo do valor nominal, por exemplo, uma Obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Devolve o lucro anual de um título que paga juros na data de vencimento
-
+ACCRINT = JUROSACUM
+ACCRINTM = JUROSACUMV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = CUPDIASINLIQ
+COUPDAYS = CUPDIAS
+COUPDAYSNC = CUPDIASPRÓX
+COUPNCD = CUPDATAPRÓX
+COUPNUM = CUPNÚM
+COUPPCD = CUPDATAANT
+CUMIPMT = PGTOJURACUM
+CUMPRINC = PGTOCAPACUM
+DB = BD
+DDB = BDD
+DISC = DESC
+DOLLARDE = MOEDADEC
+DOLLARFR = MOEDAFRA
+DURATION = DURAÇÃO
+EFFECT = EFETIVA
+FV = VF
+FVSCHEDULE = VFPLANO
+INTRATE = TAXAJUROS
+IPMT = IPGTO
+IRR = TIR
+ISPMT = É.PGTO
+MDURATION = MDURAÇÃO
+MIRR = MTIR
+NOMINAL = NOMINAL
+NPER = NPER
+NPV = VAL
+ODDFPRICE = PREÇOPRIMINC
+ODDFYIELD = LUCROPRIMINC
+ODDLPRICE = PREÇOÚLTINC
+ODDLYIELD = LUCROÚLTINC
+PDURATION = PDURAÇÃO
+PMT = PGTO
+PPMT = PPGTO
+PRICE = PREÇO
+PRICEDISC = PREÇODESC
+PRICEMAT = PREÇOVENC
+PV = VA
+RATE = TAXA
+RECEIVED = RECEBER
+RRI = DEVOLVERTAXAJUROS
+SLN = AMORT
+SYD = AMORTD
+TBILLEQ = OTN
+TBILLPRICE = OTNVALOR
+TBILLYIELD = OTNLUCRO
+VDB = BDV
+XIRR = XTIR
+XNPV = XVAL
+YIELD = LUCRO
+YIELDDISC = LUCRODESC
+YIELDMAT = LUCROVENC
 
 ##
-##	Information functions				Funções de informação
+## Funções de informação (Information Functions)
 ##
-CELL			= CÉL				##	Devolve informações sobre a formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Devolve um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Devolve informações sobre o ambiente de funcionamento actual
-ISBLANK			= É.CÉL.VAZIA			##	Devolve VERDADEIRO se o valor estiver em branco
-ISERR			= É.ERROS			##	Devolve VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= É.ERRO			##	Devolve VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Devolve VERDADEIRO se o número for par
-ISLOGICAL		= É.LÓGICO			##	Devolve VERDADEIRO se o valor for lógico
-ISNA			= É.NÃO.DISP			##	Devolve VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Devolve VERDADEIRO se o valor não for texto
-ISNUMBER		= É.NÚM				##	Devolve VERDADEIRO se o valor for um número
-ISODD			= ÉÍMPAR			##	Devolve VERDADEIRO se o número for ímpar
-ISREF			= É.REF				##	Devolve VERDADEIRO se o valor for uma referência
-ISTEXT			= É.TEXTO			##	Devolve VERDADEIRO se o valor for texto
-N			= N				##	Devolve um valor convertido num número
-NA			= NÃO.DISP			##	Devolve o valor de erro #N/D
-TYPE			= TIPO				##	Devolve um número que indica o tipo de dados de um valor
-
+CELL = CÉL
+ERROR.TYPE = TIPO.ERRO
+INFO = INFORMAÇÃO
+ISBLANK = É.CÉL.VAZIA
+ISERR = É.ERROS
+ISERROR = É.ERRO
+ISEVEN = ÉPAR
+ISFORMULA = É.FORMULA
+ISLOGICAL = É.LÓGICO
+ISNA = É.NÃO.DISP
+ISNONTEXT = É.NÃO.TEXTO
+ISNUMBER = É.NÚM
+ISODD = ÉÍMPAR
+ISREF = É.REF
+ISTEXT = É.TEXTO
+N = N
+NA = NÃO.DISP
+SHEET = FOLHA
+SHEETS = FOLHAS
+TYPE = TIPO
 
 ##
-##	Logical functions				Funções lógicas
+## Funções lógicas (Logical Functions)
 ##
-AND			= E				##	Devolve VERDADEIRO se todos os respectivos argumentos corresponderem a VERDADEIRO
-FALSE			= FALSO				##	Devolve o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SE.ERRO			##	Devolve um valor definido pelo utilizador se ocorrer um erro na fórmula, e devolve o resultado da fórmula se não ocorrer nenhum erro
-NOT			= NÃO				##	Inverte a lógica do respectivo argumento
-OR			= OU				##	Devolve VERDADEIRO se qualquer argumento for VERDADEIRO
-TRUE			= VERDADEIRO			##	Devolve o valor lógico VERDADEIRO
-
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SE.ERRO
+IFNA = SEND
+IFS = SE.S
+NOT = NÃO
+OR = OU
+SWITCH = PARÂMETRO
+TRUE = VERDADEIRO
+XOR = XOU
 
 ##
-##	Lookup and reference functions			Funções de pesquisa e referência
+## Funções de pesquisa e referência (Lookup & Reference Functions)
 ##
-ADDRESS			= ENDEREÇO			##	Devolve uma referência a uma única célula numa folha de cálculo como texto
-AREAS			= ÁREAS				##	Devolve o número de áreas numa referência
-CHOOSE			= SELECCIONAR			##	Selecciona um valor a partir de uma lista de valores
-COLUMN			= COL				##	Devolve o número da coluna de uma referência
-COLUMNS			= COLS				##	Devolve o número de colunas numa referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e devolve o valor da célula indicada
-HYPERLINK		= HIPERLIGAÇÃO			##	Cria um atalho ou hiperligação que abre um documento armazenado num servidor de rede, numa intranet ou na Internet
-INDEX			= ÍNDICE			##	Utiliza um índice para escolher um valor de uma referência ou de uma matriz
-INDIRECT		= INDIRECTO			##	Devolve uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores num vector ou numa matriz
-MATCH			= CORRESP			##	Procura valores numa referência ou numa matriz
-OFFSET			= DESLOCAMENTO			##	Devolve o deslocamento de referência de uma determinada referência
-ROW			= LIN				##	Devolve o número da linha de uma referência
-ROWS			= LINS				##	Devolve o número de linhas numa referência
-RTD			= RTD				##	Obtém dados em tempo real a partir de um programa que suporte automatização COM (automatização: modo de trabalhar com objectos de uma aplicação a partir de outra aplicação ou ferramenta de desenvolvimento. Anteriormente conhecida como automatização OLE, a automatização é uma norma da indústria de software e uma funcionalidade COM (Component Object Model).)
-TRANSPOSE		= TRANSPOR			##	Devolve a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e percorre a linha para devolver o valor de uma célula
-
+ADDRESS = ENDEREÇO
+AREAS = ÁREAS
+CHOOSE = SELECIONAR
+COLUMN = COL
+COLUMNS = COLS
+FORMULATEXT = FÓRMULA.TEXTO
+GETPIVOTDATA = OBTERDADOSDIN
+HLOOKUP = PROCH
+HYPERLINK = HIPERLIGAÇÃO
+INDEX = ÍNDICE
+INDIRECT = INDIRETO
+LOOKUP = PROC
+MATCH = CORRESP
+OFFSET = DESLOCAMENTO
+ROW = LIN
+ROWS = LINS
+RTD = RTD
+TRANSPOSE = TRANSPOR
+VLOOKUP = PROCV
+*RC = LC
 
 ##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
+## Funções matemáticas e trigonométricas (Math & Trig Functions)
 ##
-ABS			= ABS				##	Devolve o valor absoluto de um número
-ACOS			= ACOS				##	Devolve o arco de co-seno de um número
-ACOSH			= ACOSH				##	Devolve o co-seno hiperbólico inverso de um número
-ASIN			= ASEN				##	Devolve o arco de seno de um número
-ASINH			= ASENH				##	Devolve o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Devolve o arco de tangente de um número
-ATAN2			= ATAN2				##	Devolve o arco de tangente das coordenadas x e y
-ATANH			= ATANH				##	Devolve a tangente hiperbólica inversa de um número
-CEILING			= ARRED.EXCESSO			##	Arredonda um número para o número inteiro mais próximo ou para o múltiplo de significância mais próximo
-COMBIN			= COMBIN			##	Devolve o número de combinações de um determinado número de objectos
-COS			= COS				##	Devolve o co-seno de um número
-COSH			= COSH				##	Devolve o co-seno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número por excesso para o número inteiro mais próximo
-EXP			= EXP				##	Devolve e elevado à potência de um determinado número
-FACT			= FACTORIAL			##	Devolve o factorial de um número
-FACTDOUBLE		= FACTDUPLO			##	Devolve o factorial duplo de um número
-FLOOR			= ARRED.DEFEITO			##	Arredonda um número por defeito até zero
-GCD			= MDC				##	Devolve o maior divisor comum
-INT			= INT				##	Arredonda um número por defeito para o número inteiro mais próximo
-LCM			= MMC				##	Devolve o mínimo múltiplo comum
-LN			= LN				##	Devolve o logaritmo natural de um número
-LOG			= LOG				##	Devolve o logaritmo de um número com uma base especificada
-LOG10			= LOG10				##	Devolve o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Devolve o determinante matricial de uma matriz
-MINVERSE		= MATRIZ.INVERSA		##	Devolve o inverso matricial de uma matriz
-MMULT			= MATRIZ.MULT			##	Devolve o produto matricial de duas matrizes
-MOD			= RESTO				##	Devolve o resto da divisão
-MROUND			= MARRED			##	Devolve um número arredondado para o múltiplo pretendido
-MULTINOMIAL		= POLINOMIAL			##	Devolve o polinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda por excesso um número para o número inteiro ímpar mais próximo
-PI			= PI				##	Devolve o valor de pi
-POWER			= POTÊNCIA			##	Devolve o resultado de um número elevado a uma potência
-PRODUCT			= PRODUTO			##	Multiplica os respectivos argumentos
-QUOTIENT		= QUOCIENTE			##	Devolve a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Devolve um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Devolve um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um número árabe em romano, como texto
-ROUND			= ARRED				##	Arredonda um número para um número de dígitos especificado
-ROUNDDOWN		= ARRED.PARA.BAIXO		##	Arredonda um número por defeito até zero
-ROUNDUP			= ARRED.PARA.CIMA		##	Arredonda um número por excesso, afastando-o de zero
-SERIESSUM		= SOMASÉRIE			##	Devolve a soma de uma série de potências baseada na fórmula
-SIGN			= SINAL				##	Devolve o sinal de um número
-SIN			= SEN				##	Devolve o seno de um determinado ângulo
-SINH			= SENH				##	Devolve o seno hiperbólico de um número
-SQRT			= RAIZQ				##	Devolve uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Devolve a raiz quadrada de (núm * pi)
-SUBTOTAL		= SUBTOTAL			##	Devolve um subtotal numa lista ou base de dados
-SUM			= SOMA				##	Adiciona os respectivos argumentos
-SUMIF			= SOMA.SE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMA.SE.S			##	Adiciona as células num intervalo que cumpre vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Devolve a soma dos produtos de componentes de matrizes correspondentes
-SUMSQ			= SOMARQUAD			##	Devolve a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Devolve a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Devolve a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Devolve a soma dos quadrados da diferença dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Devolve a tangente de um número
-TANH			= TANH				##	Devolve a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um número inteiro
-
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = ÁRABE
+ASIN = ASEN
+ASINH = ASENH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = ARRED.EXCESSO.MAT
+CEILING.PRECISE = ARRED.EXCESSO.PRECISO
+COMBIN = COMBIN
+COMBINA = COMBIN.R
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRAUS
+ECMA.CEILING = ARRED.EXCESSO.ECMA
+EVEN = PAR
+EXP = EXP
+FACT = FATORIAL
+FACTDOUBLE = FATDUPLO
+FLOOR.MATH = ARRED.DEFEITO.MAT
+FLOOR.PRECISE = ARRED.DEFEITO.PRECISO
+GCD = MDC
+INT = INT
+ISO.CEILING = ARRED.EXCESSO.ISO
+LCM = MMC
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATRIZ.DETERM
+MINVERSE = MATRIZ.INVERSA
+MMULT = MATRIZ.MULT
+MOD = RESTO
+MROUND = MARRED
+MULTINOMIAL = POLINOMIAL
+MUNIT = UNIDM
+ODD = ÍMPAR
+PI = PI
+POWER = POTÊNCIA
+PRODUCT = PRODUTO
+QUOTIENT = QUOCIENTE
+RADIANS = RADIANOS
+RAND = ALEATÓRIO
+RANDBETWEEN = ALEATÓRIOENTRE
+ROMAN = ROMANO
+ROUND = ARRED
+ROUNDBAHTDOWN = ARREDOND.BAHT.BAIXO
+ROUNDBAHTUP = ARREDOND.BAHT.CIMA
+ROUNDDOWN = ARRED.PARA.BAIXO
+ROUNDUP = ARRED.PARA.CIMA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMASÉRIE
+SIGN = SINAL
+SIN = SEN
+SINH = SENH
+SQRT = RAIZQ
+SQRTPI = RAIZPI
+SUBTOTAL = SUBTOTAL
+SUM = SOMA
+SUMIF = SOMA.SE
+SUMIFS = SOMA.SE.S
+SUMPRODUCT = SOMARPRODUTO
+SUMSQ = SOMARQUAD
+SUMX2MY2 = SOMAX2DY2
+SUMX2PY2 = SOMAX2SY2
+SUMXMY2 = SOMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
 
 ##
-##	Statistical functions				Funções estatísticas
+## Funções estatísticas (Statistical Functions)
 ##
-AVEDEV			= DESV.MÉDIO			##	Devolve a média aritmética dos desvios absolutos à média dos pontos de dados
-AVERAGE			= MÉDIA				##	Devolve a média dos respectivos argumentos
-AVERAGEA		= MÉDIAA			##	Devolve uma média dos respectivos argumentos, incluindo números, texto e valores lógicos
-AVERAGEIF		= MÉDIA.SE			##	Devolve a média aritmética de todas as células num intervalo que cumprem determinado critério
-AVERAGEIFS		= MÉDIA.SE.S			##	Devolve a média aritmética de todas as células que cumprem múltiplos critérios
-BETADIST		= DISTBETA			##	Devolve a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Devolve o inverso da função de distribuição cumulativa relativamente a uma distribuição beta específica
-BINOMDIST		= DISTRBINOM			##	Devolve a probabilidade de distribuição binomial de termo individual
-CHIDIST			= DIST.CHI			##	Devolve a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.CHI			##	Devolve o inverso da probabilidade unicaudal da distribuição qui-quadrada
-CHITEST			= TESTE.CHI			##	Devolve o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Devolve o intervalo de confiança correspondente a uma média de população
-CORREL			= CORREL			##	Devolve o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONTAR			##	Conta os números que existem na lista de argumentos
-COUNTA			= CONTAR.VAL			##	Conta os valores que existem na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células em branco num intervalo
-COUNTIF			= CONTAR.SE			##	Calcula o número de células num intervalo que corresponde aos critérios determinados
-COUNTIFS		= CONTAR.SE.S			##	Conta o número de células num intervalo que cumprem múltiplos critérios
-COVAR			= COVAR				##	Devolve a covariância, que é a média dos produtos de desvios de pares
-CRITBINOM		= CRIT.BINOM			##	Devolve o menor valor em que a distribuição binomial cumulativa é inferior ou igual a um valor de critério
-DEVSQ			= DESVQ				##	Devolve a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Devolve a distribuição exponencial
-FDIST			= DISTF				##	Devolve a distribuição da probabilidade F
-FINV			= INVF				##	Devolve o inverso da distribuição da probabilidade F
-FISHER			= FISHER			##	Devolve a transformação Fisher
-FISHERINV		= FISHERINV			##	Devolve o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Devolve um valor ao longo de uma tendência linear
-FREQUENCY		= FREQUÊNCIA			##	Devolve uma distribuição de frequência como uma matriz vertical
-FTEST			= TESTEF			##	Devolve o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Devolve a distribuição gama
-GAMMAINV		= INVGAMA			##	Devolve o inverso da distribuição gama cumulativa
-GAMMALN			= LNGAMA			##	Devolve o logaritmo natural da função gama, Γ(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Devolve a média geométrica
-GROWTH			= CRESCIMENTO			##	Devolve valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÓNICA		##	Devolve a média harmónica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Devolve a distribuição hipergeométrica
-INTERCEPT		= INTERCEPTAR			##	Devolve a intercepção da linha de regressão linear
-KURT			= CURT				##	Devolve a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Devolve o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Devolve os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Devolve os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Devolve o inverso da distribuição normal logarítmica
-LOGNORMDIST		= DIST.NORMALLOG		##	Devolve a distribuição normal logarítmica cumulativa
-MAX			= MÁXIMO			##	Devolve o valor máximo numa lista de argumentos
-MAXA			= MÁXIMOA			##	Devolve o valor máximo numa lista de argumentos, incluindo números, texto e valores lógicos
-MEDIAN			= MED				##	Devolve a mediana dos números indicados
-MIN			= MÍNIMO			##	Devolve o valor mínimo numa lista de argumentos
-MINA			= MÍNIMOA			##	Devolve o valor mínimo numa lista de argumentos, incluindo números, texto e valores lógicos
-MODE			= MODA				##	Devolve o valor mais comum num conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Devolve a distribuição binominal negativa
-NORMDIST		= DIST.NORM			##	Devolve a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Devolve o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Devolve a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Devolve o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Devolve o coeficiente de correlação momento/produto de Pearson
-PERCENTILE		= PERCENTIL			##	Devolve o k-ésimo percentil de valores num intervalo
-PERCENTRANK		= ORDEM.PERCENTUAL		##	Devolve a ordem percentual de um valor num conjunto de dados
-PERMUT			= PERMUTAR			##	Devolve o número de permutações de um determinado número de objectos
-POISSON			= POISSON			##	Devolve a distribuição de Poisson
-PROB			= PROB				##	Devolve a probabilidade dos valores num intervalo se encontrarem entre dois limites
-QUARTILE		= QUARTIL			##	Devolve o quartil de um conjunto de dados
-RANK			= ORDEM				##	Devolve a ordem de um número numa lista numérica
-RSQ			= RQUAD				##	Devolve o quadrado do coeficiente de correlação momento/produto de Pearson
-SKEW			= DISTORÇÃO			##	Devolve a distorção de uma distribuição
-SLOPE			= DECLIVE			##	Devolve o declive da linha de regressão linear
-SMALL			= MENOR				##	Devolve o menor valor de k-ésimo de um conjunto de dados
-STANDARDIZE		= NORMALIZAR			##	Devolve um valor normalizado
-STDEV			= DESVPAD			##	Calcula o desvio-padrão com base numa amostra
-STDEVA			= DESVPADA			##	Calcula o desvio-padrão com base numa amostra, incluindo números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio-padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio-padrão com base na população total, incluindo números, texto e valores lógicos
-STEYX			= EPADYX			##	Devolve o erro-padrão do valor de y previsto para cada x na regressão
-TDIST			= DISTT				##	Devolve a distribuição t de Student
-TINV			= INVT				##	Devolve o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Devolve valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Devolve a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Devolve a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Calcula a variância com base numa amostra
-VARA			= VARA				##	Calcula a variância com base numa amostra, incluindo números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população total
-VARPA			= VARPA				##	Calcula a variância com base na população total, incluindo números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Devolve a distribuição Weibull
-ZTEST			= TESTEZ			##	Devolve o valor de probabilidade unicaudal de um teste-z
-
+AVEDEV = DESV.MÉDIO
+AVERAGE = MÉDIA
+AVERAGEA = MÉDIAA
+AVERAGEIF = MÉDIA.SE
+AVERAGEIFS = MÉDIA.SE.S
+BETA.DIST = DIST.BETA
+BETA.INV = INV.BETA
+BINOM.DIST = DISTR.BINOM
+BINOM.DIST.RANGE = DIST.BINOM.INTERVALO
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DIST.CHIQ
+CHISQ.DIST.RT = DIST.CHIQ.DIR
+CHISQ.INV = INV.CHIQ
+CHISQ.INV.RT = INV.CHIQ.DIR
+CHISQ.TEST = TESTE.CHIQ
+CONFIDENCE.NORM = INT.CONFIANÇA.NORM
+CONFIDENCE.T = INT.CONFIANÇA.T
+CORREL = CORREL
+COUNT = CONTAR
+COUNTA = CONTAR.VAL
+COUNTBLANK = CONTAR.VAZIO
+COUNTIF = CONTAR.SE
+COUNTIFS = CONTAR.SE.S
+COVARIANCE.P = COVARIÂNCIA.P
+COVARIANCE.S = COVARIÂNCIA.S
+DEVSQ = DESVQ
+EXPON.DIST = DIST.EXPON
+F.DIST = DIST.F
+F.DIST.RT = DIST.F.DIR
+F.INV = INV.F
+F.INV.RT = INV.F.DIR
+F.TEST = TESTE.F
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PREVISÃO.ETS
+FORECAST.ETS.CONFINT = PREVISÃO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISÃO.ETS.SAZONALIDADE
+FORECAST.ETS.STAT = PREVISÃO.ETS.ESTATÍSTICA
+FORECAST.LINEAR = PREVISÃO.LINEAR
+FREQUENCY = FREQUÊNCIA
+GAMMA = GAMA
+GAMMA.DIST = DIST.GAMA
+GAMMA.INV = INV.GAMA
+GAMMALN = LNGAMA
+GAMMALN.PRECISE = LNGAMA.PRECISO
+GAUSS = GAUSS
+GEOMEAN = MÉDIA.GEOMÉTRICA
+GROWTH = CRESCIMENTO
+HARMEAN = MÉDIA.HARMÓNICA
+HYPGEOM.DIST = DIST.HIPGEOM
+INTERCEPT = INTERCETAR
+KURT = CURT
+LARGE = MAIOR
+LINEST = PROJ.LIN
+LOGEST = PROJ.LOG
+LOGNORM.DIST = DIST.NORMLOG
+LOGNORM.INV = INV.NORMALLOG
+MAX = MÁXIMO
+MAXA = MÁXIMOA
+MAXIFS = MÁXIMO.SE.S
+MEDIAN = MED
+MIN = MÍNIMO
+MINA = MÍNIMOA
+MINIFS = MÍNIMO.SE.S
+MODE.MULT = MODO.MÚLT
+MODE.SNGL = MODO.SIMPLES
+NEGBINOM.DIST = DIST.BINOM.NEG
+NORM.DIST = DIST.NORMAL
+NORM.INV = INV.NORMAL
+NORM.S.DIST = DIST.S.NORM
+NORM.S.INV = INV.S.NORM
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = ORDEM.PERCENTUAL.EXC
+PERCENTRANK.INC = ORDEM.PERCENTUAL.INC
+PERMUT = PERMUTAR
+PERMUTATIONA = PERMUTAR.R
+PHI = PHI
+POISSON.DIST = DIST.POISSON
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = ORDEM.MÉD
+RANK.EQ = ORDEM.EQ
+RSQ = RQUAD
+SKEW = DISTORÇÃO
+SKEW.P = DISTORÇÃO.P
+SLOPE = DECLIVE
+SMALL = MENOR
+STANDARDIZE = NORMALIZAR
+STDEV.P = DESVPAD.P
+STDEV.S = DESVPAD.S
+STDEVA = DESVPADA
+STDEVPA = DESVPADPA
+STEYX = EPADYX
+T.DIST = DIST.T
+T.DIST.2T = DIST.T.2C
+T.DIST.RT = DIST.T.DIR
+T.INV = INV.T
+T.INV.2T = INV.T.2C
+T.TEST = TESTE.T
+TREND = TENDÊNCIA
+TRIMMEAN = MÉDIA.INTERNA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DIST.WEIBULL
+Z.TEST = TESTE.Z
 
 ##
-##	Text functions					Funções de texto
+## Funções de texto (Text Functions)
 ##
-ASC			= ASC				##	Altera letras ou katakana de largura total (byte duplo) numa cadeia de caracteres para caracteres de largura média (byte único)
-BAHTTEXT		= TEXTO.BAHT			##	Converte um número em texto, utilizando o formato monetário ß (baht)
-CHAR			= CARÁCT			##	Devolve o carácter especificado pelo número de código
-CLEAN			= LIMPAR			##	Remove do texto todos os caracteres não imprimíveis
-CODE			= CÓDIGO			##	Devolve um código numérico correspondente ao primeiro carácter numa cadeia de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto num único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, utilizando o formato monetário € (Euro)
-EXACT			= EXACTO			##	Verifica se dois valores de texto são idênticos
-FIND			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FINDB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FIXED			= FIXA				##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras ou katakana de largura média (byte único) numa cadeia de caracteres para caracteres de largura total (byte duplo)
-LEFT			= ESQUERDA			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Devolve o número de caracteres de uma cadeia de texto
-LENB			= NÚM.CARACTB			##	Devolve o número de caracteres de uma cadeia de texto
-LOWER			= MINÚSCULAS			##	Converte o texto em minúsculas
-MID			= SEG.TEXTO			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-MIDB			= SEG.TEXTOB			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-PHONETIC		= FONÉTICA			##	Retira os caracteres fonéticos (furigana) de uma cadeia de texto
-PROPER			= INICIAL.MAIÚSCULA		##	Coloca em maiúsculas a primeira letra de cada palavra de um valor de texto
-REPLACE			= SUBSTITUIR			##	Substitui caracteres no texto
-REPLACEB		= SUBSTITUIRB			##	Substitui caracteres no texto
-REPT			= REPETIR			##	Repete texto um determinado número de vezes
-RIGHT			= DIREITA			##	Devolve os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Devolve os caracteres mais à direita de um valor de texto
-SEARCH			= PROCURAR			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SEARCHB			= PROCURARB			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SUBSTITUTE		= SUBST				##	Substitui texto novo por texto antigo numa cadeia de texto
-T			= T				##	Converte os respectivos argumentos em texto
-TEXT			= TEXTO				##	Formata um número e converte-o em texto
-TRIM			= COMPACTAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULAS			##	Converte texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto num número
+BAHTTEXT = TEXTO.BAHT
+CHAR = CARÁT
+CLEAN = LIMPARB
+CODE = CÓDIGO
+CONCAT = CONCAT
+DOLLAR = MOEDA
+EXACT = EXATO
+FIND = LOCALIZAR
+FIXED = FIXA
+ISTHAIDIGIT = É.DÍGITO.TAILANDÊS
+LEFT = ESQUERDA
+LEN = NÚM.CARAT
+LOWER = MINÚSCULAS
+MID = SEG.TEXTO
+NUMBERSTRING = NÚMERO.CADEIA
+NUMBERVALUE = VALOR.NÚMERO
+PHONETIC = FONÉTICA
+PROPER = INICIAL.MAIÚSCULA
+REPLACE = SUBSTITUIR
+REPT = REPETIR
+RIGHT = DIREITA
+SEARCH = PROCURAR
+SUBSTITUTE = SUBST
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRTEXTO
+THAIDIGIT = DÍGITO.TAILANDÊS
+THAINUMSOUND = SOM.NÚM.TAILANDÊS
+THAINUMSTRING = CADEIA.NÚM.TAILANDÊS
+THAISTRINGLENGTH = COMP.CADEIA.TAILANDÊS
+TRIM = COMPACTAR
+UNICHAR = UNICARÁT
+UNICODE = UNICODE
+UPPER = MAIÚSCULAS
+VALUE = VALOR
+
+##
+## Funções da Web (Web Functions)
+##
+ENCODEURL = CODIFICAÇÃOURL
+FILTERXML = FILTRARXML
+WEBSERVICE = SERVIÇOWEB
+
+##
+## Funções de compatibilidade (Compatibility Functions)
+##
+BETADIST = DISTBETA
+BETAINV = BETA.ACUM.INV
+BINOMDIST = DISTRBINOM
+CEILING = ARRED.EXCESSO
+CHIDIST = DIST.CHI
+CHIINV = INV.CHI
+CHITEST = TESTE.CHI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INT.CONFIANÇA
+COVAR = COVAR
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTEXPON
+FDIST = DISTF
+FINV = INVF
+FLOOR = ARRED.DEFEITO
+FORECAST = PREVISÃO
+FTEST = TESTEF
+GAMMADIST = DISTGAMA
+GAMMAINV = INVGAMA
+HYPGEOMDIST = DIST.HIPERGEOM
+LOGINV = INVLOG
+LOGNORMDIST = DIST.NORMALLOG
+MODE = MODA
+NEGBINOMDIST = DIST.BIN.NEG
+NORMDIST = DIST.NORM
+NORMINV = INV.NORM
+NORMSDIST = DIST.NORMP
+NORMSINV = INV.NORMP
+PERCENTILE = PERCENTIL
+PERCENTRANK = ORDEM.PERCENTUAL
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = ORDEM
+STDEV = DESVPAD
+STDEVP = DESVPADP
+TDIST = DISTT
+TINV = INVT
+TTEST = TESTET
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = TESTEZ
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config
index 9ee9e6cca..2a5a0db83 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## русский язык (Russian)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= р
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #ПУСТО!
-DIV0	= #ДЕЛ/0!
-VALUE	= #ЗНАЧ!
-REF	= #ССЫЛ!
-NAME	= #ИМЯ?
-NUM	= #ЧИСЛО!
-NA	= #Н/Д
+NULL = #ПУСТО!
+DIV0 = #ДЕЛ/0!
+VALUE = #ЗНАЧ!
+REF = #ССЫЛКА!
+NAME = #ИМЯ?
+NUM = #ЧИСЛО!
+NA = #Н/Д
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
index 3597dbf89..9f05d5afa 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
@@ -1,416 +1,555 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
+## PhpSpreadsheet - function name translations
 ##
+## русский язык (Russian)
 ##
+############################################################
 
 
 ##
-##	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 = ДАТА
+DATEDIF = РАЗНДАТ
+DATESTRING = СТРОКАДАННЫХ
+DATEVALUE = ДАТАЗНАЧ
+DAY = ДЕНЬ
+DAYS = ДНИ
+DAYS360 = ДНЕЙ360
+EDATE = ДАТАМЕС
+EOMONTH = КОНМЕСЯЦА
+HOUR = ЧАС
+ISOWEEKNUM = НОМНЕДЕЛИ.ISO
+MINUTE = МИНУТЫ
+MONTH = МЕСЯЦ
+NETWORKDAYS = ЧИСТРАБДНИ
+NETWORKDAYS.INTL = ЧИСТРАБДНИ.МЕЖД
+NOW = ТДАТА
+SECOND = СЕКУНДЫ
+THAIDAYOFWEEK = ТАЙДЕНЬНЕД
+THAIMONTHOFYEAR = ТАЙМЕСЯЦ
+THAIYEAR = ТАЙГОД
+TIME = ВРЕМЯ
+TIMEVALUE = ВРЕМЗНАЧ
+TODAY = СЕГОДНЯ
+WEEKDAY = ДЕНЬНЕД
+WEEKNUM = НОМНЕДЕЛИ
+WORKDAY = РАБДЕНЬ
+WORKDAY.INTL = РАБДЕНЬ.МЕЖД
+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 = ДВ.В.ВОСЬМ
+BITAND = БИТ.И
+BITLSHIFT = БИТ.СДВИГЛ
+BITOR = БИТ.ИЛИ
+BITRSHIFT = БИТ.СДВИГП
+BITXOR = БИТ.ИСКЛИЛИ
+COMPLEX = КОМПЛЕКСН
+CONVERT = ПРЕОБР
+DEC2BIN = ДЕС.В.ДВ
+DEC2HEX = ДЕС.В.ШЕСТН
+DEC2OCT = ДЕС.В.ВОСЬМ
+DELTA = ДЕЛЬТА
+ERF = ФОШ
+ERF.PRECISE = ФОШ.ТОЧН
+ERFC = ДФОШ
+ERFC.PRECISE = ДФОШ.ТОЧН
+GESTEP = ПОРОГ
+HEX2BIN = ШЕСТН.В.ДВ
+HEX2DEC = ШЕСТН.В.ДЕС
+HEX2OCT = ШЕСТН.В.ВОСЬМ
+IMABS = МНИМ.ABS
+IMAGINARY = МНИМ.ЧАСТЬ
+IMARGUMENT = МНИМ.АРГУМЕНТ
+IMCONJUGATE = МНИМ.СОПРЯЖ
+IMCOS = МНИМ.COS
+IMCOSH = МНИМ.COSH
+IMCOT = МНИМ.COT
+IMCSC = МНИМ.CSC
+IMCSCH = МНИМ.CSCH
+IMDIV = МНИМ.ДЕЛ
+IMEXP = МНИМ.EXP
+IMLN = МНИМ.LN
+IMLOG10 = МНИМ.LOG10
+IMLOG2 = МНИМ.LOG2
+IMPOWER = МНИМ.СТЕПЕНЬ
+IMPRODUCT = МНИМ.ПРОИЗВЕД
+IMREAL = МНИМ.ВЕЩ
+IMSEC = МНИМ.SEC
+IMSECH = МНИМ.SECH
+IMSIN = МНИМ.SIN
+IMSINH = МНИМ.SINH
+IMSQRT = МНИМ.КОРЕНЬ
+IMSUB = МНИМ.РАЗН
+IMSUM = МНИМ.СУММ
+IMTAN = МНИМ.TAN
+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 = ДОХОДПОСЛНЕРЕГ
+PDURATION = ПДЛИТ
+PMT = ПЛТ
+PPMT = ОСПЛТ
+PRICE = ЦЕНА
+PRICEDISC = ЦЕНАСКИДКА
+PRICEMAT = ЦЕНАПОГАШ
+PV = ПС
+RATE = СТАВКА
+RECEIVED = ПОЛУЧЕНО
+RRI = ЭКВ.СТАВКА
+SLN = АПЛ
+SYD = АСЧ
+TBILLEQ = РАВНОКЧЕК
+TBILLPRICE = ЦЕНАКЧЕК
+TBILLYIELD = ДОХОДКЧЕК
+USDOLLAR = ДОЛЛСША
+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 = ЕЧЁТН
+ISFORMULA = ЕФОРМУЛА
+ISLOGICAL = ЕЛОГИЧ
+ISNA = ЕНД
+ISNONTEXT = ЕНЕТЕКСТ
+ISNUMBER = ЕЧИСЛО
+ISODD = ЕНЕЧЁТ
+ISREF = ЕССЫЛКА
+ISTEXT = ЕТЕКСТ
+N = Ч
+NA = НД
+SHEET = ЛИСТ
+SHEETS = ЛИСТЫ
+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 = ЕСЛИОШИБКА
+IFNA = ЕСНД
+IFS = УСЛОВИЯ
+NOT = НЕ
+OR = ИЛИ
+SWITCH = ПЕРЕКЛЮЧ
+TRUE = ИСТИНА
+XOR = ИСКЛИЛИ
 
 ##
-##	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 = ЧИСЛСТОЛБ
+FILTER = ФИЛЬТР
+FORMULATEXT = Ф.ТЕКСТ
+GETPIVOTDATA = ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ
+HLOOKUP = ГПР
+HYPERLINK = ГИПЕРССЫЛКА
+INDEX = ИНДЕКС
+INDIRECT = ДВССЫЛ
+LOOKUP = ПРОСМОТР
+MATCH = ПОИСКПОЗ
+OFFSET = СМЕЩ
+ROW = СТРОКА
+ROWS = ЧСТРОК
+RTD = ДРВ
+SORT = СОРТ
+SORTBY = СОРТПО
+TRANSPOSE = ТРАНСП
+UNIQUE = УНИК
+VLOOKUP = ВПР
+XLOOKUP = ПРОСМОТРX
+XMATCH = ПОИСКПОЗX
 
 ##
-##	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
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = АГРЕГАТ
+ARABIC = АРАБСКОЕ
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = ОСНОВАНИЕ
+CEILING.MATH = ОКРВВЕРХ.МАТ
+CEILING.PRECISE = ОКРВВЕРХ.ТОЧН
+COMBIN = ЧИСЛКОМБ
+COMBINA = ЧИСЛКОМБА
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = ДЕС
+DEGREES = ГРАДУСЫ
+ECMA.CEILING = ECMA.ОКРВВЕРХ
+EVEN = ЧЁТН
+EXP = EXP
+FACT = ФАКТР
+FACTDOUBLE = ДВФАКТР
+FLOOR.MATH = ОКРВНИЗ.МАТ
+FLOOR.PRECISE = ОКРВНИЗ.ТОЧН
+GCD = НОД
+INT = ЦЕЛОЕ
+ISO.CEILING = ISO.ОКРВВЕРХ
+LCM = НОК
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = МОПРЕД
+MINVERSE = МОБР
+MMULT = МУМНОЖ
+MOD = ОСТАТ
+MROUND = ОКРУГЛТ
+MULTINOMIAL = МУЛЬТИНОМ
+MUNIT = МЕДИН
+ODD = НЕЧЁТ
+PI = ПИ
+POWER = СТЕПЕНЬ
+PRODUCT = ПРОИЗВЕД
+QUOTIENT = ЧАСТНОЕ
+RADIANS = РАДИАНЫ
+RAND = СЛЧИС
+RANDARRAY = СЛУЧМАССИВ
+RANDBETWEEN = СЛУЧМЕЖДУ
+ROMAN = РИМСКОЕ
+ROUND = ОКРУГЛ
+ROUNDBAHTDOWN = ОКРУГЛБАТВНИЗ
+ROUNDBAHTUP = ОКРУГЛБАТВВЕРХ
+ROUNDDOWN = ОКРУГЛВНИЗ
+ROUNDUP = ОКРУГЛВВЕРХ
+SEC = SEC
+SECH = SECH
+SERIESSUM = РЯД.СУММ
+SEQUENCE = ПОСЛЕДОВ
+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 = СРЗНАЧЕСЛИМН
+BETA.DIST = БЕТА.РАСП
+BETA.INV = БЕТА.ОБР
+BINOM.DIST = БИНОМ.РАСП
+BINOM.DIST.RANGE = БИНОМ.РАСП.ДИАП
+BINOM.INV = БИНОМ.ОБР
+CHISQ.DIST = ХИ2.РАСП
+CHISQ.DIST.RT = ХИ2.РАСП.ПХ
+CHISQ.INV = ХИ2.ОБР
+CHISQ.INV.RT = ХИ2.ОБР.ПХ
+CHISQ.TEST = ХИ2.ТЕСТ
+CONFIDENCE.NORM = ДОВЕРИТ.НОРМ
+CONFIDENCE.T = ДОВЕРИТ.СТЬЮДЕНТ
+CORREL = КОРРЕЛ
+COUNT = СЧЁТ
+COUNTA = СЧЁТЗ
+COUNTBLANK = СЧИТАТЬПУСТОТЫ
+COUNTIF = СЧЁТЕСЛИ
+COUNTIFS = СЧЁТЕСЛИМН
+COVARIANCE.P = КОВАРИАЦИЯ.Г
+COVARIANCE.S = КОВАРИАЦИЯ.В
+DEVSQ = КВАДРОТКЛ
+EXPON.DIST = ЭКСП.РАСП
+F.DIST = F.РАСП
+F.DIST.RT = F.РАСП.ПХ
+F.INV = F.ОБР
+F.INV.RT = F.ОБР.ПХ
+F.TEST = F.ТЕСТ
+FISHER = ФИШЕР
+FISHERINV = ФИШЕРОБР
+FORECAST.ETS = ПРЕДСКАЗ.ETS
+FORECAST.ETS.CONFINT = ПРЕДСКАЗ.ЕTS.ДОВИНТЕРВАЛ
+FORECAST.ETS.SEASONALITY = ПРЕДСКАЗ.ETS.СЕЗОННОСТЬ
+FORECAST.ETS.STAT = ПРЕДСКАЗ.ETS.СТАТ
+FORECAST.LINEAR = ПРЕДСКАЗ.ЛИНЕЙН
+FREQUENCY = ЧАСТОТА
+GAMMA = ГАММА
+GAMMA.DIST = ГАММА.РАСП
+GAMMA.INV = ГАММА.ОБР
+GAMMALN = ГАММАНЛОГ
+GAMMALN.PRECISE = ГАММАНЛОГ.ТОЧН
+GAUSS = ГАУСС
+GEOMEAN = СРГЕОМ
+GROWTH = РОСТ
+HARMEAN = СРГАРМ
+HYPGEOM.DIST = ГИПЕРГЕОМ.РАСП
+INTERCEPT = ОТРЕЗОК
+KURT = ЭКСЦЕСС
+LARGE = НАИБОЛЬШИЙ
+LINEST = ЛИНЕЙН
+LOGEST = ЛГРФПРИБЛ
+LOGNORM.DIST = ЛОГНОРМ.РАСП
+LOGNORM.INV = ЛОГНОРМ.ОБР
+MAX = МАКС
+MAXA = МАКСА
+MAXIFS = МАКСЕСЛИ
+MEDIAN = МЕДИАНА
+MIN = МИН
+MINA = МИНА
+MINIFS = МИНЕСЛИ
+MODE.MULT = МОДА.НСК
+MODE.SNGL = МОДА.ОДН
+NEGBINOM.DIST = ОТРБИНОМ.РАСП
+NORM.DIST = НОРМ.РАСП
+NORM.INV = НОРМ.ОБР
+NORM.S.DIST = НОРМ.СТ.РАСП
+NORM.S.INV = НОРМ.СТ.ОБР
+PEARSON = PEARSON
+PERCENTILE.EXC = ПРОЦЕНТИЛЬ.ИСКЛ
+PERCENTILE.INC = ПРОЦЕНТИЛЬ.ВКЛ
+PERCENTRANK.EXC = ПРОЦЕНТРАНГ.ИСКЛ
+PERCENTRANK.INC = ПРОЦЕНТРАНГ.ВКЛ
+PERMUT = ПЕРЕСТ
+PERMUTATIONA = ПЕРЕСТА
+PHI = ФИ
+POISSON.DIST = ПУАССОН.РАСП
+PROB = ВЕРОЯТНОСТЬ
+QUARTILE.EXC = КВАРТИЛЬ.ИСКЛ
+QUARTILE.INC = КВАРТИЛЬ.ВКЛ
+RANK.AVG = РАНГ.СР
+RANK.EQ = РАНГ.РВ
+RSQ = КВПИРСОН
+SKEW = СКОС
+SKEW.P = СКОС.Г
+SLOPE = НАКЛОН
+SMALL = НАИМЕНЬШИЙ
+STANDARDIZE = НОРМАЛИЗАЦИЯ
+STDEV.P = СТАНДОТКЛОН.Г
+STDEV.S = СТАНДОТКЛОН.В
+STDEVA = СТАНДОТКЛОНА
+STDEVPA = СТАНДОТКЛОНПА
+STEYX = СТОШYX
+T.DIST = СТЬЮДЕНТ.РАСП
+T.DIST.2T = СТЬЮДЕНТ.РАСП.2Х
+T.DIST.RT = СТЬЮДЕНТ.РАСП.ПХ
+T.INV = СТЬЮДЕНТ.ОБР
+T.INV.2T = СТЬЮДЕНТ.ОБР.2Х
+T.TEST = СТЬЮДЕНТ.ТЕСТ
+TREND = ТЕНДЕНЦИЯ
+TRIMMEAN = УРЕЗСРЕДНЕЕ
+VAR.P = ДИСП.Г
+VAR.S = ДИСП.В
+VARA = ДИСПА
+VARPA = ДИСПРА
+WEIBULL.DIST = ВЕЙБУЛЛ.РАСП
+Z.TEST = Z.ТЕСТ
 
 ##
-##	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-теста.
-
+ARRAYTOTEXT = МАССИВВТЕКСТ
+BAHTTEXT = БАТТЕКСТ
+CHAR = СИМВОЛ
+CLEAN = ПЕЧСИМВ
+CODE = КОДСИМВ
+CONCAT = СЦЕП
+DBCS = БДЦС
+DOLLAR = РУБЛЬ
+EXACT = СОВПАД
+FIND = НАЙТИ
+FINDB = НАЙТИБ
+FIXED = ФИКСИРОВАННЫЙ
+ISTHAIDIGIT = ЕТАЙЦИФРЫ
+LEFT = ЛЕВСИМВ
+LEFTB = ЛЕВБ
+LEN = ДЛСТР
+LENB = ДЛИНБ
+LOWER = СТРОЧН
+MID = ПСТР
+MIDB = ПСТРБ
+NUMBERSTRING = СТРОКАЧИСЕЛ
+NUMBERVALUE = ЧЗНАЧ
+PROPER = ПРОПНАЧ
+REPLACE = ЗАМЕНИТЬ
+REPLACEB = ЗАМЕНИТЬБ
+REPT = ПОВТОР
+RIGHT = ПРАВСИМВ
+RIGHTB = ПРАВБ
+SEARCH = ПОИСК
+SEARCHB = ПОИСКБ
+SUBSTITUTE = ПОДСТАВИТЬ
+T = Т
+TEXT = ТЕКСТ
+TEXTJOIN = ОБЪЕДИНИТЬ
+THAIDIGIT = ТАЙЦИФРА
+THAINUMSOUND = ТАЙЧИСЛОВЗВУК
+THAINUMSTRING = ТАЙЧИСЛОВСТРОКУ
+THAISTRINGLENGTH = ТАЙДЛИНАСТРОКИ
+TRIM = СЖПРОБЕЛЫ
+UNICHAR = ЮНИСИМВ
+UNICODE = UNICODE
+UPPER = ПРОПИСН
+VALUE = ЗНАЧЕН
+VALUETOTEXT = ЗНАЧЕНИЕВТЕКСТ
 
 ##
-##	Text functions						Текстовые функции
+## Веб-функции (Web 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			= ЗНАЧЕН				##	Преобразует текстовый аргумент в число.
+ENCODEURL = КОДИР.URL
+FILTERXML = ФИЛЬТР.XML
+WEBSERVICE = ВЕБСЛУЖБА
+
+##
+## Функции совместимости (Compatibility Functions)
+##
+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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config
index bf72cc4f1..c7440f71c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Svenska (Swedish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #Skärning!
-DIV0	= #Division/0!
-VALUE	= #Värdefel!
-REF	= #Referens!
-NAME	= #Namn?
-NUM	= #Ogiltigt!
-NA	= #Saknas!
+NULL = #SKÄRNING!
+DIV0 = #DIVISION/0!
+VALUE = #VÄRDEFEL!
+REF = #REFERENS!
+NAME = #NAMN?
+NUM = #OGILTIGT!
+NA = #SAKNAS!
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
index 73b2deb5e..491ecfb93 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
@@ -1,408 +1,533 @@
+############################################################
 ##
-##	Add-in and Automation functions			Tilläggs- och automatiseringsfunktioner
+## PhpSpreadsheet - function name translations
 ##
-GETPIVOTDATA		= HÄMTA.PIVOTDATA		##	Returnerar data som lagrats i en pivottabellrapport
+## Svenska (Swedish)
+##
+############################################################
 
 
 ##
-##	Cube functions					Kubfunktioner
+## Kubfunktioner (Cube Functions)
 ##
-CUBEKPIMEMBER		= KUBKPIMEDLEM			##	Returnerar namn, egenskap och mått för en KPI och visar namnet och egenskapen i cellen. En KPI, eller prestandaindikator, är ett kvantifierbart mått, t.ex. månatlig bruttovinst eller personalomsättning per kvartal, som används för att analysera ett företags resultat.
-CUBEMEMBER		= KUBMEDLEM			##	Returnerar en medlem eller ett par i en kubhierarki. Används för att verifiera att medlemmen eller paret finns i kuben.
-CUBEMEMBERPROPERTY	= KUBMEDLEMSEGENSKAP		##	Returnerar värdet för en medlemsegenskap i kuben. Används för att verifiera att ett medlemsnamn finns i kuben, samt för att returnera den angivna egenskapen för medlemmen.
-CUBERANKEDMEMBER	= KUBRANGORDNADMEDLEM		##	Returnerar den n:te, eller rangordnade, medlemmen i en uppsättning. Används för att returnera ett eller flera element i en uppsättning, till exempelvis den bästa försäljaren eller de tio bästa eleverna.
-CUBESET			= KUBINSTÄLLNING		##	Definierar en beräknad uppsättning medlemmar eller par genom att skicka ett bestämt uttryck till kuben på servern, som skapar uppsättningen och sedan returnerar den till Microsoft Office Excel.
-CUBESETCOUNT		= KUBINSTÄLLNINGANTAL		##	Returnerar antalet objekt i en uppsättning.
-CUBEVALUE		= KUBVÄRDE			##	Returnerar ett mängdvärde från en kub.
-
+CUBEKPIMEMBER = KUBKPIMEDLEM
+CUBEMEMBER = KUBMEDLEM
+CUBEMEMBERPROPERTY = KUBMEDLEMSEGENSKAP
+CUBERANKEDMEMBER = KUBRANGORDNADMEDLEM
+CUBESET = KUBUPPSÄTTNING
+CUBESETCOUNT = KUBUPPSÄTTNINGANTAL
+CUBEVALUE = KUBVÄRDE
 
 ##
-##	Database functions				Databasfunktioner
+## Databasfunktioner (Database Functions)
 ##
-DAVERAGE		= DMEDEL			##	Returnerar medelvärdet av databasposterna
-DCOUNT			= DANTAL			##	Räknar antalet celler som innehåller tal i en databas
-DCOUNTA			= DANTALV			##	Räknar ifyllda celler i en databas
-DGET			= DHÄMTA			##	Hämtar en enstaka post från en databas som uppfyller de angivna villkoren
-DMAX			= DMAX				##	Returnerar det största värdet från databasposterna
-DMIN			= DMIN				##	Returnerar det minsta värdet från databasposterna
-DPRODUCT		= DPRODUKT			##	Multiplicerar värdena i ett visst fält i poster som uppfyller villkoret
-DSTDEV			= DSTDAV			##	Uppskattar standardavvikelsen baserat på ett urval av databasposterna
-DSTDEVP			= DSTDAVP			##	Beräknar standardavvikelsen utifrån hela populationen av valda databasposter
-DSUM			= DSUMMA			##	Summerar talen i kolumnfält i databasposter som uppfyller villkoret
-DVAR			= DVARIANS			##	Uppskattar variansen baserat på ett urval av databasposterna
-DVARP			= DVARIANSP			##	Beräknar variansen utifrån hela populationen av valda databasposter
-
+DAVERAGE = DMEDEL
+DCOUNT = DANTAL
+DCOUNTA = DANTALV
+DGET = DHÄMTA
+DMAX = DMAX
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAV
+DSTDEVP = DSTDAVP
+DSUM = DSUMMA
+DVAR = DVARIANS
+DVARP = DVARIANSP
 
 ##
-##	Date and time functions				Tid- och datumfunktioner
+## Tid- och datumfunktioner (Date & Time Functions)
 ##
-DATE			= DATUM				##	Returnerar ett serienummer för ett visst datum
-DATEVALUE		= DATUMVÄRDE			##	Konverterar ett datum i textformat till ett serienummer
-DAY			= DAG				##	Konverterar ett serienummer till dag i månaden
-DAYS360			= DAGAR360			##	Beräknar antalet dagar mellan två datum baserat på ett 360-dagarsår
-EDATE			= EDATUM			##	Returnerar serienumret för ett datum som infaller ett visst antal månader före eller efter startdatumet
-EOMONTH			= SLUTMÅNAD			##	Returnerar serienumret för sista dagen i månaden ett visst antal månader tidigare eller senare
-HOUR			= TIMME				##	Konverterar ett serienummer till en timme
-MINUTE			= MINUT				##	Konverterar ett serienummer till en minut
-MONTH			= MÅNAD				##	Konverterar ett serienummer till en månad
-NETWORKDAYS		= NETTOARBETSDAGAR		##	Returnerar antalet hela arbetsdagar mellan två datum
-NOW			= NU				##	Returnerar serienumret för dagens datum och aktuell tid
-SECOND			= SEKUND			##	Konverterar ett serienummer till en sekund
-TIME			= KLOCKSLAG			##	Returnerar serienumret för en viss tid
-TIMEVALUE		= TIDVÄRDE			##	Konverterar en tid i textformat till ett serienummer
-TODAY			= IDAG				##	Returnerar serienumret för dagens datum
-WEEKDAY			= VECKODAG			##	Konverterar ett serienummer till en dag i veckan
-WEEKNUM			= VECKONR			##	Konverterar ett serienummer till ett veckonummer
-WORKDAY			= ARBETSDAGAR			##	Returnerar serienumret för ett datum ett visst antal arbetsdagar tidigare eller senare
-YEAR			= ÅR				##	Konverterar ett serienummer till ett år
-YEARFRAC		= ÅRDEL				##	Returnerar en del av ett år som representerar antalet hela dagar mellan start- och slutdatum
-
+DATE = DATUM
+DATEVALUE = DATUMVÄRDE
+DAY = DAG
+DAYS = DAGAR
+DAYS360 = DAGAR360
+EDATE = EDATUM
+EOMONTH = SLUTMÅNAD
+HOUR = TIMME
+ISOWEEKNUM = ISOVECKONR
+MINUTE = MINUT
+MONTH = MÅNAD
+NETWORKDAYS = NETTOARBETSDAGAR
+NETWORKDAYS.INTL = NETTOARBETSDAGAR.INT
+NOW = NU
+SECOND = SEKUND
+THAIDAYOFWEEK = THAIVECKODAG
+THAIMONTHOFYEAR = THAIMÅNAD
+THAIYEAR = THAIÅR
+TIME = KLOCKSLAG
+TIMEVALUE = TIDVÄRDE
+TODAY = IDAG
+WEEKDAY = VECKODAG
+WEEKNUM = VECKONR
+WORKDAY = ARBETSDAGAR
+WORKDAY.INTL = ARBETSDAGAR.INT
+YEAR = ÅR
+YEARFRAC = ÅRDEL
 
 ##
-##	Engineering functions				Tekniska funktioner
+## Tekniska funktioner (Engineering Functions)
 ##
-BESSELI			= BESSELI			##	Returnerar den modifierade Bessel-funktionen In(x)
-BESSELJ			= BESSELJ			##	Returnerar Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerar den modifierade Bessel-funktionen Kn(x)
-BESSELY			= BESSELY			##	Returnerar Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TILL.DEC			##	Omvandlar ett binärt tal till decimalt
-BIN2HEX			= BIN.TILL.HEX			##	Omvandlar ett binärt tal till hexadecimalt
-BIN2OCT			= BIN.TILL.OKT			##	Omvandlar ett binärt tal till oktalt
-COMPLEX			= KOMPLEX			##	Omvandlar reella och imaginära koefficienter till ett komplext tal
-CONVERT			= KONVERTERA			##	Omvandlar ett tal från ett måttsystem till ett annat
-DEC2BIN			= DEC.TILL.BIN			##	Omvandlar ett decimalt tal till binärt
-DEC2HEX			= DEC.TILL.HEX			##	Omvandlar ett decimalt tal till hexadecimalt
-DEC2OCT			= DEC.TILL.OKT			##	Omvandlar ett decimalt tal till oktalt
-DELTA			= DELTA				##	Testar om två värden är lika
-ERF			= FELF				##	Returnerar felfunktionen
-ERFC			= FELFK				##	Returnerar den komplementära felfunktionen
-GESTEP			= SLSTEG			##	Testar om ett tal är större än ett tröskelvärde
-HEX2BIN			= HEX.TILL.BIN			##	Omvandlar ett hexadecimalt tal till binärt
-HEX2DEC			= HEX.TILL.DEC			##	Omvandlar ett hexadecimalt tal till decimalt
-HEX2OCT			= HEX.TILL.OKT			##	Omvandlar ett hexadecimalt tal till oktalt
-IMABS			= IMABS				##	Returnerar absolutvärdet (modulus) för ett komplext tal
-IMAGINARY		= IMAGINÄR			##	Returnerar den imaginära koefficienten för ett komplext tal
-IMARGUMENT		= IMARGUMENT			##	Returnerar det komplexa talets argument, en vinkel uttryckt i radianer
-IMCONJUGATE		= IMKONJUGAT			##	Returnerar det komplexa talets konjugat
-IMCOS			= IMCOS				##	Returnerar cosinus för ett komplext tal
-IMDIV			= IMDIV				##	Returnerar kvoten för två komplexa tal
-IMEXP			= IMEUPPHÖJT			##	Returnerar exponenten för ett komplext tal
-IMLN			= IMLN				##	Returnerar den naturliga logaritmen för ett komplext tal
-IMLOG10			= IMLOG10			##	Returnerar 10-logaritmen för ett komplext tal
-IMLOG2			= IMLOG2			##	Returnerar 2-logaritmen för ett komplext tal
-IMPOWER			= IMUPPHÖJT			##	Returnerar ett komplext tal upphöjt till en exponent
-IMPRODUCT		= IMPRODUKT			##	Returnerar produkten av komplexa tal
-IMREAL			= IMREAL			##	Returnerar den reella koefficienten för ett komplext tal
-IMSIN			= IMSIN				##	Returnerar sinus för ett komplext tal
-IMSQRT			= IMROT				##	Returnerar kvadratroten av ett komplext tal
-IMSUB			= IMDIFF			##	Returnerar differensen mellan två komplexa tal
-IMSUM			= IMSUM				##	Returnerar summan av komplexa tal
-OCT2BIN			= OKT.TILL.BIN			##	Omvandlar ett oktalt tal till binärt
-OCT2DEC			= OKT.TILL.DEC			##	Omvandlar ett oktalt tal till decimalt
-OCT2HEX			= OKT.TILL.HEX			##	Omvandlar ett oktalt tal till hexadecimalt
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.TILL.DEC
+BIN2HEX = BIN.TILL.HEX
+BIN2OCT = BIN.TILL.OKT
+BITAND = BITOCH
+BITLSHIFT = BITVSKIFT
+BITOR = BITELLER
+BITRSHIFT = BITHSKIFT
+BITXOR = BITXELLER
+COMPLEX = KOMPLEX
+CONVERT = KONVERTERA
+DEC2BIN = DEC.TILL.BIN
+DEC2HEX = DEC.TILL.HEX
+DEC2OCT = DEC.TILL.OKT
+DELTA = DELTA
+ERF = FELF
+ERF.PRECISE = FELF.EXAKT
+ERFC = FELFK
+ERFC.PRECISE = FELFK.EXAKT
+GESTEP = SLSTEG
+HEX2BIN = HEX.TILL.BIN
+HEX2DEC = HEX.TILL.DEC
+HEX2OCT = HEX.TILL.OKT
+IMABS = IMABS
+IMAGINARY = IMAGINÄR
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGAT
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEUPPHÖJT
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMUPPHÖJT
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREAL
+IMSEC = IMSEK
+IMSECH = IMSEKH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMROT
+IMSUB = IMDIFF
+IMSUM = IMSUM
+IMTAN = IMTAN
+OCT2BIN = OKT.TILL.BIN
+OCT2DEC = OKT.TILL.DEC
+OCT2HEX = OKT.TILL.HEX
 
 ##
-##	Financial functions				Finansiella funktioner
+## Finansiella funktioner (Financial Functions)
 ##
-ACCRINT			= UPPLRÄNTA			##	Returnerar den upplupna räntan för värdepapper med periodisk ränta
-ACCRINTM		= UPPLOBLRÄNTA			##	Returnerar den upplupna räntan för ett värdepapper som ger avkastning på förfallodagen
-AMORDEGRC		= AMORDEGRC			##	Returnerar avskrivningen för varje redovisningsperiod med hjälp av en avskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerar avskrivningen för varje redovisningsperiod
-COUPDAYBS		= KUPDAGBB			##	Returnerar antal dagar från början av kupongperioden till likviddagen
-COUPDAYS		= KUPDAGARS			##	Returnerar antalet dagar i kupongperioden som innehåller betalningsdatumet
-COUPDAYSNC		= KUPDAGNK			##	Returnerar antalet dagar från betalningsdatumet till nästa kupongdatum
-COUPNCD			= KUPNKD			##	Returnerar nästa kupongdatum efter likviddagen
-COUPNUM			= KUPANT			##	Returnerar kuponger som förfaller till betalning mellan likviddagen och förfallodagen
-COUPPCD			= KUPFKD			##	Returnerar föregående kupongdatum före likviddagen
-CUMIPMT			= KUMRÄNTA			##	Returnerar den ackumulerade räntan som betalats mellan två perioder
-CUMPRINC		= KUMPRIS			##	Returnerar det ackumulerade kapitalbeloppet som betalats på ett lån mellan två perioder
-DB			= DB				##	Returnerar avskrivningen för en tillgång under en angiven tid enligt metoden för fast degressiv avskrivning
-DDB			= DEGAVSKR			##	Returnerar en tillgångs värdeminskning under en viss period med hjälp av dubbel degressiv avskrivning eller någon annan metod som du anger
-DISC			= DISK				##	Returnerar diskonteringsräntan för ett värdepapper
-DOLLARDE		= DECTAL			##	Omvandlar ett pris uttryckt som ett bråk till ett decimaltal
-DOLLARFR		= BRÅK				##	Omvandlar ett pris i kronor uttryckt som ett decimaltal till ett bråk
-DURATION		= LÖPTID			##	Returnerar den årliga löptiden för en säkerhet med periodiska räntebetalningar
-EFFECT			= EFFRÄNTA			##	Returnerar den årliga effektiva räntesatsen
-FV			= SLUTVÄRDE			##	Returnerar det framtida värdet på en investering
-FVSCHEDULE		= FÖRRÄNTNING			##	Returnerar det framtida värdet av ett begynnelsekapital beräknat på olika räntenivåer
-INTRATE			= ÅRSRÄNTA			##	Returnerar räntesatsen för ett betalt värdepapper
-IPMT			= RBETALNING			##	Returnerar räntedelen av en betalning för en given period
-IRR			= IR				##	Returnerar internräntan för en serie betalningar
-ISPMT			= RALÅN				##	Beräknar räntan som har betalats under en specifik betalningsperiod
-MDURATION		= MLÖPTID			##	Returnerar den modifierade Macauley-löptiden för ett värdepapper med det antagna nominella värdet 100 kr
-MIRR			= MODIR				##	Returnerar internräntan där positiva och negativa betalningar finansieras med olika räntor
-NOMINAL			= NOMRÄNTA			##	Returnerar den årliga nominella räntesatsen
-NPER			= PERIODER			##	Returnerar antalet perioder för en investering
-NPV			= NETNUVÄRDE			##	Returnerar nuvärdet av en serie periodiska betalningar vid en given diskonteringsränta
-ODDFPRICE		= UDDAFPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda första period
-ODDFYIELD		= UDDAFAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda första period
-ODDLPRICE		= UDDASPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda sista period
-ODDLYIELD		= UDDASAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda sista period
-PMT			= BETALNING			##	Returnerar den periodiska betalningen för en annuitet
-PPMT			= AMORT				##	Returnerar amorteringsdelen av en annuitetsbetalning för en given period
-PRICE			= PRIS				##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger periodisk ränta
-PRICEDISC		= PRISDISK			##	Returnerar priset per 100 kr nominellt värde för ett diskonterat värdepapper
-PRICEMAT		= PRISFÖRF			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger ränta på förfallodagen
-PV			= PV				##	Returnerar nuvärdet av en serie lika stora periodiska betalningar
-RATE			= RÄNTA				##	Returnerar räntesatsen per period i en annuitet
-RECEIVED		= BELOPP			##	Returnerar beloppet som utdelas på förfallodagen för ett betalat värdepapper
-SLN			= LINAVSKR			##	Returnerar den linjära avskrivningen för en tillgång under en period
-SYD			= ÅRSAVSKR			##	Returnerar den årliga avskrivningssumman för en tillgång under en angiven period
-TBILLEQ			= SSVXEKV			##	Returnerar avkastningen motsvarande en obligation för en statsskuldväxel
-TBILLPRICE		= SSVXPRIS			##	Returnerar priset per 100 kr nominellt värde för en statsskuldväxel
-TBILLYIELD		= SSVXRÄNTA			##	Returnerar avkastningen för en statsskuldväxel
-VDB			= VDEGRAVSKR			##	Returnerar avskrivningen för en tillgång under en angiven period (med degressiv avskrivning)
-XIRR			= XIRR				##	Returnerar internräntan för en serie betalningar som inte nödvändigtvis är periodiska
-XNPV			= XNUVÄRDE			##	Returnerar det nuvarande nettovärdet för en serie betalningar som inte nödvändigtvis är periodiska
-YIELD			= NOMAVK			##	Returnerar avkastningen för ett värdepapper som ger periodisk ränta
-YIELDDISC		= NOMAVKDISK			##	Returnerar den årliga avkastningen för diskonterade värdepapper, exempelvis en statsskuldväxel
-YIELDMAT		= NOMAVKFÖRF			##	Returnerar den årliga avkastningen för ett värdepapper som ger ränta på förfallodagen
-
+ACCRINT = UPPLRÄNTA
+ACCRINTM = UPPLOBLRÄNTA
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPDAGBB
+COUPDAYS = KUPDAGB
+COUPDAYSNC = KUPDAGNK
+COUPNCD = KUPNKD
+COUPNUM = KUPANT
+COUPPCD = KUPFKD
+CUMIPMT = KUMRÄNTA
+CUMPRINC = KUMPRIS
+DB = DB
+DDB = DEGAVSKR
+DISC = DISK
+DOLLARDE = DECTAL
+DOLLARFR = BRÅK
+DURATION = LÖPTID
+EFFECT = EFFRÄNTA
+FV = SLUTVÄRDE
+FVSCHEDULE = FÖRRÄNTNING
+INTRATE = ÅRSRÄNTA
+IPMT = RBETALNING
+IRR = IR
+ISPMT = RALÅN
+MDURATION = MLÖPTID
+MIRR = MODIR
+NOMINAL = NOMRÄNTA
+NPER = PERIODER
+NPV = NETNUVÄRDE
+ODDFPRICE = UDDAFPRIS
+ODDFYIELD = UDDAFAVKASTNING
+ODDLPRICE = UDDASPRIS
+ODDLYIELD = UDDASAVKASTNING
+PDURATION = PLÖPTID
+PMT = BETALNING
+PPMT = AMORT
+PRICE = PRIS
+PRICEDISC = PRISDISK
+PRICEMAT = PRISFÖRF
+PV = NUVÄRDE
+RATE = RÄNTA
+RECEIVED = BELOPP
+RRI = AVKPÅINVEST
+SLN = LINAVSKR
+SYD = ÅRSAVSKR
+TBILLEQ = SSVXEKV
+TBILLPRICE = SSVXPRIS
+TBILLYIELD = SSVXRÄNTA
+VDB = VDEGRAVSKR
+XIRR = XIRR
+XNPV = XNUVÄRDE
+YIELD = NOMAVK
+YIELDDISC = NOMAVKDISK
+YIELDMAT = NOMAVKFÖRF
 
 ##
-##	Information functions				Informationsfunktioner
+## Informationsfunktioner (Information Functions)
 ##
-CELL			= CELL				##	Returnerar information om formatering, plats och innehåll i en cell
-ERROR.TYPE		= FEL.TYP			##	Returnerar ett tal som motsvarar ett felvärde
-INFO			= INFO				##	Returnerar information om operativsystemet
-ISBLANK			= ÄRREF				##	Returnerar SANT om värdet är tomt
-ISERR			= Ä				##	Returnerar SANT om värdet är ett felvärde annat än #SAKNAS!
-ISERROR			= ÄRFEL				##	Returnerar SANT om värdet är ett felvärde
-ISEVEN			= ÄRJÄMN			##	Returnerar SANT om talet är jämnt
-ISLOGICAL		= ÄREJTEXT			##	Returnerar SANT om värdet är ett logiskt värde
-ISNA			= ÄRLOGISK			##	Returnerar SANT om värdet är felvärdet #SAKNAS!
-ISNONTEXT		= ÄRSAKNAD			##	Returnerar SANT om värdet inte är text
-ISNUMBER		= ÄRTAL				##	Returnerar SANT om värdet är ett tal
-ISODD			= ÄRUDDA			##	Returnerar SANT om talet är udda
-ISREF			= ÄRTOM				##	Returnerar SANT om värdet är en referens
-ISTEXT			= ÄRTEXT			##	Returnerar SANT om värdet är text
-N			= N				##	Returnerar ett värde omvandlat till ett tal
-NA			= SAKNAS			##	Returnerar felvärdet #SAKNAS!
-TYPE			= VÄRDETYP			##	Returnerar ett tal som anger värdets datatyp
-
+CELL = CELL
+ERROR.TYPE = FEL.TYP
+INFO = INFO
+ISBLANK = ÄRTOM
+ISERR = ÄRF
+ISERROR = ÄRFEL
+ISEVEN = ÄRJÄMN
+ISFORMULA = ÄRFORMEL
+ISLOGICAL = ÄRLOGISK
+ISNA = ÄRSAKNAD
+ISNONTEXT = ÄREJTEXT
+ISNUMBER = ÄRTAL
+ISODD = ÄRUDDA
+ISREF = ÄRREF
+ISTEXT = ÄRTEXT
+N = N
+NA = SAKNAS
+SHEET = BLAD
+SHEETS = ANTALBLAD
+TYPE = VÄRDETYP
 
 ##
-##	Logical functions				Logiska funktioner
+## Logiska funktioner (Logical Functions)
 ##
-AND			= OCH				##	Returnerar SANT om alla argument är sanna
-FALSE			= FALSKT			##	Returnerar det logiska värdet FALSKT
-IF			= OM				##	Anger vilket logiskt test som ska utföras
-IFERROR			= OMFEL				##	Returnerar ett värde som du anger om en formel utvärderar till ett fel; annars returneras resultatet av formeln
-NOT			= ICKE				##	Inverterar logiken för argumenten
-OR			= ELLER				##	Returnerar SANT om något argument är SANT
-TRUE			= SANT				##	Returnerar det logiska värdet SANT
-
+AND = OCH
+FALSE = FALSKT
+IF = OM
+IFERROR = OMFEL
+IFNA = OMSAKNAS
+IFS = IFS
+NOT = ICKE
+OR = ELLER
+SWITCH = VÄXLA
+TRUE = SANT
+XOR = XELLER
 
 ##
-##	Lookup and reference functions			Sök- och referensfunktioner
+## Sök- och referensfunktioner (Lookup & Reference Functions)
 ##
-ADDRESS			= ADRESS			##	Returnerar en referens som text till en enstaka cell i ett kalkylblad
-AREAS			= OMRÅDEN			##	Returnerar antalet områden i en referens
-CHOOSE			= VÄLJ				##	Väljer ett värde i en lista över värden
-COLUMN			= KOLUMN			##	Returnerar kolumnnumret för en referens
-COLUMNS			= KOLUMNER			##	Returnerar antalet kolumner i en referens
-HLOOKUP			= LETAKOLUMN			##	Söker i den översta raden i en matris och returnerar värdet för angiven cell
-HYPERLINK		= HYPERLÄNK			##	Skapar en genväg eller ett hopp till ett dokument i nätverket, i ett intranät eller på Internet
-INDEX			= INDEX				##	Använder ett index för ett välja ett värde i en referens eller matris
-INDIRECT		= INDIREKT			##	Returnerar en referens som anges av ett textvärde
-LOOKUP			= LETAUPP			##	Letar upp värden i en vektor eller matris
-MATCH			= PASSA				##	Letar upp värden i en referens eller matris
-OFFSET			= FÖRSKJUTNING			##	Returnerar en referens förskjuten i förhållande till en given referens
-ROW			= RAD				##	Returnerar radnumret för en referens
-ROWS			= RADER				##	Returnerar antalet rader i en referens
-RTD			= RTD				##	Hämtar realtidsdata från ett program som stöder COM-automation (Automation: Ett sätt att arbeta med ett programs objekt från ett annat program eller utvecklingsverktyg. Detta kallades tidigare för OLE Automation, och är en branschstandard och ingår i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONERA			##	Transponerar en matris
-VLOOKUP			= LETARAD			##	Letar i den första kolumnen i en matris och flyttar över raden för att returnera värdet för en cell
-
+ADDRESS = ADRESS
+AREAS = OMRÅDEN
+CHOOSE = VÄLJ
+COLUMN = KOLUMN
+COLUMNS = KOLUMNER
+FORMULATEXT = FORMELTEXT
+GETPIVOTDATA = HÄMTA.PIVOTDATA
+HLOOKUP = LETAKOLUMN
+HYPERLINK = HYPERLÄNK
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = LETAUPP
+MATCH = PASSA
+OFFSET = FÖRSKJUTNING
+ROW = RAD
+ROWS = RADER
+RTD = RTD
+TRANSPOSE = TRANSPONERA
+VLOOKUP = LETARAD
+*RC = RK
 
 ##
-##	Math and trigonometry functions			Matematiska och trigonometriska funktioner
+## Matematiska och trigonometriska funktioner (Math & Trig Functions)
 ##
-ABS			= ABS				##	Returnerar absolutvärdet av ett tal
-ACOS			= ARCCOS			##	Returnerar arcus cosinus för ett tal
-ACOSH			= ARCCOSH			##	Returnerar inverterad hyperbolisk cosinus för ett tal
-ASIN			= ARCSIN			##	Returnerar arcus cosinus för ett tal
-ASINH			= ARCSINH			##	Returnerar hyperbolisk arcus sinus för ett tal
-ATAN			= ARCTAN			##	Returnerar arcus tangens för ett tal
-ATAN2			= ARCTAN2			##	Returnerar arcus tangens för en x- och en y- koordinat
-ATANH			= ARCTANH			##	Returnerar hyperbolisk arcus tangens för ett tal
-CEILING			= RUNDA.UPP			##	Avrundar ett tal till närmaste heltal eller närmaste signifikanta multipel
-COMBIN			= KOMBIN			##	Returnerar antalet kombinationer för ett givet antal objekt
-COS			= COS				##	Returnerar cosinus för ett tal
-COSH			= COSH				##	Returnerar hyperboliskt cosinus för ett tal
-DEGREES			= GRADER			##	Omvandlar radianer till grader
-EVEN			= JÄMN				##	Avrundar ett tal uppåt till närmaste heltal
-EXP			= EXP				##	Returnerar e upphöjt till ett givet tal
-FACT			= FAKULTET			##	Returnerar fakulteten för ett tal
-FACTDOUBLE		= DUBBELFAKULTET		##	Returnerar dubbelfakulteten för ett tal
-FLOOR			= RUNDA.NED			##	Avrundar ett tal nedåt mot noll
-GCD			= SGD				##	Returnerar den största gemensamma nämnaren
-INT			= HELTAL			##	Avrundar ett tal nedåt till närmaste heltal
-LCM			= MGM				##	Returnerar den minsta gemensamma multipeln
-LN			= LN				##	Returnerar den naturliga logaritmen för ett tal
-LOG			= LOG				##	Returnerar logaritmen för ett tal för en given bas
-LOG10			= LOG10				##	Returnerar 10-logaritmen för ett tal
-MDETERM			= MDETERM			##	Returnerar matrisen som är avgörandet av en matris
-MINVERSE		= MINVERT			##	Returnerar matrisinversen av en matris
-MMULT			= MMULT				##	Returnerar matrisprodukten av två matriser
-MOD			= REST				##	Returnerar resten vid en division
-MROUND			= MAVRUNDA			##	Returnerar ett tal avrundat till en given multipel
-MULTINOMIAL		= MULTINOMIAL			##	Returnerar multinomialen för en uppsättning tal
-ODD			= UDDA				##	Avrundar ett tal uppåt till närmaste udda heltal
-PI			= PI				##	Returnerar värdet pi
-POWER			= UPPHÖJT.TILL			##	Returnerar resultatet av ett tal upphöjt till en exponent
-PRODUCT			= PRODUKT			##	Multiplicerar argumenten
-QUOTIENT		= KVOT				##	Returnerar heltalsdelen av en division
-RADIANS			= RADIANER			##	Omvandlar grader till radianer
-RAND			= SLUMP				##	Returnerar ett slumptal mellan 0 och 1
-RANDBETWEEN		= SLUMP.MELLAN			##	Returnerar ett slumptal mellan de tal som du anger
-ROMAN			= ROMERSK			##	Omvandlar vanliga (arabiska) siffror till romerska som text
-ROUND			= AVRUNDA			##	Avrundar ett tal till ett angivet antal siffror
-ROUNDDOWN		= AVRUNDA.NEDÅT			##	Avrundar ett tal nedåt mot noll
-ROUNDUP			= AVRUNDA.UPPÅT			##	Avrundar ett tal uppåt, från noll
-SERIESSUM		= SERIESUMMA			##	Returnerar summan av en potensserie baserat på formeln
-SIGN			= TECKEN			##	Returnerar tecknet för ett tal
-SIN			= SIN				##	Returnerar sinus för en given vinkel
-SINH			= SINH				##	Returnerar hyperbolisk sinus för ett tal
-SQRT			= ROT				##	Returnerar den positiva kvadratroten
-SQRTPI			= ROTPI				##	Returnerar kvadratroten för (tal * pi)
-SUBTOTAL		= DELSUMMA			##	Returnerar en delsumma i en lista eller databas
-SUM			= SUMMA				##	Summerar argumenten
-SUMIF			= SUMMA.OM			##	Summerar celler enligt ett angivet villkor
-SUMIFS			= SUMMA.OMF			##	Lägger till cellerna i ett område som uppfyller flera kriterier
-SUMPRODUCT		= PRODUKTSUMMA			##	Returnerar summan av produkterna i motsvarande matriskomponenter
-SUMSQ			= KVADRATSUMMA			##	Returnerar summan av argumentens kvadrater
-SUMX2MY2		= SUMMAX2MY2			##	Returnerar summan av differensen mellan kvadraterna för motsvarande värden i två matriser
-SUMX2PY2		= SUMMAX2PY2			##	Returnerar summan av summan av kvadraterna av motsvarande värden i två matriser
-SUMXMY2			= SUMMAXMY2			##	Returnerar summan av kvadraten av skillnaden mellan motsvarande värden i två matriser
-TAN			= TAN				##	Returnerar tangens för ett tal
-TANH			= TANH				##	Returnerar hyperbolisk tangens för ett tal
-TRUNC			= AVKORTA			##	Avkortar ett tal till ett heltal
-
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = MÄNGD
+ARABIC = ARABISKA
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = BAS
+CEILING.MATH = RUNDA.UPP.MATEMATISKT
+CEILING.PRECISE = RUNDA.UPP.EXAKT
+COMBIN = KOMBIN
+COMBINA = KOMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.RUNDA.UPP
+EVEN = JÄMN
+EXP = EXP
+FACT = FAKULTET
+FACTDOUBLE = DUBBELFAKULTET
+FLOOR.MATH = RUNDA.NER.MATEMATISKT
+FLOOR.PRECISE = RUNDA.NER.EXAKT
+GCD = SGD
+INT = HELTAL
+ISO.CEILING = ISO.RUNDA.UPP
+LCM = MGM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERT
+MMULT = MMULT
+MOD = REST
+MROUND = MAVRUNDA
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MENHET
+ODD = UDDA
+PI = PI
+POWER = UPPHÖJT.TILL
+PRODUCT = PRODUKT
+QUOTIENT = KVOT
+RADIANS = RADIANER
+RAND = SLUMP
+RANDBETWEEN = SLUMP.MELLAN
+ROMAN = ROMERSK
+ROUND = AVRUNDA
+ROUNDBAHTDOWN = AVRUNDABAHTNEDÅT
+ROUNDBAHTUP = AVRUNDABAHTUPPÅT
+ROUNDDOWN = AVRUNDA.NEDÅT
+ROUNDUP = AVRUNDA.UPPÅT
+SEC = SEK
+SECH = SEKH
+SERIESSUM = SERIESUMMA
+SIGN = TECKEN
+SIN = SIN
+SINH = SINH
+SQRT = ROT
+SQRTPI = ROTPI
+SUBTOTAL = DELSUMMA
+SUM = SUMMA
+SUMIF = SUMMA.OM
+SUMIFS = SUMMA.OMF
+SUMPRODUCT = PRODUKTSUMMA
+SUMSQ = KVADRATSUMMA
+SUMX2MY2 = SUMMAX2MY2
+SUMX2PY2 = SUMMAX2PY2
+SUMXMY2 = SUMMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AVKORTA
 
 ##
-##	Statistical functions				Statistiska funktioner
+## Statistiska funktioner (Statistical Functions)
 ##
-AVEDEV			= MEDELAVV			##	Returnerar medelvärdet för datapunkters absoluta avvikelse från deras medelvärde
-AVERAGE			= MEDEL				##	Returnerar medelvärdet av argumenten
-AVERAGEA		= AVERAGEA			##	Returnerar medelvärdet av argumenten, inklusive tal, text och logiska värden
-AVERAGEIF		= MEDELOM			##	Returnerar medelvärdet (aritmetiskt medelvärde) för alla celler i ett område som uppfyller ett givet kriterium
-AVERAGEIFS		= MEDELOMF			##	Returnerar medelvärdet (det aritmetiska medelvärdet) för alla celler som uppfyller flera villkor.
-BETADIST		= BETAFÖRD			##	Returnerar den kumulativa betafördelningsfunktionen
-BETAINV			= BETAINV			##	Returnerar inversen till den kumulativa fördelningsfunktionen för en viss betafördelning
-BINOMDIST		= BINOMFÖRD			##	Returnerar den individuella binomialfördelningen
-CHIDIST			= CHI2FÖRD			##	Returnerar den ensidiga sannolikheten av c2-fördelningen
-CHIINV			= CHI2INV			##	Returnerar inversen av chi2-fördelningen
-CHITEST			= CHI2TEST			##	Returnerar oberoendetesten
-CONFIDENCE		= KONFIDENS			##	Returnerar konfidensintervallet för en populations medelvärde
-CORREL			= KORREL			##	Returnerar korrelationskoefficienten mellan två datamängder
-COUNT			= ANTAL				##	Räknar hur många tal som finns bland argumenten
-COUNTA			= ANTALV			##	Räknar hur många värden som finns bland argumenten
-COUNTBLANK		= ANTAL.TOMMA			##	Räknar antalet tomma celler i ett område
-COUNTIF			= ANTAL.OM			##	Räknar antalet celler i ett område som uppfyller angivna villkor.
-COUNTIFS		= ANTAL.OMF			##	Räknar antalet celler i ett område som uppfyller flera villkor.
-COVAR			= KOVAR				##	Returnerar kovariansen, d.v.s. medelvärdet av produkterna för parade avvikelser
-CRITBINOM		= KRITBINOM			##	Returnerar det minsta värdet för vilket den kumulativa binomialfördelningen är mindre än eller lika med ett villkorsvärde
-DEVSQ			= KVADAVV			##	Returnerar summan av kvadrater på avvikelser
-EXPONDIST		= EXPONFÖRD			##	Returnerar exponentialfördelningen
-FDIST			= FFÖRD				##	Returnerar F-sannolikhetsfördelningen
-FINV			= FINV				##	Returnerar inversen till F-sannolikhetsfördelningen
-FISHER			= FISHER			##	Returnerar Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerar inversen till Fisher-transformationen
-FORECAST		= PREDIKTION			##	Returnerar ett värde längs en linjär trendlinje
-FREQUENCY		= FREKVENS			##	Returnerar en frekvensfördelning som en lodrät matris
-FTEST			= FTEST				##	Returnerar resultatet av en F-test
-GAMMADIST		= GAMMAFÖRD			##	Returnerar gammafördelningen
-GAMMAINV		= GAMMAINV			##	Returnerar inversen till den kumulativa gammafördelningen
-GAMMALN			= GAMMALN			##	Returnerar den naturliga logaritmen för gammafunktionen, G(x)
-GEOMEAN			= GEOMEDEL			##	Returnerar det geometriska medelvärdet
-GROWTH			= EXPTREND			##	Returnerar värden längs en exponentiell trend
-HARMEAN			= HARMMEDEL			##	Returnerar det harmoniska medelvärdet
-HYPGEOMDIST		= HYPGEOMFÖRD			##	Returnerar den hypergeometriska fördelningen
-INTERCEPT		= SKÄRNINGSPUNKT		##	Returnerar skärningspunkten för en linjär regressionslinje
-KURT			= TOPPIGHET			##	Returnerar toppigheten av en mängd data
-LARGE			= STÖRSTA			##	Returnerar det n:te största värdet i en mängd data
-LINEST			= REGR				##	Returnerar parametrar till en linjär trendlinje
-LOGEST			= EXPREGR			##	Returnerar parametrarna i en exponentiell trend
-LOGINV			= LOGINV			##	Returnerar inversen till den lognormala fördelningen
-LOGNORMDIST		= LOGNORMFÖRD			##	Returnerar den kumulativa lognormala fördelningen
-MAX			= MAX				##	Returnerar det största värdet i en lista av argument
-MAXA			= MAXA				##	Returnerar det största värdet i en lista av argument, inklusive tal, text och logiska värden
-MEDIAN			= MEDIAN			##	Returnerar medianen för angivna tal
-MIN			= MIN				##	Returnerar det minsta värdet i en lista med argument
-MINA			= MINA				##	Returnerar det minsta värdet i en lista över argument, inklusive tal, text och logiska värden
-MODE			= TYPVÄRDE			##	Returnerar det vanligaste värdet i en datamängd
-NEGBINOMDIST		= NEGBINOMFÖRD			##	Returnerar den negativa binomialfördelningen
-NORMDIST		= NORMFÖRD			##	Returnerar den kumulativa normalfördelningen
-NORMINV			= NORMINV			##	Returnerar inversen till den kumulativa normalfördelningen
-NORMSDIST		= NORMSFÖRD			##	Returnerar den kumulativa standardnormalfördelningen
-NORMSINV		= NORMSINV			##	Returnerar inversen till den kumulativa standardnormalfördelningen
-PEARSON			= PEARSON			##	Returnerar korrelationskoefficienten till Pearsons momentprodukt
-PERCENTILE		= PERCENTIL			##	Returnerar den n:te percentilen av värden i ett område
-PERCENTRANK		= PROCENTRANG			##	Returnerar procentrangen för ett värde i en datamängd
-PERMUT			= PERMUT			##	Returnerar antal permutationer för ett givet antal objekt
-POISSON			= POISSON			##	Returnerar Poisson-fördelningen
-PROB			= SANNOLIKHET			##	Returnerar sannolikheten att värden i ett område ligger mellan två gränser
-QUARTILE		= KVARTIL			##	Returnerar kvartilen av en mängd data
-RANK			= RANG				##	Returnerar rangordningen för ett tal i en lista med tal
-RSQ			= RKV				##	Returnerar kvadraten av Pearsons produktmomentkorrelationskoefficient
-SKEW			= SNEDHET			##	Returnerar snedheten för en fördelning
-SLOPE			= LUTNING			##	Returnerar lutningen på en linjär regressionslinje
-SMALL			= MINSTA			##	Returnerar det n:te minsta värdet i en mängd data
-STANDARDIZE		= STANDARDISERA			##	Returnerar ett normaliserat värde
-STDEV			= STDAV				##	Uppskattar standardavvikelsen baserat på ett urval
-STDEVA			= STDEVA			##	Uppskattar standardavvikelsen baserat på ett urval, inklusive tal, text och logiska värden
-STDEVP			= STDAVP			##	Beräknar standardavvikelsen baserat på hela populationen
-STDEVPA			= STDEVPA			##	Beräknar standardavvikelsen baserat på hela populationen, inklusive tal, text och logiska värden
-STEYX			= STDFELYX			##	Returnerar standardfelet för ett förutspått y-värde för varje x-värde i regressionen
-TDIST			= TFÖRD				##	Returnerar Students t-fördelning
-TINV			= TINV				##	Returnerar inversen till Students t-fördelning
-TREND			= TREND				##	Returnerar värden längs en linjär trend
-TRIMMEAN		= TRIMMEDEL			##	Returnerar medelvärdet av mittpunkterna i en datamängd
-TTEST			= TTEST				##	Returnerar sannolikheten beräknad ur Students t-test
-VAR			= VARIANS			##	Uppskattar variansen baserat på ett urval
-VARA			= VARA				##	Uppskattar variansen baserat på ett urval, inklusive tal, text och logiska värden
-VARP			= VARIANSP			##	Beräknar variansen baserat på hela populationen
-VARPA			= VARPA				##	Beräknar variansen baserat på hela populationen, inklusive tal, text och logiska värden
-WEIBULL			= WEIBULL			##	Returnerar Weibull-fördelningen
-ZTEST			= ZTEST				##	Returnerar det ensidiga sannolikhetsvärdet av ett z-test
-
+AVEDEV = MEDELAVV
+AVERAGE = MEDEL
+AVERAGEA = AVERAGEA
+AVERAGEIF = MEDEL.OM
+AVERAGEIFS = MEDEL.OMF
+BETA.DIST = BETA.FÖRD
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.FÖRD
+BINOM.DIST.RANGE = BINOM.FÖRD.INTERVALL
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHI2.FÖRD
+CHISQ.DIST.RT = CHI2.FÖRD.RT
+CHISQ.INV = CHI2.INV
+CHISQ.INV.RT = CHI2.INV.RT
+CHISQ.TEST = CHI2.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENS.T
+CORREL = KORREL
+COUNT = ANTAL
+COUNTA = ANTALV
+COUNTBLANK = ANTAL.TOMMA
+COUNTIF = ANTAL.OM
+COUNTIFS = ANTAL.OMF
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = KVADAVV
+EXPON.DIST = EXPON.FÖRD
+F.DIST = F.FÖRD
+F.DIST.RT = F.FÖRD.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOS.ETS
+FORECAST.ETS.CONFINT = PROGNOS.ETS.KONFINT
+FORECAST.ETS.SEASONALITY = PROGNOS.ETS.SÄSONGSBEROENDE
+FORECAST.ETS.STAT = PROGNOS.ETS.STAT
+FORECAST.LINEAR = PROGNOS.LINJÄR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FÖRD
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.EXAKT
+GAUSS = GAUSS
+GEOMEAN = GEOMEDEL
+GROWTH = EXPTREND
+HARMEAN = HARMMEDEL
+HYPGEOM.DIST = HYPGEOM.FÖRD
+INTERCEPT = SKÄRNINGSPUNKT
+KURT = TOPPIGHET
+LARGE = STÖRSTA
+LINEST = REGR
+LOGEST = EXPREGR
+LOGNORM.DIST = LOGNORM.FÖRD
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXIFS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINIFS
+MODE.MULT = TYPVÄRDE.FLERA
+MODE.SNGL = TYPVÄRDE.ETT
+NEGBINOM.DIST = NEGBINOM.FÖRD
+NORM.DIST = NORM.FÖRD
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.FÖRD
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXK
+PERCENTILE.INC = PERCENTIL.INK
+PERCENTRANK.EXC = PROCENTRANG.EXK
+PERCENTRANK.INC = PROCENTRANG.INK
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.FÖRD
+PROB = SANNOLIKHET
+QUARTILE.EXC = KVARTIL.EXK
+QUARTILE.INC = KVARTIL.INK
+RANK.AVG = RANG.MED
+RANK.EQ = RANG.EKV
+RSQ = RKV
+SKEW = SNEDHET
+SKEW.P = SNEDHET.P
+SLOPE = LUTNING
+SMALL = MINSTA
+STANDARDIZE = STANDARDISERA
+STDEV.P = STDAV.P
+STDEV.S = STDAV.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STDFELYX
+T.DIST = T.FÖRD
+T.DIST.2T = T.FÖRD.2T
+T.DIST.RT = T.FÖRD.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = TRIMMEDEL
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.FÖRD
+Z.TEST = Z.TEST
 
 ##
-##	Text functions					Textfunktioner
+## Textfunktioner (Text Functions)
 ##
-ASC			= ASC				##	Ändrar helbredds (dubbel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med halvt breddsteg (enkel byte)
-BAHTTEXT		= BAHTTEXT			##	Omvandlar ett tal till text med valutaformatet ß (baht)
-CHAR			= TECKENKOD			##	Returnerar tecknet som anges av kod
-CLEAN			= STÄDA				##	Tar bort alla icke utskrivbara tecken i en text
-CODE			= KOD				##	Returnerar en numerisk kod för det första tecknet i en textsträng
-CONCATENATE		= SAMMANFOGA			##	Sammanfogar flera textdelar till en textsträng
-DOLLAR			= VALUTA			##	Omvandlar ett tal till text med valutaformat
-EXACT			= EXAKT				##	Kontrollerar om två textvärden är identiska
-FIND			= HITTA				##	Hittar en text i en annan (skiljer på gemener och versaler)
-FINDB			= HITTAB			##	Hittar en text i en annan (skiljer på gemener och versaler)
-FIXED			= FASTTAL			##	Formaterar ett tal som text med ett fast antal decimaler
-JIS			= JIS				##	Ändrar halvbredds (enkel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med helt breddsteg (dubbel byte)
-LEFT			= VÄNSTER			##	Returnerar tecken längst till vänster i en sträng
-LEFTB			= VÄNSTERB			##	Returnerar tecken längst till vänster i en sträng
-LEN			= LÄNGD				##	Returnerar antalet tecken i en textsträng
-LENB			= LÄNGDB			##	Returnerar antalet tecken i en textsträng
-LOWER			= GEMENER			##	Omvandlar text till gemener
-MID			= EXTEXT			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-MIDB			= EXTEXTB			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-PHONETIC		= PHONETIC			##	Returnerar de fonetiska (furigana) tecknen i en textsträng
-PROPER			= INITIAL			##	Ändrar första bokstaven i varje ord i ett textvärde till versal
-REPLACE			= ERSÄTT			##	Ersätter tecken i text
-REPLACEB		= ERSÄTTB			##	Ersätter tecken i text
-REPT			= REP				##	Upprepar en text ett bestämt antal gånger
-RIGHT			= HÖGER				##	Returnerar tecken längst till höger i en sträng
-RIGHTB			= HÖGERB			##	Returnerar tecken längst till höger i en sträng
-SEARCH			= SÖK				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SEARCHB			= SÖKB				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SUBSTITUTE		= BYT.UT			##	Ersätter gammal text med ny text i en textsträng
-T			= T				##	Omvandlar argumenten till text
-TEXT			= TEXT				##	Formaterar ett tal och omvandlar det till text
-TRIM			= RENSA				##	Tar bort blanksteg från text
-UPPER			= VERSALER			##	Omvandlar text till versaler
-VALUE			= TEXTNUM			##	Omvandlar ett textargument till ett tal
+BAHTTEXT = BAHTTEXT
+CHAR = TECKENKOD
+CLEAN = STÄDA
+CODE = KOD
+CONCAT = SAMMAN
+DOLLAR = VALUTA
+EXACT = EXAKT
+FIND = HITTA
+FIXED = FASTTAL
+LEFT = VÄNSTER
+LEN = LÄNGD
+LOWER = GEMENER
+MID = EXTEXT
+NUMBERVALUE = TALVÄRDE
+PROPER = INITIAL
+REPLACE = ERSÄTT
+REPT = REP
+RIGHT = HÖGER
+SEARCH = SÖK
+SUBSTITUTE = BYT.UT
+T = T
+TEXT = TEXT
+TEXTJOIN = TEXTJOIN
+THAIDIGIT = THAISIFFRA
+THAINUMSOUND = THAITALLJUD
+THAINUMSTRING = THAITALSTRÄNG
+THAISTRINGLENGTH = THAISTRÄNGLÄNGD
+TRIM = RENSA
+UNICHAR = UNITECKENKOD
+UNICODE = UNICODE
+UPPER = VERSALER
+VALUE = TEXTNUM
+
+##
+## Webbfunktioner (Web Functions)
+##
+ENCODEURL = KODAWEBBADRESS
+FILTERXML = FILTRERAXML
+WEBSERVICE = WEBBTJÄNST
+
+##
+## Kompatibilitetsfunktioner (Compatibility Functions)
+##
+BETADIST = BETAFÖRD
+BETAINV = BETAINV
+BINOMDIST = BINOMFÖRD
+CEILING = RUNDA.UPP
+CHIDIST = CHI2FÖRD
+CHIINV = CHI2INV
+CHITEST = CHI2TEST
+CONCATENATE = SAMMANFOGA
+CONFIDENCE = KONFIDENS
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXPONFÖRD
+FDIST = FFÖRD
+FINV = FINV
+FLOOR = RUNDA.NER
+FORECAST = PREDIKTION
+FTEST = FTEST
+GAMMADIST = GAMMAFÖRD
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMFÖRD
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFÖRD
+MODE = TYPVÄRDE
+NEGBINOMDIST = NEGBINOMFÖRD
+NORMDIST = NORMFÖRD
+NORMINV = NORMINV
+NORMSDIST = NORMSFÖRD
+NORMSINV = NORMSINV
+PERCENTILE = PERCENTIL
+PERCENTRANK = PROCENTRANG
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = RANG
+STDEV = STDAV
+STDEVP = STDAVP
+TDIST = TFÖRD
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config
index 266e000f6..63d22fd0f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config
@@ -1,24 +1,20 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## Türkçe (Turkish)
+##
+############################################################
 
-ArgumentSeparator	= ;
-
+ArgumentSeparator = ;
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= YTL
-
-
-##
-##	Excel Error Codes	(For future use)
-
-##
-NULL	= #BOŞ!
-DIV0	= #SAYI/0!
-VALUE	= #DEĞER!
-REF	= #BAŞV!
-NAME	= #AD?
-NUM	= #SAYI!
-NA	= #YOK
+NULL = #BOŞ!
+DIV0 = #SAYI/0!
+VALUE = #DEĞER!
+REF = #BAŞV!
+NAME = #AD?
+NUM = #SAYI!
+NA = #YOK
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions
index f03563a79..f872274f9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions
@@ -1,416 +1,537 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-## Data in this file derived from https://www.excel-function-translation.com/
+## PhpSpreadsheet - function name translations
 ##
+## Türkçe (Turkish)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions			Eklenti ve Otomasyon fonksiyonları
+## Küp işlevleri (Cube Functions)
 ##
-GETPIVOTDATA		= ÖZETVERİAL	##	Bir Özet Tablo raporunda saklanan verileri verir.
-
+CUBEKPIMEMBER = KÜPKPIÜYESİ
+CUBEMEMBER = KÜPÜYESİ
+CUBEMEMBERPROPERTY = KÜPÜYEÖZELLİĞİ
+CUBERANKEDMEMBER = DERECELİKÜPÜYESİ
+CUBESET = KÜPKÜMESİ
+CUBESETCOUNT = KÜPKÜMESAYISI
+CUBEVALUE = KÜPDEĞERİ
 
 ##
-##	Cube functions					Küp işlevleri
+## Veritabanı işlevleri (Database Functions)
 ##
-CUBEKPIMEMBER		= KÜPKPIÜYE			##	Kilit performans göstergesi (KPI-Key Performance Indicator) adını, özelliğini ve ölçüsünü verir ve hücredeki ad ve özelliği gösterir. KPI, bir kurumun performansını izlemek için kullanılan aylık brüt kâr ya da üç aylık çalışan giriş çıkışları gibi ölçülebilen bir birimdir.
-CUBEMEMBER			= KÜPÜYE			##	Bir küp hiyerarşisinde bir üyeyi veya kaydı verir. Üye veya kaydın küpte varolduğunu doğrulamak için kullanılır.
-CUBEMEMBERPROPERTY	= KÜPÜYEÖZELLİĞİ	##	Bir küpte bir üyenin özelliğinin değerini verir. Küp içinde üye adının varlığını doğrulamak ve bu üyenin belli özelliklerini getirmek için kullanılır.
-CUBERANKEDMEMBER	= KÜPÜYESIRASI 		##	Bir küme içindeki üyenin derecesini veya kaçıncı olduğunu verir. En iyi satış elemanı, veya en iyi on öğrenci gibi bir kümedeki bir veya daha fazla öğeyi getirmek için kullanılır.
-CUBESET				= KÜPKÜME			##	Kümeyi oluşturan ve ardından bu kümeyi Microsoft Office Excel'e getiren sunucudaki küpe küme ifadelerini göndererek hesaplanan üye veya kayıt kümesini tanımlar.
-CUBESETCOUNT		= KÜPKÜMESAY		##	Bir kümedeki öğelerin sayısını getirir.
-CUBEVALUE			= KÜPDEĞER 			##	Bir küpten toplam değeri getirir.
-
+DAVERAGE = VSEÇORT
+DCOUNT = VSEÇSAY
+DCOUNTA = VSEÇSAYDOLU
+DGET = VAL
+DMAX = VSEÇMAK
+DMIN = VSEÇMİN
+DPRODUCT = VSEÇÇARP
+DSTDEV = VSEÇSTDSAPMA
+DSTDEVP = VSEÇSTDSAPMAS
+DSUM = VSEÇTOPLA
+DVAR = VSEÇVAR
+DVARP = VSEÇVARS
 
 ##
-##	Database functions				Veritabanı işlevleri
+## Tarih ve saat işlevleri (Date & Time Functions)
 ##
-DAVERAGE		= VSEÇORT			##	Seçili veritabanı girdilerinin ortalamasını verir.
-DCOUNT			= VSEÇSAY			##	Veritabanında sayı içeren hücre sayısını hesaplar.
-DCOUNTA			= VSEÇSAYDOLU		##	Veritabanındaki boş olmayan hücreleri sayar.
-DGET			= VAL				##	Veritabanından, belirtilen ölçütlerle eşleşen tek bir rapor çıkarır.
-DMAX			= VSEÇMAK			##	Seçili veritabanı girişlerinin en yüksek değerini verir.
-DMIN			= VSEÇMİN			##	Seçili veritabanı girişlerinin en düşük değerini verir.
-DPRODUCT		= VSEÇÇARP			##	Kayıtların belli bir alanında bulunan, bir veritabanındaki ölçütlerle eşleşen değerleri çarpar.
-DSTDEV			= VSEÇSTDSAPMA		##	Seçili veritabanı girişlerinden oluşan bir örneğe dayanarak, standart sapmayı tahmin eder.
-DSTDEVP			= VSEÇSTDSAPMAS		##	Standart sapmayı, seçili veritabanı girişlerinin tüm popülasyonunu esas alarak hesaplar.
-DSUM			= VSEÇTOPLA			##	Kayıtların alan sütununda bulunan, ölçütle eşleşen sayıları toplar.
-DVAR			= VSEÇVAR			##	Seçili veritabanı girişlerinden oluşan bir örneği esas alarak farkı tahmin eder.
-DVARP			= VSEÇVARS			##	Seçili veritabanı girişlerinin tüm popülasyonunu esas alarak farkı hesaplar.
-
+DATE = TARİH
+DATEDIF = ETARİHLİ
+DATESTRING = TARİHDİZİ
+DATEVALUE = TARİHSAYISI
+DAY = GÜN
+DAYS = GÜNSAY
+DAYS360 = GÜN360
+EDATE = SERİTARİH
+EOMONTH = SERİAY
+HOUR = SAAT
+ISOWEEKNUM = ISOHAFTASAY
+MINUTE = DAKİKA
+MONTH = AY
+NETWORKDAYS = TAMİŞGÜNÜ
+NETWORKDAYS.INTL = TAMİŞGÜNÜ.ULUSL
+NOW = ŞİMDİ
+SECOND = SANİYE
+THAIDAYOFWEEK = TAYHAFTANINGÜNÜ
+THAIMONTHOFYEAR = TAYYILINAYI
+THAIYEAR = TAYYILI
+TIME = ZAMAN
+TIMEVALUE = ZAMANSAYISI
+TODAY = BUGÜN
+WEEKDAY = HAFTANINGÜNÜ
+WEEKNUM = HAFTASAY
+WORKDAY = İŞGÜNÜ
+WORKDAY.INTL = İŞGÜNÜ.ULUSL
+YEAR = YIL
+YEARFRAC = YILORAN
 
 ##
-##	Date and time functions				Tarih ve saat işlevleri
+## Mühendislik işlevleri (Engineering Functions)
 ##
-DATE			= TARİH				##	Belirli bir tarihin seri numarasını verir.
-DATEVALUE		= TARİHSAYISI		##	Metin biçimindeki bir tarihi seri numarasına dönüştürür.
-DAY				= GÜN				##	Seri numarasını, ayın bir gününe dönüştürür.
-DAYS360			= GÜN360			##	İki tarih arasındaki gün sayısını, 360 günlük yılı esas alarak hesaplar.
-EDATE			= SERİTARİH			##	Başlangıç tarihinden itibaren, belirtilen ay sayısından önce veya sonraki tarihin seri numarasını verir.
-EOMONTH			= SERİAY			##	Belirtilen sayıda ay önce veya sonraki ayın son gününün seri numarasını verir.
-HOUR			= SAAT				##	Bir seri numarasını saate dönüştürür.
-MINUTE			= DAKİKA			##	Bir seri numarasını dakikaya dönüştürür.
-MONTH			= AY				##	Bir seri numarasını aya dönüştürür.
-NETWORKDAYS		= TAMİŞGÜNÜ			##	İki tarih arasındaki tam çalışma günlerinin sayısını verir.
-NOW				= ŞİMDİ				##	Geçerli tarihin ve saatin seri numarasını verir.
-SECOND			= SANİYE			##	Bir seri numarasını saniyeye dönüştürür.
-TIME			= ZAMAN				##	Belirli bir zamanın seri numarasını verir.
-TIMEVALUE		= ZAMANSAYISI		##	Metin biçimindeki zamanı seri numarasına dönüştürür.
-TODAY			= BUGÜN				##	Bugünün tarihini seri numarasına dönüştürür.
-WEEKDAY			= HAFTANINGÜNÜ		##	Bir seri numarasını, haftanın gününe dönüştürür.
-WEEKNUM			= HAFTASAY			##	Dizisel değerini, haftanın yıl içinde bulunduğu konumu sayısal olarak gösteren sayıya dönüştürür.
-WORKDAY			= İŞGÜNÜ			##	Belirtilen sayıda çalışma günü öncesinin ya da sonrasının tarihinin seri numarasını verir.
-YEAR			= YIL				##	Bir seri numarasını yıla dönüştürür.
-YEARFRAC		= YILORAN			##	Başlangıç_tarihi ve bitiş_tarihi arasındaki tam günleri gösteren yıl kesrini verir.
-
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN2DEC
+BIN2HEX = BIN2HEX
+BIN2OCT = BIN2OCT
+BITAND = BİTVE
+BITLSHIFT = BİTSOLAKAYDIR
+BITOR = BİTVEYA
+BITRSHIFT = BİTSAĞAKAYDIR
+BITXOR = BİTÖZELVEYA
+COMPLEX = KARMAŞIK
+CONVERT = ÇEVİR
+DEC2BIN = DEC2BIN
+DEC2HEX = DEC2HEX
+DEC2OCT = DEC2OCT
+DELTA = DELTA
+ERF = HATAİŞLEV
+ERF.PRECISE = HATAİŞLEV.DUYARLI
+ERFC = TÜMHATAİŞLEV
+ERFC.PRECISE = TÜMHATAİŞLEV.DUYARLI
+GESTEP = BESINIR
+HEX2BIN = HEX2BIN
+HEX2DEC = HEX2DEC
+HEX2OCT = HEX2OCT
+IMABS = SANMUTLAK
+IMAGINARY = SANAL
+IMARGUMENT = SANBAĞ_DEĞİŞKEN
+IMCONJUGATE = SANEŞLENEK
+IMCOS = SANCOS
+IMCOSH = SANCOSH
+IMCOT = SANCOT
+IMCSC = SANCSC
+IMCSCH = SANCSCH
+IMDIV = SANBÖL
+IMEXP = SANÜS
+IMLN = SANLN
+IMLOG10 = SANLOG10
+IMLOG2 = SANLOG2
+IMPOWER = SANKUVVET
+IMPRODUCT = SANÇARP
+IMREAL = SANGERÇEK
+IMSEC = SANSEC
+IMSECH = SANSECH
+IMSIN = SANSIN
+IMSINH = SANSINH
+IMSQRT = SANKAREKÖK
+IMSUB = SANTOPLA
+IMSUM = SANÇIKAR
+IMTAN = SANTAN
+OCT2BIN = OCT2BIN
+OCT2DEC = OCT2DEC
+OCT2HEX = OCT2HEX
 
 ##
-##	Engineering functions				Mühendislik işlevleri
+## Finansal işlevler (Financial Functions)
 ##
-BESSELI			= BESSELI			##	Değiştirilmiş Bessel fonksiyonu In(x)'i verir.
-BESSELJ			= BESSELJ			##	Bessel fonksiyonu Jn(x)'i verir.
-BESSELK			= BESSELK			##	Değiştirilmiş Bessel fonksiyonu Kn(x)'i verir.
-BESSELY			= BESSELY			##	Bessel fonksiyonu Yn(x)'i verir.
-BIN2DEC			= BIN2DEC			##	İkili bir sayıyı, ondalık sayıya dönüştürür.
-BIN2HEX			= BIN2HEX			##	İkili bir sayıyı, onaltılıya dönüştürür.
-BIN2OCT			= BIN2OCT			##	İkili bir sayıyı, sekizliye dönüştürür.
-COMPLEX			= KARMAŞIK			##	Gerçek ve sanal katsayıları, karmaşık sayıya dönüştürür.
-CONVERT			= ÇEVİR				##	Bir sayıyı, bir ölçüm sisteminden bir başka ölçüm sistemine dönüştürür.
-DEC2BIN			= DEC2BIN			##	Ondalık bir sayıyı, ikiliye dönüştürür.
-DEC2HEX			= DEC2HEX			##	Ondalık bir sayıyı, onaltılıya dönüştürür.
-DEC2OCT			= DEC2OCT			##	Ondalık bir sayıyı sekizliğe dönüştürür.
-DELTA			= DELTA				##	İki değerin eşit olup olmadığını sınar.
-ERF				= HATAİŞLEV			##	Hata işlevini verir.
-ERFC			= TÜMHATAİŞLEV		##	Tümleyici hata işlevini verir.
-GESTEP			= BESINIR			##	Bir sayının eşik değerinden büyük olup olmadığını sınar.
-HEX2BIN			= HEX2BIN			##	Onaltılı bir sayıyı ikiliye dönüştürür.
-HEX2DEC			= HEX2DEC			##	Onaltılı bir sayıyı ondalığa dönüştürür.
-HEX2OCT			= HEX2OCT			##	Onaltılı bir sayıyı sekizliğe dönüştürür.
-IMABS			= SANMUTLAK			##	Karmaşık bir sayının mutlak değerini (modül) verir.
-IMAGINARY		= SANAL				##	Karmaşık bir sayının sanal katsayısını verir.
-IMARGUMENT		= SANBAĞ_DEĞİŞKEN	##	Radyanlarla belirtilen bir açı olan teta bağımsız değişkenini verir.
-IMCONJUGATE		= SANEŞLENEK		##	Karmaşık bir sayının karmaşık eşleniğini verir.
-IMCOS			= SANCOS			##	Karmaşık bir sayının kosinüsünü verir.
-IMDIV			= SANBÖL			##	İki karmaşık sayının bölümünü verir.
-IMEXP			= SANÜS				##	Karmaşık bir sayının üssünü verir.
-IMLN			= SANLN				##	Karmaşık bir sayının doğal logaritmasını verir.
-IMLOG10			= SANLOG10			##	Karmaşık bir sayının, 10 tabanında logaritmasını verir.
-IMLOG2			= SANLOG2			##	Karmaşık bir sayının 2 tabanında logaritmasını verir.
-IMPOWER			= SANÜSSÜ			##	Karmaşık bir sayıyı, bir tamsayı üssüne yükseltilmiş olarak verir.
-IMPRODUCT		= SANÇARP			##	Karmaşık sayıların çarpımını verir.
-IMREAL			= SANGERÇEK			##	Karmaşık bir sayının, gerçek katsayısını verir.
-IMSIN			= SANSIN			##	Karmaşık bir sayının sinüsünü verir.
-IMSQRT			= SANKAREKÖK		##	Karmaşık bir sayının karekökünü verir.
-IMSUB			= SANÇIKAR			##	İki karmaşık sayının farkını verir.
-IMSUM			= SANTOPLA			##	Karmaşık sayıların toplamını verir.
-OCT2BIN			= OCT2BIN			##	Sekizli bir sayıyı ikiliye dönüştürür.
-OCT2DEC			= OCT2DEC			##	Sekizli bir sayıyı ondalığa dönüştürür.
-OCT2HEX			= OCT2HEX			##	Sekizli bir sayıyı onaltılıya dönüştürür.
-
+ACCRINT = GERÇEKFAİZ
+ACCRINTM = GERÇEKFAİZV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPONGÜNBD
+COUPDAYS = KUPONGÜN
+COUPDAYSNC = KUPONGÜNDSK
+COUPNCD = KUPONGÜNSKT
+COUPNUM = KUPONSAYI
+COUPPCD = KUPONGÜNÖKT
+CUMIPMT = TOPÖDENENFAİZ
+CUMPRINC = TOPANAPARA
+DB = AZALANBAKİYE
+DDB = ÇİFTAZALANBAKİYE
+DISC = İNDİRİM
+DOLLARDE = LİRAON
+DOLLARFR = LİRAKES
+DURATION = SÜRE
+EFFECT = ETKİN
+FV = GD
+FVSCHEDULE = GDPROGRAM
+INTRATE = FAİZORANI
+IPMT = FAİZTUTARI
+IRR = İÇ_VERİM_ORANI
+ISPMT = ISPMT
+MDURATION = MSÜRE
+MIRR = D_İÇ_VERİM_ORANI
+NOMINAL = NOMİNAL
+NPER = TAKSİT_SAYISI
+NPV = NBD
+ODDFPRICE = TEKYDEĞER
+ODDFYIELD = TEKYÖDEME
+ODDLPRICE = TEKSDEĞER
+ODDLYIELD = TEKSÖDEME
+PDURATION = PSÜRE
+PMT = DEVRESEL_ÖDEME
+PPMT = ANA_PARA_ÖDEMESİ
+PRICE = DEĞER
+PRICEDISC = DEĞERİND
+PRICEMAT = DEĞERVADE
+PV = BD
+RATE = FAİZ_ORANI
+RECEIVED = GETİRİ
+RRI = GERÇEKLEŞENYATIRIMGETİRİSİ
+SLN = DA
+SYD = YAT
+TBILLEQ = HTAHEŞ
+TBILLPRICE = HTAHDEĞER
+TBILLYIELD = HTAHÖDEME
+VDB = DAB
+XIRR = AİÇVERİMORANI
+XNPV = ANBD
+YIELD = ÖDEME
+YIELDDISC = ÖDEMEİND
+YIELDMAT = ÖDEMEVADE
 
 ##
-##	Financial functions				Finansal fonksiyonlar
+## Bilgi işlevleri (Information Functions)
 ##
-ACCRINT			= GERÇEKFAİZ		##	Dönemsel faiz ödeyen hisse senedine ilişkin tahakkuk eden faizi getirir.
-ACCRINTM		= GERÇEKFAİZV		##	Vadesinde ödeme yapan bir tahvilin tahakkuk etmiş faizini verir.
-AMORDEGRC		= AMORDEGRC			##	Yıpranma katsayısı kullanarak her hesap döneminin değer kaybını verir.
-AMORLINC		= AMORLINC			##	Her hesap dönemi içindeki yıpranmayı verir.
-COUPDAYBS		= KUPONGÜNBD		##	Kupon süresinin başlangıcından alış tarihine kadar olan süredeki gün sayısını verir.
-COUPDAYS		= KUPONGÜN			##	Kupon süresindeki, gün sayısını, alış tarihini de içermek üzere, verir.
-COUPDAYSNC		= KUPONGÜNDSK		##	Alış tarihinden bir sonraki kupon tarihine kadar olan gün sayısını verir.
-COUPNCD			= KUPONGÜNSKT		##	Alış tarihinden bir sonraki kupon tarihini verir.
-COUPNUM			= KUPONSAYI			##	Alış tarihiyle vade tarihi arasında ödenecek kuponların sayısını verir.
-COUPPCD			= KUPONGÜNÖKT		##	Alış tarihinden bir önceki kupon tarihini verir.
-CUMIPMT			= AİÇVERİMORANI		##	İki dönem arasında ödenen kümülatif faizi verir.
-CUMPRINC		= ANA_PARA_ÖDEMESİ	##	İki dönem arasında bir borç üzerine ödenen birikimli temeli verir.
-DB				= AZALANBAKİYE		##	Bir malın belirtilen bir süre içindeki yıpranmasını, sabit azalan bakiye yöntemini kullanarak verir.
-DDB				= ÇİFTAZALANBAKİYE	##	Bir malın belirtilen bir süre içindeki yıpranmasını, çift azalan bakiye yöntemi ya da sizin belirttiğiniz başka bir yöntemi kullanarak verir.
-DISC			= İNDİRİM			##	Bir tahvilin indirim oranını verir.
-DOLLARDE		= LİRAON			##	Kesir olarak tanımlanmış lira fiyatını, ondalık sayı olarak tanımlanmış lira fiyatına dönüştürür.
-DOLLARFR		= LİRAKES			##	Ondalık sayı olarak tanımlanmış lira fiyatını, kesir olarak tanımlanmış lira fiyatına dönüştürür.
-DURATION		= SÜRE				##	Belli aralıklarla faiz ödemesi yapan bir tahvilin yıllık süresini verir.
-EFFECT			= ETKİN				##	Efektif yıllık faiz oranını verir.
-FV				= ANBD				##	Bir yatırımın gelecekteki değerini verir.
-FVSCHEDULE		= GDPROGRAM			##	Bir seri birleşik faiz oranı uyguladıktan sonra, bir başlangıçtaki anaparanın gelecekteki değerini verir.
-INTRATE			= FAİZORANI			##	Tam olarak yatırım yapılmış bir tahvilin faiz oranını verir.
-IPMT			= FAİZTUTARI		##	Bir yatırımın verilen bir süre için faiz ödemesini verir.
-IRR				= İÇ_VERİM_ORANI	##	Bir para akışı serisi için, iç verim oranını verir.
-ISPMT			= ISPMT				##	Yatırımın belirli bir dönemi boyunca ödenen faizi hesaplar.
-MDURATION		= MSÜRE				##	Varsayılan par değeri 10.000.000 lira olan bir tahvil için Macauley değiştirilmiş süreyi verir.
-MIRR			= D_İÇ_VERİM_ORANI	##	Pozitif ve negatif para akışlarının farklı oranlarda finanse edildiği durumlarda, iç verim oranını verir.
-NOMINAL			= NOMİNAL			##	Yıllık nominal faiz oranını verir.
-NPER			= DÖNEM_SAYISI		##	Bir yatırımın dönem sayısını verir.
-NPV				= NBD				##	Bir yatırımın bugünkü net değerini, bir dönemsel para akışları serisine ve bir indirim oranına bağlı olarak verir.
-ODDFPRICE		= TEKYDEĞER			##	Tek bir ilk dönemi olan bir tahvilin değerini, her 100.000.000 lirada bir verir.
-ODDFYIELD		= TEKYÖDEME			##	Tek bir ilk dönemi olan bir tahvilin ödemesini verir.
-ODDLPRICE		= TEKSDEĞER			##	Tek bir son dönemi olan bir tahvilin fiyatını her 10.000.000 lirada bir verir.
-ODDLYIELD		= TEKSÖDEME			##	Tek bir son dönemi olan bir tahvilin ödemesini verir.
-PMT				= DEVRESEL_ÖDEME	##	Bir yıllık dönemsel ödemeyi verir.
-PPMT			= ANA_PARA_ÖDEMESİ	##	Verilen bir süre için, bir yatırımın anaparasına dayanan ödemeyi verir.
-PRICE			= DEĞER				##	Dönemsel faiz ödeyen bir tahvilin fiyatını 10.000.00 liralık değer başına verir.
-PRICEDISC		= DEĞERİND			##	İndirimli bir tahvilin fiyatını 10.000.000 liralık nominal değer başına verir.
-PRICEMAT		= DEĞERVADE			##	Faizini vade sonunda ödeyen bir tahvilin fiyatını 10.000.000 nominal değer başına verir.
-PV				= BD				##	Bir yatırımın bugünkü değerini verir.
-RATE			= FAİZ_ORANI		##	Bir yıllık dönem başına düşen faiz oranını verir.
-RECEIVED		= GETİRİ			##	Tam olarak yatırılmış bir tahvilin vadesinin bitiminde alınan miktarı verir.
-SLN				= DA				##	Bir malın bir dönem içindeki doğrusal yıpranmasını verir.
-SYD				= YAT				##	Bir malın belirli bir dönem için olan amortismanını verir.
-TBILLEQ			= HTAHEŞ			##	Bir Hazine bonosunun bono eşdeğeri ödemesini verir.
-TBILLPRICE		= HTAHDEĞER			##	Bir Hazine bonosunun değerini, 10.000.000 liralık nominal değer başına verir.
-TBILLYIELD		= HTAHÖDEME			##	Bir Hazine bonosunun ödemesini verir.
-VDB				= DAB				##	Bir malın amortismanını, belirlenmiş ya da kısmi bir dönem için, bir azalan bakiye yöntemi kullanarak verir.
-XIRR			= AİÇVERİMORANI		##	Dönemsel olması gerekmeyen bir para akışları programı için, iç verim oranını verir.
-XNPV			= ANBD				##	Dönemsel olması gerekmeyen bir para akışları programı için, bugünkü net değeri verir.
-YIELD			= ÖDEME				##	Belirli aralıklarla faiz ödeyen bir tahvilin ödemesini verir.
-YIELDDISC		= ÖDEMEİND			##	İndirimli bir tahvilin yıllık ödemesini verir; örneğin, bir Hazine bonosunun.
-YIELDMAT		= ÖDEMEVADE			##	Vadesinin bitiminde faiz ödeyen bir tahvilin yıllık ödemesini verir.
-
+CELL = HÜCRE
+ERROR.TYPE = HATA.TİPİ
+INFO = BİLGİ
+ISBLANK = EBOŞSA
+ISERR = EHATA
+ISERROR = EHATALIYSA
+ISEVEN = ÇİFTMİ
+ISFORMULA = EFORMÜLSE
+ISLOGICAL = EMANTIKSALSA
+ISNA = EYOKSA
+ISNONTEXT = EMETİNDEĞİLSE
+ISNUMBER = ESAYIYSA
+ISODD = TEKMİ
+ISREF = EREFSE
+ISTEXT = EMETİNSE
+N = S
+NA = YOKSAY
+SHEET = SAYFA
+SHEETS = SAYFALAR
+TYPE = TÜR
 
 ##
-##	Information functions				Bilgi fonksiyonları
+## Mantıksal işlevler (Logical Functions)
 ##
-CELL			= HÜCRE			##	Bir hücrenin biçimlendirmesi, konumu ya da içeriği hakkında bilgi verir.
-ERROR.TYPE		= HATA.TİPİ		##	Bir hata türüne ilişkin sayıları verir.
-INFO			= BİLGİ			##	Geçerli işletim ortamı hakkında bilgi verir.
-ISBLANK			= EBOŞSA		##	Değer boşsa, DOĞRU verir.
-ISERR			= EHATA			##	Değer, #YOK dışındaki bir hata değeriyse, DOĞRU verir.
-ISERROR			= EHATALIYSA	##	Değer, herhangi bir hata değeriyse, DOĞRU verir.
-ISEVEN			= ÇİFTTİR		##	Sayı çiftse, DOĞRU verir.
-ISLOGICAL		= EMANTIKSALSA	##	Değer, mantıksal bir değerse, DOĞRU verir.
-ISNA			= EYOKSA		##	Değer, #YOK hata değeriyse, DOĞRU verir.
-ISNONTEXT		= EMETİNDEĞİLSE	##	Değer, metin değilse, DOĞRU verir.
-ISNUMBER		= ESAYIYSA		##	Değer, bir sayıysa, DOĞRU verir.
-ISODD			= TEKTİR		##	Sayı tekse, DOĞRU verir.
-ISREF			= EREFSE		##	Değer bir başvuruysa, DOĞRU verir.
-ISTEXT			= EMETİNSE		##	Değer bir metinse DOĞRU verir.
-N				= N				##	Sayıya dönüştürülmüş bir değer verir.
-NA				= YOKSAY		##	#YOK hata değerini verir.
-TYPE			= TİP			##	Bir değerin veri türünü belirten bir sayı verir.
-
+AND = VE
+FALSE = YANLIŞ
+IF = EĞER
+IFERROR = EĞERHATA
+IFNA = EĞERYOKSA
+IFS = ÇOKEĞER
+NOT = DEĞİL
+OR = YADA
+SWITCH = İLKEŞLEŞEN
+TRUE = DOĞRU
+XOR = ÖZELVEYA
 
 ##
-##	Logical functions				Mantıksal fonksiyonlar
+## Arama ve başvuru işlevleri (Lookup & Reference Functions)
 ##
-AND				= VE			##	Bütün bağımsız değişkenleri DOĞRU ise, DOĞRU verir.
-FALSE			= YANLIŞ		##	YANLIŞ mantıksal değerini verir.
-IF				= EĞER			##	Gerçekleştirilecek bir mantıksal sınama belirtir.
-IFERROR			= EĞERHATA		##	Formül hatalıysa belirttiğiniz değeri verir; bunun dışındaki durumlarda formülün sonucunu verir.
-NOT				= DEĞİL			##	Bağımsız değişkeninin mantığını tersine çevirir.
-OR				= YADA			##	Bağımsız değişkenlerden herhangi birisi DOĞRU ise, DOĞRU verir.
-TRUE			= DOĞRU			##	DOĞRU mantıksal değerini verir.
-
+ADDRESS = ADRES
+AREAS = ALANSAY
+CHOOSE = ELEMAN
+COLUMN = SÜTUN
+COLUMNS = SÜTUNSAY
+FORMULATEXT = FORMÜLMETNİ
+GETPIVOTDATA = ÖZETVERİAL
+HLOOKUP = YATAYARA
+HYPERLINK = KÖPRÜ
+INDEX = İNDİS
+INDIRECT = DOLAYLI
+LOOKUP = ARA
+MATCH = KAÇINCI
+OFFSET = KAYDIR
+ROW = SATIR
+ROWS = SATIRSAY
+RTD = GZV
+TRANSPOSE = DEVRİK_DÖNÜŞÜM
+VLOOKUP = DÜŞEYARA
 
 ##
-##	Lookup and reference functions			Arama ve Başvuru fonksiyonları
+## Matematik ve trigonometri işlevleri (Math & Trig Functions)
 ##
-ADDRESS			= ADRES				##	Bir başvuruyu, çalışma sayfasındaki tek bir hücreye metin olarak verir.
-AREAS			= ALANSAY			##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= ELEMAN			##	Değerler listesinden bir değer seçer.
-COLUMN			= SÜTUN				##	Bir başvurunun sütun sayısını verir.
-COLUMNS			= SÜTUNSAY			##	Bir başvurudaki sütunların sayısını verir.
-HLOOKUP			= YATAYARA			##	Bir dizinin en üst satırına bakar ve belirtilen hücrenin değerini verir.
-HYPERLINK		= KÖPRÜ				##	Bir ağ sunucusunda, bir intranette ya da Internet'te depolanan bir belgeyi açan bir kısayol ya da atlama oluşturur.
-INDEX			= İNDİS				##	Başvurudan veya diziden bir değer seçmek için, bir dizin kullanır.
-INDIRECT		= DOLAYLI			##	Metin değeriyle belirtilen bir başvuru verir.
-LOOKUP			= ARA				##	Bir vektördeki veya dizideki değerleri arar.
-MATCH			= KAÇINCI			##	Bir başvurudaki veya dizideki değerleri arar.
-OFFSET			= KAYDIR			##	Verilen bir başvurudan, bir başvuru kaydırmayı verir.
-ROW				= SATIR				##	Bir başvurunun satır sayısını verir.
-ROWS			= SATIRSAY			##	Bir başvurudaki satırların sayısını verir.
-RTD				= RTD				##	COM otomasyonunu destekleyen programdan gerçek zaman verileri alır.
-TRANSPOSE		= DEVRİK_DÖNÜŞÜM	##	Bir dizinin devrik dönüşümünü verir.
-VLOOKUP			= DÜŞEYARA			##	Bir dizinin ilk sütununa bakar ve bir hücrenin değerini vermek için satır boyunca hareket eder.
-
+ABS = MUTLAK
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = TOPLAMA
+ARABIC = ARAP
+ASIN = ASİN
+ASINH = ASİNH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = TABAN
+CEILING.MATH = TAVANAYUVARLA.MATEMATİK
+CEILING.PRECISE = TAVANAYUVARLA.DUYARLI
+COMBIN = KOMBİNASYON
+COMBINA = KOMBİNASYONA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = ONDALIK
+DEGREES = DERECE
+ECMA.CEILING = ECMA.TAVAN
+EVEN = ÇİFT
+EXP = ÜS
+FACT = ÇARPINIM
+FACTDOUBLE = ÇİFTFAKTÖR
+FLOOR.MATH = TABANAYUVARLA.MATEMATİK
+FLOOR.PRECISE = TABANAYUVARLA.DUYARLI
+GCD = OBEB
+INT = TAMSAYI
+ISO.CEILING = ISO.TAVAN
+LCM = OKEK
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMİNANT
+MINVERSE = DİZEY_TERS
+MMULT = DÇARP
+MOD = MOD
+MROUND = KYUVARLA
+MULTINOMIAL = ÇOKTERİMLİ
+MUNIT = BİRİMMATRİS
+ODD = TEK
+PI = Pİ
+POWER = KUVVET
+PRODUCT = ÇARPIM
+QUOTIENT = BÖLÜM
+RADIANS = RADYAN
+RAND = S_SAYI_ÜRET
+RANDBETWEEN = RASTGELEARADA
+ROMAN = ROMEN
+ROUND = YUVARLA
+ROUNDBAHTDOWN = BAHTAŞAĞIYUVARLA
+ROUNDBAHTUP = BAHTYUKARIYUVARLA
+ROUNDDOWN = AŞAĞIYUVARLA
+ROUNDUP = YUKARIYUVARLA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERİTOPLA
+SIGN = İŞARET
+SIN = SİN
+SINH = SİNH
+SQRT = KAREKÖK
+SQRTPI = KAREKÖKPİ
+SUBTOTAL = ALTTOPLAM
+SUM = TOPLA
+SUMIF = ETOPLA
+SUMIFS = ÇOKETOPLA
+SUMPRODUCT = TOPLA.ÇARPIM
+SUMSQ = TOPKARE
+SUMX2MY2 = TOPX2EY2
+SUMX2PY2 = TOPX2AY2
+SUMXMY2 = TOPXEY2
+TAN = TAN
+TANH = TANH
+TRUNC = NSAT
 
 ##
-##	Math and trigonometry functions			Matematik ve trigonometri fonksiyonları
+## İstatistik işlevleri (Statistical Functions)
 ##
-ABS				= MUTLAK			##	Bir sayının mutlak değerini verir.
-ACOS			= ACOS				##	Bir sayının ark kosinüsünü verir.
-ACOSH			= ACOSH				##	Bir sayının ters hiperbolik kosinüsünü verir.
-ASIN			= ASİN				##	Bir sayının ark sinüsünü verir.
-ASINH			= ASİNH				##	Bir sayının ters hiperbolik sinüsünü verir.
-ATAN			= ATAN				##	Bir sayının ark tanjantını verir.
-ATAN2			= ATAN2				##	Ark tanjantı, x- ve y- koordinatlarından verir.
-ATANH			= ATANH				##	Bir sayının ters hiperbolik tanjantını verir.
-CEILING			= TAVANAYUVARLA		##	Bir sayıyı, en yakın tamsayıya ya da en yakın katına yuvarlar.
-COMBIN			= KOMBİNASYON		##	Verilen sayıda öğenin kombinasyon sayısını verir.
-COS				= COS				##	Bir sayının kosinüsünü verir.
-COSH			= COSH				##	Bir sayının hiperbolik kosinüsünü verir.
-DEGREES			= DERECE			##	Radyanları dereceye dönüştürür.
-EVEN			= ÇİFT				##	Bir sayıyı, en yakın daha büyük çift tamsayıya yuvarlar.
-EXP				= ÜS				##	e'yi, verilen bir sayının üssüne yükseltilmiş olarak verir.
-FACT			= ÇARPINIM			##	Bir sayının faktörünü verir.
-FACTDOUBLE		= ÇİFTFAKTÖR		##	Bir sayının çift çarpınımını verir.
-FLOOR			= TABANAYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-GCD				= OBEB				##	En büyük ortak böleni verir.
-INT				= TAMSAYI			##	Bir sayıyı aşağıya doğru en yakın tamsayıya yuvarlar.
-LCM				= OKEK				##	En küçük ortak katı verir.
-LN				= LN				##	Bir sayının doğal logaritmasını verir.
-LOG				= LOG				##	Bir sayının, belirtilen bir tabandaki logaritmasını verir.
-LOG10			= LOG10				##	Bir sayının 10 tabanında logaritmasını verir.
-MDETERM			= DETERMİNANT		##	Bir dizinin dizey determinantını verir.
-MINVERSE		= DİZEY_TERS		##	Bir dizinin dizey tersini verir.
-MMULT			= DÇARP				##	İki dizinin dizey çarpımını verir.
-MOD				= MODÜLO			##	Bölmeden kalanı verir.
-MROUND			= KYUVARLA			##	İstenen kata yuvarlanmış bir sayı verir.
-MULTINOMIAL		= ÇOKTERİMLİ		##	Bir sayılar kümesinin çok terimlisini verir.
-ODD				= TEK				##	Bir sayıyı en yakın daha büyük tek sayıya yuvarlar.
-PI				= Pİ				##	Pi değerini verir.
-POWER			= KUVVET			##	Bir üsse yükseltilmiş sayının sonucunu verir.
-PRODUCT			= ÇARPIM			##	Bağımsız değişkenlerini çarpar.
-QUOTIENT		= BÖLÜM				##	Bir bölme işleminin tamsayı kısmını verir.
-RADIANS			= RADYAN			##	Dereceleri radyanlara dönüştürür.
-RAND			= S_SAYI_ÜRET		##	0 ile 1 arasında rastgele bir sayı verir.
-RANDBETWEEN		= RASTGELEARALIK	##	Belirttiğiniz sayılar arasında rastgele bir sayı verir.
-ROMAN			= ROMEN				##	Bir normal rakamı, metin olarak, romen rakamına çevirir.
-ROUND			= YUVARLA			##	Bir sayıyı, belirtilen basamak sayısına yuvarlar.
-ROUNDDOWN		= AŞAĞIYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-ROUNDUP			= YUKARIYUVARLA		##	Bir sayıyı daha büyük sayıya, sıfırdan ıraksayarak yuvarlar.
-SERIESSUM		= SERİTOPLA			##	Bir üs serisinin toplamını, formüle bağlı olarak verir.
-SIGN			= İŞARET			##	Bir sayının işaretini verir.
-SIN				= SİN				##	Verilen bir açının sinüsünü verir.
-SINH			= SİNH				##	Bir sayının hiperbolik sinüsünü verir.
-SQRT			= KAREKÖK			##	Pozitif bir karekök verir.
-SQRTPI			= KAREKÖKPİ			##	(* Pi sayısının) kare kökünü verir.
-SUBTOTAL		= ALTTOPLAM			##	Bir listedeki ya da veritabanındaki bir alt toplamı verir.
-SUM				= TOPLA				##	Bağımsız değişkenlerini toplar.
-SUMIF			= ETOPLA			##	Verilen ölçütle belirlenen hücreleri toplar.
-SUMIFS			= SUMIFS			##	Bir aralıktaki, birden fazla ölçüte uyan hücreleri ekler.
-SUMPRODUCT		= TOPLA.ÇARPIM		##	İlişkili dizi bileşenlerinin çarpımlarının toplamını verir.
-SUMSQ			= TOPKARE			##	Bağımsız değişkenlerin karelerinin toplamını verir.
-SUMX2MY2		= TOPX2EY2			##	İki dizideki ilişkili değerlerin farkının toplamını verir.
-SUMX2PY2		= TOPX2AY2			##	İki dizideki ilişkili değerlerin karelerinin toplamının toplamını verir.
-SUMXMY2			= TOPXEY2			##	İki dizideki ilişkili değerlerin farklarının karelerinin toplamını verir.
-TAN				= TAN				##	Bir sayının tanjantını verir.
-TANH			= TANH				##	Bir sayının hiperbolik tanjantını verir.
-TRUNC			= NSAT				##	Bir sayının, tamsayı durumuna gelecek şekilde, fazlalıklarını atar.
-
+AVEDEV = ORTSAP
+AVERAGE = ORTALAMA
+AVERAGEA = ORTALAMAA
+AVERAGEIF = EĞERORTALAMA
+AVERAGEIFS = ÇOKEĞERORTALAMA
+BETA.DIST = BETA.DAĞ
+BETA.INV = BETA.TERS
+BINOM.DIST = BİNOM.DAĞ
+BINOM.DIST.RANGE = BİNOM.DAĞ.ARALIK
+BINOM.INV = BİNOM.TERS
+CHISQ.DIST = KİKARE.DAĞ
+CHISQ.DIST.RT = KİKARE.DAĞ.SAĞK
+CHISQ.INV = KİKARE.TERS
+CHISQ.INV.RT = KİKARE.TERS.SAĞK
+CHISQ.TEST = KİKARE.TEST
+CONFIDENCE.NORM = GÜVENİLİRLİK.NORM
+CONFIDENCE.T = GÜVENİLİRLİK.T
+CORREL = KORELASYON
+COUNT = BAĞ_DEĞ_SAY
+COUNTA = BAĞ_DEĞ_DOLU_SAY
+COUNTBLANK = BOŞLUKSAY
+COUNTIF = EĞERSAY
+COUNTIFS = ÇOKEĞERSAY
+COVARIANCE.P = KOVARYANS.P
+COVARIANCE.S = KOVARYANS.S
+DEVSQ = SAPKARE
+EXPON.DIST = ÜSTEL.DAĞ
+F.DIST = F.DAĞ
+F.DIST.RT = F.DAĞ.SAĞK
+F.INV = F.TERS
+F.INV.RT = F.TERS.SAĞK
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERTERS
+FORECAST.ETS = TAHMİN.ETS
+FORECAST.ETS.CONFINT = TAHMİN.ETS.GVNARAL
+FORECAST.ETS.SEASONALITY = TAHMİN.ETS.MEVSİMSELLİK
+FORECAST.ETS.STAT = TAHMİN.ETS.İSTAT
+FORECAST.LINEAR = TAHMİN.DOĞRUSAL
+FREQUENCY = SIKLIK
+GAMMA = GAMA
+GAMMA.DIST = GAMA.DAĞ
+GAMMA.INV = GAMA.TERS
+GAMMALN = GAMALN
+GAMMALN.PRECISE = GAMALN.DUYARLI
+GAUSS = GAUSS
+GEOMEAN = GEOORT
+GROWTH = BÜYÜME
+HARMEAN = HARORT
+HYPGEOM.DIST = HİPERGEOM.DAĞ
+INTERCEPT = KESMENOKTASI
+KURT = BASIKLIK
+LARGE = BÜYÜK
+LINEST = DOT
+LOGEST = LOT
+LOGNORM.DIST = LOGNORM.DAĞ
+LOGNORM.INV = LOGNORM.TERS
+MAX = MAK
+MAXA = MAKA
+MAXIFS = ÇOKEĞERMAK
+MEDIAN = ORTANCA
+MIN = MİN
+MINA = MİNA
+MINIFS = ÇOKEĞERMİN
+MODE.MULT = ENÇOK_OLAN.ÇOK
+MODE.SNGL = ENÇOK_OLAN.TEK
+NEGBINOM.DIST = NEGBİNOM.DAĞ
+NORM.DIST = NORM.DAĞ
+NORM.INV = NORM.TERS
+NORM.S.DIST = NORM.S.DAĞ
+NORM.S.INV = NORM.S.TERS
+PEARSON = PEARSON
+PERCENTILE.EXC = YÜZDEBİRLİK.HRC
+PERCENTILE.INC = YÜZDEBİRLİK.DHL
+PERCENTRANK.EXC = YÜZDERANK.HRC
+PERCENTRANK.INC = YÜZDERANK.DHL
+PERMUT = PERMÜTASYON
+PERMUTATIONA = PERMÜTASYONA
+PHI = PHI
+POISSON.DIST = POISSON.DAĞ
+PROB = OLASILIK
+QUARTILE.EXC = DÖRTTEBİRLİK.HRC
+QUARTILE.INC = DÖRTTEBİRLİK.DHL
+RANK.AVG = RANK.ORT
+RANK.EQ = RANK.EŞİT
+RSQ = RKARE
+SKEW = ÇARPIKLIK
+SKEW.P = ÇARPIKLIK.P
+SLOPE = EĞİM
+SMALL = KÜÇÜK
+STANDARDIZE = STANDARTLAŞTIRMA
+STDEV.P = STDSAPMA.P
+STDEV.S = STDSAPMA.S
+STDEVA = STDSAPMAA
+STDEVPA = STDSAPMASA
+STEYX = STHYX
+T.DIST = T.DAĞ
+T.DIST.2T = T.DAĞ.2K
+T.DIST.RT = T.DAĞ.SAĞK
+T.INV = T.TERS
+T.INV.2T = T.TERS.2K
+T.TEST = T.TEST
+TREND = EĞİLİM
+TRIMMEAN = KIRPORTALAMA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARSA
+WEIBULL.DIST = WEIBULL.DAĞ
+Z.TEST = Z.TEST
 
 ##
-##	Statistical functions				İstatistiksel fonksiyonlar
+## Metin işlevleri (Text Functions)
 ##
-AVEDEV			= ORTSAP			##	Veri noktalarının ortalamalarından mutlak sapmalarının ortalamasını verir.
-AVERAGE			= ORTALAMA			##	Bağımsız değişkenlerinin ortalamasını verir.
-AVERAGEA		= ORTALAMAA			##	Bağımsız değişkenlerinin, sayılar, metin ve mantıksal değerleri içermek üzere ortalamasını verir.
-AVERAGEIF		= EĞERORTALAMA 		##	Verili ölçütü karşılayan bir aralıktaki bütün hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-AVERAGEIFS		= EĞERLERORTALAMA 	##	Birden çok ölçüte uyan tüm hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-BETADIST		= BETADAĞ			##	Beta birikimli dağılım fonksiyonunu verir.
-BETAINV			= BETATERS			##	Belirli bir beta dağılımı için birikimli dağılım fonksiyonunun tersini verir.
-BINOMDIST		= BİNOMDAĞ			##	Tek terimli binom dağılımı olasılığını verir.
-CHIDIST			= KİKAREDAĞ			##	Kikare dağılımın tek kuyruklu olasılığını verir.
-CHIINV			= KİKARETERS		##	Kikare dağılımın kuyruklu olasılığının tersini verir.
-CHITEST			= KİKARETEST		##	Bağımsızlık sınamalarını verir.
-CONFIDENCE		= GÜVENİRLİK		##	Bir popülasyon ortalaması için güvenirlik aralığını verir.
-CORREL			= KORELASYON		##	İki veri kümesi arasındaki bağlantı katsayısını verir.
-COUNT			= BAĞ_DEĞ_SAY		##	Bağımsız değişkenler listesinde kaç tane sayı bulunduğunu sayar.
-COUNTA			= BAĞ_DEĞ_DOLU_SAY	##	Bağımsız değişkenler listesinde kaç tane değer bulunduğunu sayar.
-COUNTBLANK		= BOŞLUKSAY 		##	Aralıktaki boş hücre sayısını hesaplar.
-COUNTIF			= EĞERSAY 			##	Verilen ölçütlere uyan bir aralık içindeki hücreleri sayar.
-COUNTIFS		= ÇOKEĞERSAY 		##	Birden çok ölçüte uyan bir aralık içindeki hücreleri sayar.
-COVAR			= KOVARYANS 		##	Eşleştirilmiş sapmaların ortalaması olan kovaryansı verir.
-CRITBINOM		= KRİTİKBİNOM		##	Birikimli binom dağılımının bir ölçüt değerinden küçük veya ölçüt değerine eşit olduğu en küçük değeri verir.
-DEVSQ			= SAPKARE			##	Sapmaların karelerinin toplamını verir.
-EXPONDIST		= ÜSTELDAĞ			##	Üstel dağılımı verir.
-FDIST			= FDAĞ				##	F olasılık dağılımını verir.
-FINV			= FTERS				##	F olasılık dağılımının tersini verir.
-FISHER			= FISHER			##	Fisher dönüşümünü verir.
-FISHERINV		= FISHERTERS		##	Fisher dönüşümünün tersini verir.
-FORECAST		= TAHMİN			##	Bir doğrusal eğilim boyunca bir değer verir.
-FREQUENCY		= SIKLIK			##	Bir sıklık dağılımını, dikey bir dizi olarak verir.
-FTEST			= FTEST				##	Bir F-test'in sonucunu verir.
-GAMMADIST		= GAMADAĞ			##	Gama dağılımını verir.
-GAMMAINV		= GAMATERS			##	Gama kümülatif dağılımının tersini verir.
-GAMMALN			= GAMALN			##	Gama fonksiyonunun (?(x)) doğal logaritmasını verir.
-GEOMEAN			= GEOORT			##	Geometrik ortayı verir.
-GROWTH			= BÜYÜME			##	Üstel bir eğilim boyunca değerler verir.
-HARMEAN			= HARORT			##	Harmonik ortayı verir.
-HYPGEOMDIST		= HİPERGEOMDAĞ		##	Hipergeometrik dağılımı verir.
-INTERCEPT		= KESMENOKTASI		##	Doğrusal çakıştırma çizgisinin kesişme noktasını verir.
-KURT			= BASIKLIK			##	Bir veri kümesinin basıklığını verir.
-LARGE			= BÜYÜK				##	Bir veri kümesinde k. en büyük değeri verir.
-LINEST			= DOT				##	Doğrusal bir eğilimin parametrelerini verir.
-LOGEST			= LOT				##	Üstel bir eğilimin parametrelerini verir.
-LOGINV			= LOGTERS			##	Bir lognormal dağılımının tersini verir.
-LOGNORMDIST		= LOGNORMDAĞ		##	Birikimli lognormal dağılımını verir.
-MAX				= MAK				##	Bir bağımsız değişkenler listesindeki en büyük değeri verir.
-MAXA			= MAKA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri içermek üzere, en büyük değeri verir.
-MEDIAN			= ORTANCA			##	Belirtilen sayıların orta değerini verir.
-MIN				= MİN				##	Bir bağımsız değişkenler listesindeki en küçük değeri verir.
-MINA			= MİNA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri de içermek üzere, en küçük değeri verir.
-MODE			= ENÇOK_OLAN		##	Bir veri kümesindeki en sık rastlanan değeri verir.
-NEGBINOMDIST	= NEGBİNOMDAĞ		##	Negatif binom dağılımını verir.
-NORMDIST		= NORMDAĞ			##	Normal birikimli dağılımı verir.
-NORMINV			= NORMTERS			##	Normal kümülatif dağılımın tersini verir.
-NORMSDIST		= NORMSDAĞ			##	Standart normal birikimli dağılımı verir.
-NORMSINV		= NORMSTERS			##	Standart normal birikimli dağılımın tersini verir.
-PEARSON			= PEARSON			##	Pearson çarpım moment korelasyon katsayısını verir.
-PERCENTILE		= YÜZDEBİRLİK		##	Bir aralık içerisinde bulunan değerlerin k. frekans toplamını verir.
-PERCENTRANK		= YÜZDERANK			##	Bir veri kümesindeki bir değerin yüzde mertebesini verir.
-PERMUT			= PERMÜTASYON		##	Verilen sayıda nesne için permütasyon sayısını verir.
-POISSON			= POISSON			##	Poisson dağılımını verir.
-PROB			= OLASILIK			##	Bir aralıktaki değerlerin iki sınır arasında olması olasılığını verir.
-QUARTILE		= DÖRTTEBİRLİK		##	Bir veri kümesinin dörtte birliğini verir.
-RANK			= RANK				##	Bir sayılar listesinde bir sayının mertebesini verir.
-RSQ				= RKARE				##	Pearson çarpım moment korelasyon katsayısının karesini verir.
-SKEW			= ÇARPIKLIK			##	Bir dağılımın çarpıklığını verir.
-SLOPE			= EĞİM				##	Doğrusal çakışma çizgisinin eğimini verir.
-SMALL			= KÜÇÜK				##	Bir veri kümesinde k. en küçük değeri verir.
-STANDARDIZE		= STANDARTLAŞTIRMA	##	Normalleştirilmiş bir değer verir.
-STDEV			= STDSAPMA			##	Bir örneğe dayanarak standart sapmayı tahmin eder.
-STDEVA			= STDSAPMAA			##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-STDEVP			= STDSAPMAS			##	Standart sapmayı, tüm popülasyona bağlı olarak hesaplar.
-STDEVPA			= STDSAPMASA		##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-STEYX			= STHYX				##	Regresyondaki her x için tahmini y değerinin standart hatasını verir.
-TDIST			= TDAĞ				##	T-dağılımını verir.
-TINV			= TTERS				##	T-dağılımının tersini verir.
-TREND			= EĞİLİM			##	Doğrusal bir eğilim boyunca değerler verir.
-TRIMMEAN		= KIRPORTALAMA		##	Bir veri kümesinin içinin ortalamasını verir.
-TTEST			= TTEST				##	T-test'le ilişkilendirilmiş olasılığı verir.
-VAR				= VAR				##	Varyansı, bir örneğe bağlı olarak tahmin eder.
-VARA			= VARA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-VARP			= VARS				##	Varyansı, tüm popülasyona dayanarak hesaplar.
-VARPA			= VARSA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-WEIBULL			= WEIBULL			##	Weibull dağılımını hesaplar.
-ZTEST			= ZTEST				##	Z-testinin tek kuyruklu olasılık değerini hesaplar.
-
+BAHTTEXT = BAHTMETİN
+CHAR = DAMGA
+CLEAN = TEMİZ
+CODE = KOD
+CONCAT = ARALIKBİRLEŞTİR
+DOLLAR = LİRA
+EXACT = ÖZDEŞ
+FIND = BUL
+FIXED = SAYIDÜZENLE
+ISTHAIDIGIT = TAYRAKAMIYSA
+LEFT = SOLDAN
+LEN = UZUNLUK
+LOWER = KÜÇÜKHARF
+MID = PARÇAAL
+NUMBERSTRING = SAYIDİZİ
+NUMBERVALUE = SAYIDEĞERİ
+PHONETIC = SES
+PROPER = YAZIM.DÜZENİ
+REPLACE = DEĞİŞTİR
+REPT = YİNELE
+RIGHT = SAĞDAN
+SEARCH = MBUL
+SUBSTITUTE = YERİNEKOY
+T = M
+TEXT = METNEÇEVİR
+TEXTJOIN = METİNBİRLEŞTİR
+THAIDIGIT = TAYRAKAM
+THAINUMSOUND = TAYSAYISES
+THAINUMSTRING = TAYSAYIDİZE
+THAISTRINGLENGTH = TAYDİZEUZUNLUĞU
+TRIM = KIRP
+UNICHAR = UNICODEKARAKTERİ
+UNICODE = UNICODE
+UPPER = BÜYÜKHARF
+VALUE = SAYIYAÇEVİR
 
 ##
-##	Text functions					Metin fonksiyonları
+## Metin işlevleri (Web Functions)
 ##
-ASC				= ASC 				##	Bir karakter dizesindeki çift enli (iki bayt) İngilizce harfleri veya katakanayı yarım enli (tek bayt) karakterlerle değiştirir.
-BAHTTEXT		= BAHTTEXT 			##	Sayıyı, ß (baht) para birimi biçimini kullanarak metne dönüştürür.
-CHAR			= DAMGA 			##	Kod sayısıyla belirtilen karakteri verir.
-CLEAN			= TEMİZ				##	Metindeki bütün yazdırılamaz karakterleri kaldırır.
-CODE			= KOD				##	Bir metin dizesindeki ilk karakter için sayısal bir kod verir.
-CONCATENATE		= BİRLEŞTİR			##	Pek çok metin öğesini bir metin öğesi olarak birleştirir.
-DOLLAR			= LİRA				##	Bir sayıyı YTL (yeni Türk lirası) para birimi biçimini kullanarak metne dönüştürür.
-EXACT			= ÖZDEŞ				##	İki metin değerinin özdeş olup olmadığını anlamak için, değerleri denetler.
-FIND			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FINDB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FIXED			= SAYIDÜZENLE		##	Bir sayıyı, sabit sayıda ondalıkla, metin olarak biçimlendirir.
-JIS				= JIS				##	Bir karakter dizesindeki tek enli (tek bayt) İngilizce harfleri veya katakanayı çift enli (iki bayt) karakterlerle değiştirir.
-LEFT			= SOL				##	Bir metin değerinden en soldaki karakterleri verir.
-LEFTB			= SOLB				##	Bir metin değerinden en soldaki karakterleri verir.
-LEN				= UZUNLUK			##	Bir metin dizesindeki karakter sayısını verir.
-LENB			= UZUNLUKB			##	Bir metin dizesindeki karakter sayısını verir.
-LOWER			= KÜÇÜKHARF			##	Metni küçük harfe çevirir.
-MID				= ORTA				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-MIDB			= ORTAB				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-PHONETIC		= SES				##	Metin dizesinden ses (furigana) karakterlerini ayıklar.
-PROPER			= YAZIM.DÜZENİ		##	Bir metin değerinin her bir sözcüğünün ilk harfini büyük harfe çevirir.
-REPLACE			= DEĞİŞTİR			##	Metnin içindeki karakterleri değiştirir.
-REPLACEB		= DEĞİŞTİRB			##	Metnin içindeki karakterleri değiştirir.
-REPT			= YİNELE			##	Metni belirtilen sayıda yineler.
-RIGHT			= SAĞ				##	Bir metin değerinden en sağdaki karakterleri verir.
-RIGHTB			= SAĞB				##	Bir metin değerinden en sağdaki karakterleri verir.
-SEARCH			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SEARCHB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SUBSTITUTE		= YERİNEKOY			##	Bir metin dizesinde, eski metnin yerine yeni metin koyar.
-T				= M					##	Bağımsız değerlerini metne dönüştürür.
-TEXT			= METNEÇEVİR		##	Bir sayıyı biçimlendirir ve metne dönüştürür.
-TRIM			= KIRP				##	Metindeki boşlukları kaldırır.
-UPPER			= BÜYÜKHARF			##	Metni büyük harfe çevirir.
-VALUE			= SAYIYAÇEVİR		##	Bir metin bağımsız değişkenini sayıya dönüştürür.
+ENCODEURL = URLKODLA
+FILTERXML = XMLFİLTRELE
+WEBSERVICE = WEBHİZMETİ
+
+##
+## Uyumluluk işlevleri (Compatibility Functions)
+##
+BETADIST = BETADAĞ
+BETAINV = BETATERS
+BINOMDIST = BİNOMDAĞ
+CEILING = TAVANAYUVARLA
+CHIDIST = KİKAREDAĞ
+CHIINV = KİKARETERS
+CHITEST = KİKARETEST
+CONCATENATE = BİRLEŞTİR
+CONFIDENCE = GÜVENİRLİK
+COVAR = KOVARYANS
+CRITBINOM = KRİTİKBİNOM
+EXPONDIST = ÜSTELDAĞ
+FDIST = FDAĞ
+FINV = FTERS
+FLOOR = TABANAYUVARLA
+FORECAST = TAHMİN
+FTEST = FTEST
+GAMMADIST = GAMADAĞ
+GAMMAINV = GAMATERS
+HYPGEOMDIST = HİPERGEOMDAĞ
+LOGINV = LOGTERS
+LOGNORMDIST = LOGNORMDAĞ
+MODE = ENÇOK_OLAN
+NEGBINOMDIST = NEGBİNOMDAĞ
+NORMDIST = NORMDAĞ
+NORMINV = NORMTERS
+NORMSDIST = NORMSDAĞ
+NORMSINV = NORMSTERS
+PERCENTILE = YÜZDEBİRLİK
+PERCENTRANK = YÜZDERANK
+POISSON = POISSON
+QUARTILE = DÖRTTEBİRLİK
+RANK = RANK
+STDEV = STDSAPMA
+STDEVP = STDSAPMAS
+TDIST = TDAĞ
+TINV = TTERS
+TTEST = TTEST
+VAR = VAR
+VARP = VARS
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
new file mode 100644
index 000000000..ed765aa59
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -0,0 +1,177 @@
+<?php
+
+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()
+    {
+        $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,
+        bool $useLocale = true
+    ): string {
+        [$rowChar, $colChar] = $useLocale ? self::getRowAndColumnChars() : ['R', 'C'];
+        $regex = '/^(' . $rowChar . '(\[?[-+]?\d*\]?))(' . $colChar . '(\[?[-+]?\d*\]?))$/i';
+        $validityCheck = preg_match($regex, $address, $cellReference);
+
+        if (empty($validityCheck)) {
+            throw new Exception('Invalid R1C1-format Cell Reference');
+        }
+
+        $rowReference = $cellReference[2];
+        //    Empty R reference is the current row
+        if ($rowReference === '') {
+            $rowReference = (string) $currentRowNumber;
+        }
+        //    Bracketed R references are relative to the current row
+        if ($rowReference[0] === '[') {
+            $rowReference = $currentRowNumber + (int) trim($rowReference, '[]');
+        }
+        $columnReference = $cellReference[4];
+        //    Empty C reference is the current column
+        if ($columnReference === '') {
+            $columnReference = (string) $currentColumnNumber;
+        }
+        //    Bracketed C references are relative to the current column
+        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');
+        }
+        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+
+        return $A1CellReference;
+    }
+
+    protected static function convertSpreadsheetMLFormula(string $formula): string
+    {
+        $formula = substr($formula, 3);
+        $temp = explode('"', $formula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only replace in alternate array entries (i.e. non-quoted blocks)
+            $key = $key === false;
+            if ($key) {
+                $value = str_replace(['[.', ':.', ']'], ['', ':', ''], $value);
+            }
+        }
+        unset($value);
+
+        return implode('"', $temp);
+    }
+
+    /**
+     * Converts a formula that uses R1C1/SpreadsheetXML format cell address to an A1 format cell address.
+     */
+    public static function convertFormulaToA1(
+        string $formula,
+        int $currentRowNumber = 1,
+        int $currentColumnNumber = 1
+    ): string {
+        if (substr($formula, 0, 3) == 'of:') {
+            // We have an old-style SpreadsheetML Formula
+            return self::convertSpreadsheetMLFormula($formula);
+        }
+
+        //    Convert R1C1 style references to A1 style references (but only when not quoted)
+        $temp = explode('"', $formula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only replace in alternate array entries (i.e. non-quoted blocks)
+            $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
+                //        the formula
+                $cellReferences = array_reverse($cellReferences);
+                //    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, false);
+                    $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                }
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the formula string
+        return implode('"', $temp);
+    }
+
+    /**
+     * Converts an A1 format cell address to an R1C1 format cell address.
+     * If $currentRowNumber or $currentColumnNumber are provided, then the R1C1 address will be formatted as a relative address.
+     */
+    public static function convertToR1C1(
+        string $address,
+        ?int $currentRowNumber = null,
+        ?int $currentColumnNumber = null
+    ): string {
+        $validityCheck = preg_match(Coordinate::A1_COORDINATE_REGEX, $address, $cellReference);
+
+        if ($validityCheck === 0) {
+            throw new Exception('Invalid A1-format Cell Reference');
+        }
+
+        if ($cellReference['col'][0] === '$') {
+            // Column must be absolute address
+            $currentColumnNumber = null;
+        }
+        $columnId = Coordinate::columnIndexFromString(ltrim($cellReference['col'], '$'));
+
+        if ($cellReference['row'][0] === '$') {
+            // Row must be absolute address
+            $currentRowNumber = null;
+        }
+        $rowId = (int) ltrim($cellReference['row'], '$');
+
+        if ($currentRowNumber !== null) {
+            if ($rowId === $currentRowNumber) {
+                $rowId = '';
+            } else {
+                $rowId = '[' . ($rowId - $currentRowNumber) . ']';
+            }
+        }
+
+        if ($currentColumnNumber !== null) {
+            if ($columnId === $currentColumnNumber) {
+                $columnId = '';
+            } else {
+                $columnId = '[' . ($columnId - $currentColumnNumber) . ']';
+            }
+        }
+
+        $R1C1Address = "R{$rowId}C{$columnId}";
+
+        return $R1C1Address;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
new file mode 100644
index 000000000..614abe997
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+interface AddressRange
+{
+    public const MAX_ROW = 1048576;
+
+    public const MAX_COLUMN = 'XFD';
+
+    public const MAX_COLUMN_INT = 16384;
+
+    /**
+     * @return mixed
+     */
+    public function from();
+
+    /**
+     * @return mixed
+     */
+    public function to();
+
+    public function __toString(): string;
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
index 1d28f247e..c0fb38775 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\FormattedNumber;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
@@ -16,14 +17,14 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
      *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return bool
      */
     public function bindValue(Cell $cell, $value = null)
     {
-        // sanitize UTF-8 strings
-        if (is_string($value)) {
+        if ($value === null) {
+            return parent::bindValue($cell, $value);
+        } elseif (is_string($value)) {
+            // sanitize UTF-8 strings
             $value = StringHelper::sanitizeUTF8($value);
         }
 
@@ -33,113 +34,50 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
         // Style logic - strings
         if ($dataType === DataType::TYPE_STRING && !$value instanceof RichText) {
             //    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 number in scientific format
-            if (preg_match('/^' . Calculation::CALCULATION_REGEXP_NUMBER . '$/', $value)) {
-                $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
-
-                return true;
-            }
-
-            // Check for fraction
+            // Check for fractions
             if (preg_match('/^([+-]?)\s*(\d+)\s?\/\s*(\d+)$/', $value, $matches)) {
-                // Convert value to number
-                $value = $matches[2] / $matches[3];
-                if ($matches[1] == '-') {
-                    $value = 0 - $value;
-                }
-                $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode('??/??');
-
-                return true;
+                return $this->setProperFraction($matches, $cell);
             } elseif (preg_match('/^([+-]?)(\d*) +(\d*)\s?\/\s*(\d*)$/', $value, $matches)) {
-                // Convert value to number
-                $value = $matches[2] + ($matches[3] / $matches[4]);
-                if ($matches[1] == '-') {
-                    $value = 0 - $value;
-                }
-                $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode('# ??/??');
-
-                return true;
+                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)) {
-                // Convert value to number
-                $value = (float) str_replace('%', '', $value) / 100;
-                $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_PERCENTAGE_00);
-
-                return true;
+            if (preg_match('/^\-?\d*' . $decimalSeparator . '?\d*\s?\%$/', preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value))) {
+                return $this->setPercentage(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(), 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)
-                    );
+                $sign = ($matches['PrefixedSign'] ?? $matches['PrefixedSign2'] ?? $matches['PostfixedSign']) ?? null;
+                $currencyCode = $matches['PrefixedCurrency'] ?? $matches['PostfixedCurrency'];
+                $value = (float) ($sign . trim(str_replace([$decimalSeparatorNoPreg, $currencyCode, ' ', '-'], ['.', '', '', ''], preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value)))); // @phpstan-ignore-line
 
-                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);
-
-                return true;
+                return $this->setCurrency($value, $cell, $currencyCode); // @phpstan-ignore-line
             }
 
             // Check for time without seconds e.g. '9:45', '09:45'
             if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
-                // Convert value to number
-                [$h, $m] = explode(':', $value);
-                $days = $h / 24 + $m / 1440;
-                $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME3);
-
-                return true;
+                return $this->setTimeHoursMinutes($value, $cell);
             }
 
             // Check for time with seconds '9:45:59', '09:45:59'
             if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
-                // Convert value to number
-                [$h, $m, $s] = explode(':', $value);
-                $days = $h / 24 + $m / 1440 + $s / 86400;
-                // Convert value to number
-                $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME4);
-
-                return true;
+                return $this->setTimeHoursMinutesSeconds($value, $cell);
             }
 
             // Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10'
@@ -160,7 +98,6 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
 
             // Check for newline character "\n"
             if (strpos($value, "\n") !== false) {
-                $value = StringHelper::sanitizeUTF8($value);
                 $cell->setValueExplicit($value, DataType::TYPE_STRING);
                 // Set style
                 $cell->getWorksheet()->getStyle($cell->getCoordinate())
@@ -173,4 +110,102 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
         // Not bound yet? Use parent...
         return parent::bindValue($cell, $value);
     }
+
+    protected function setImproperFraction(array $matches, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = $matches[2] + ($matches[3] / $matches[4]);
+        if ($matches[1] === '-') {
+            $value = 0 - $value;
+        }
+        $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
+
+        // Build the number format mask based on the size of the matched values
+        $dividend = str_repeat('?', strlen($matches[3]));
+        $divisor = str_repeat('?', strlen($matches[4]));
+        $fractionMask = "# {$dividend}/{$divisor}";
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode($fractionMask);
+
+        return true;
+    }
+
+    protected function setProperFraction(array $matches, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = $matches[2] / $matches[3];
+        if ($matches[1] === '-') {
+            $value = 0 - $value;
+        }
+        $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
+
+        // Build the number format mask based on the size of the matched values
+        $dividend = str_repeat('?', strlen($matches[2]));
+        $divisor = str_repeat('?', strlen($matches[3]));
+        $fractionMask = "{$dividend}/{$divisor}";
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode($fractionMask);
+
+        return true;
+    }
+
+    protected function setPercentage(string $value, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = ((float) str_replace('%', '', $value)) / 100;
+        $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_PERCENTAGE_00);
+
+        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);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME3);
+
+        return true;
+    }
+
+    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);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME4);
+
+        return true;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
index bae8261ef..e9e41d7c7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
@@ -3,11 +3,16 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
 use PhpOffice\PhpSpreadsheet\Exception;
 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\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Cell
@@ -46,14 +51,14 @@ class Cell
     private $dataType;
 
     /**
-     * Collection of cells.
+     * The collection of cells that this cell belongs to (i.e. The Cell Collection for the parent Worksheet).
      *
-     * @var Cells
+     * @var ?Cells
      */
     private $parent;
 
     /**
-     * Index to cellXf.
+     * Index to the cellXf reference for the styling of this cell.
      *
      * @var int
      */
@@ -61,27 +66,36 @@ class Cell
 
     /**
      * Attributes of the formula.
+     *
+     * @var mixed
      */
     private $formulaAttributes;
 
+    /** @var IgnoredErrors */
+    private $ignoredErrors;
+
     /**
      * Update the cell into the cell collection.
      *
      * @return $this
      */
-    public function updateInCollection()
+    public function updateInCollection(): self
     {
-        $this->parent->update($this);
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new Exception('Cannot update when cell is not bound to a worksheet');
+        }
+        $parent->update($this);
 
         return $this;
     }
 
-    public function detach()
+    public function detach(): void
     {
         $this->parent = null;
     }
 
-    public function attach(Cells $parent)
+    public function attach(Cells $parent): void
     {
         $this->parent = $parent;
     }
@@ -89,29 +103,26 @@ class Cell
     /**
      * Create a new Cell.
      *
-     * @param mixed $pValue
-     * @param string $pDataType
-     * @param Worksheet $pSheet
-     *
-     * @throws Exception
+     * @param mixed $value
      */
-    public function __construct($pValue, $pDataType, Worksheet $pSheet)
+    public function __construct($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)) {
+            $this->dataType = $dataType;
+        } elseif (self::getValueBinder()->bindValue($this, $value) === false) {
             throw new Exception('Value could not be bound to cell.');
         }
+        $this->ignoredErrors = new IgnoredErrors();
     }
 
     /**
@@ -121,7 +132,12 @@ class Cell
      */
     public function getColumn()
     {
-        return $this->parent->getCurrentColumn();
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new Exception('Cannot get column when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentColumn();
     }
 
     /**
@@ -131,7 +147,12 @@ class Cell
      */
     public function getRow()
     {
-        return $this->parent->getCurrentRow();
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new Exception('Cannot get row when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentRow();
     }
 
     /**
@@ -141,7 +162,17 @@ class Cell
      */
     public function getCoordinate()
     {
-        return $this->parent->getCurrentCoordinate();
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $coordinate = $parent->getCurrentCoordinate();
+        } else {
+            $coordinate = null;
+        }
+        if ($coordinate === null) {
+            throw new Exception('Coordinate no longer exists');
+        }
+
+        return $coordinate;
     }
 
     /**
@@ -156,32 +187,54 @@ class Cell
 
     /**
      * Get cell value with formatting.
-     *
-     * @return string
      */
-    public function getFormattedValue()
+    public function getFormattedValue(): string
     {
         return (string) NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
-            $this->getStyle()
-                ->getNumberFormat()->getFormatCode()
+            (string) $this->getStyle()->getNumberFormat()->getFormatCode()
         );
     }
 
+    /**
+     * @param mixed $oldValue
+     * @param mixed $newValue
+     */
+    protected static function updateIfCellIsTableHeader(?Worksheet $workSheet, self $cell, $oldValue, $newValue): void
+    {
+        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;
+            }
+        }
+    }
+
     /**
      * Set cell value.
      *
      *    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
      *
      * @throws Exception
      *
      * @return $this
      */
-    public function setValue($pValue)
+    public function setValue($value, ?IValueBinder $binder = null): self
     {
-        if (!self::getValueBinder()->bindValue($this, $pValue)) {
+        $binder ??= self::getValueBinder();
+        if (!$binder->bindValue($this, $value)) {
             throw new Exception('Value could not be bound to cell.');
         }
 
@@ -191,60 +244,122 @@ class Cell
     /**
      * 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_*
-     *
-     * @throws Exception
+     * @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
      */
-    public function setValueExplicit($pValue, $pDataType)
+    public function setValueExplicit($value, string $dataType = DataType::TYPE_STRING)
     {
+        $oldValue = $this->value;
+
         // 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;
+                $dataType = DataType::TYPE_STRING;
                 // no break
             case DataType::TYPE_STRING:
                 // Synonym for string
             case DataType::TYPE_INLINE:
                 // Rich text
-                $this->value = DataType::checkString($pValue);
+                $this->value = DataType::checkString($value);
 
                 break;
             case DataType::TYPE_NUMERIC:
-                if (is_string($pValue) && !is_numeric($pValue)) {
+                if (is_string($value) && !is_numeric($value)) {
                     throw new Exception('Invalid numeric value for datatype Numeric');
                 }
-                $this->value = 0 + $pValue;
+                $this->value = 0 + $value;
 
                 break;
             case DataType::TYPE_FORMULA:
-                $this->value = (string) $pValue;
+                $this->value = (string) $value;
 
                 break;
             case DataType::TYPE_BOOL:
-                $this->value = (bool) $pValue;
+                $this->value = (bool) $value;
+
+                break;
+            case DataType::TYPE_ISO_DATE:
+                $this->value = SharedDate::convertIsoDate($value);
+                $dataType = DataType::TYPE_NUMERIC;
 
                 break;
             case DataType::TYPE_ERROR:
-                $this->value = DataType::checkErrorCode($pValue);
+                $this->value = DataType::checkErrorCode($value);
 
                 break;
             default:
-                throw new Exception('Invalid datatype: ' . $pDataType);
-
-                break;
+                throw new Exception('Invalid datatype: ' . $dataType);
         }
 
         // set the datatype
-        $this->dataType = $pDataType;
+        $this->dataType = $dataType;
 
-        return $this->updateInCollection();
+        $this->updateInCollection();
+        $cellCoordinate = $this->getCoordinate();
+        self::updateIfCellIsTableHeader($this->getParent()->getParent(), $this, $oldValue, $value); // @phpstan-ignore-line
+
+        return $this->getParent()->get($cellCoordinate); // @phpstan-ignore-line
+    }
+
+    public const CALCULATE_DATE_TIME_ASIS = 0;
+    public const CALCULATE_DATE_TIME_FLOAT = 1;
+    public const CALCULATE_TIME_FLOAT = 2;
+
+    /** @var int */
+    private static $calculateDateTimeType = self::CALCULATE_DATE_TIME_ASIS;
+
+    public static function getCalculateDateTimeType(): int
+    {
+        return self::$calculateDateTimeType;
+    }
+
+    public static function setCalculateDateTimeType(int $calculateDateTimeType): void
+    {
+        switch ($calculateDateTimeType) {
+            case self::CALCULATE_DATE_TIME_ASIS:
+            case self::CALCULATE_DATE_TIME_FLOAT:
+            case self::CALCULATE_TIME_FLOAT:
+                self::$calculateDateTimeType = $calculateDateTimeType;
+
+                break;
+            default:
+                throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception("Invalid value $calculateDateTimeType for calculated date time type");
+        }
+    }
+
+    /**
+     * Convert date, time, or datetime from int to float if desired.
+     *
+     * @param mixed $result
+     *
+     * @return mixed
+     */
+    private function convertDateTimeInt($result)
+    {
+        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;
     }
 
     /**
@@ -252,30 +367,37 @@ class Cell
      *
      * @param bool $resetLog Whether the calculation engine logger should be reset or not
      *
-     * @throws Exception
-     *
      * @return mixed
      */
-    public function getCalculatedValue($resetLog = true)
+    public function getCalculatedValue(bool $resetLog = true)
     {
-        if ($this->dataType == DataType::TYPE_FORMULA) {
+        if ($this->dataType === DataType::TYPE_FORMULA) {
             try {
+                $index = $this->getWorksheet()->getParentOrThrow()->getActiveSheetIndex();
+                $selected = $this->getWorksheet()->getSelectedCells();
                 $result = Calculation::getInstance(
                     $this->getWorksheet()->getParent()
                 )->calculateCellValue($this, $resetLog);
+                $result = $this->convertDateTimeInt($result);
+                $this->getWorksheet()->setSelectedCells($selected);
+                $this->getWorksheet()->getParentOrThrow()->setActiveSheetIndex($index);
                 //    We don't yet handle array returns
                 if (is_array($result)) {
                     while (is_array($result)) {
-                        $result = array_pop($result);
+                        $result = array_shift($result);
                     }
                 }
             } catch (Exception $ex) {
                 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 ExcelError::NAME();
                 }
 
                 throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception(
-                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()
+                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage(),
+                    $ex->getCode(),
+                    $ex
                 );
             }
 
@@ -288,20 +410,18 @@ class Cell
             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($originalValue): self
     {
-        if ($pValue !== null) {
-            $this->calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
+        if ($originalValue !== null) {
+            $this->calculatedValue = (is_numeric($originalValue)) ? (float) $originalValue : $originalValue;
         }
 
         return $this->updateInCollection();
@@ -324,10 +444,8 @@ class Cell
 
     /**
      * Get cell data type.
-     *
-     * @return string
      */
-    public function getDataType()
+    public function getDataType(): string
     {
         return $this->dataType;
     }
@@ -335,38 +453,30 @@ class Cell
     /**
      * 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($dataType): self
     {
-        if ($pDataType == DataType::TYPE_STRING2) {
-            $pDataType = DataType::TYPE_STRING;
+        if ($dataType == DataType::TYPE_STRING2) {
+            $dataType = DataType::TYPE_STRING;
         }
-        $this->dataType = $pDataType;
+        $this->dataType = $dataType;
 
         return $this->updateInCollection();
     }
 
     /**
      * 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?
-     *
-     * @throws Exception
-     *
-     * @return bool
      */
-    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');
@@ -377,12 +487,8 @@ class Cell
 
     /**
      * Get Data validation rules.
-     *
-     * @throws Exception
-     *
-     * @return DataValidation
      */
-    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');
@@ -393,30 +499,22 @@ class Cell
 
     /**
      * Set Data validation rules.
-     *
-     * @param DataValidation $pDataValidation
-     *
-     * @throws Exception
-     *
-     * @return Cell
      */
-    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');
         }
 
-        $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();
 
@@ -425,12 +523,8 @@ class Cell
 
     /**
      * Does this cell contain a Hyperlink?
-     *
-     * @throws Exception
-     *
-     * @return bool
      */
-    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');
@@ -441,12 +535,8 @@ class Cell
 
     /**
      * Get Hyperlink.
-     *
-     * @throws Exception
-     *
-     * @return Hyperlink
      */
-    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');
@@ -457,20 +547,14 @@ class Cell
 
     /**
      * Set Hyperlink.
-     *
-     * @param Hyperlink $pHyperlink
-     *
-     * @throws Exception
-     *
-     * @return Cell
      */
-    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');
         }
 
-        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $pHyperlink);
+        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $hyperlink);
 
         return $this->updateInCollection();
     }
@@ -478,7 +562,7 @@ class Cell
     /**
      * Get cell collection.
      *
-     * @return Cells
+     * @return ?Cells
      */
     public function getParent()
     {
@@ -487,37 +571,53 @@ class Cell
 
     /**
      * Get parent worksheet.
-     *
-     * @return Worksheet
      */
-    public function getWorksheet()
+    public function getWorksheet(): Worksheet
     {
-        return $this->parent->getParent();
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $worksheet = $parent->getParent();
+        } else {
+            $worksheet = null;
+        }
+
+        if ($worksheet === null) {
+            throw new Exception('Worksheet no longer exists');
+        }
+
+        return $worksheet;
+    }
+
+    public function getWorksheetOrNull(): ?Worksheet
+    {
+        $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;
@@ -541,22 +641,34 @@ class Cell
 
     /**
      * Get cell style.
-     *
-     * @return Style
      */
-    public function getStyle()
+    public function getStyle(): Style
     {
         return $this->getWorksheet()->getStyle($this->getCoordinate());
     }
 
     /**
-     * Re-bind parent.
-     *
-     * @param Worksheet $parent
-     *
-     * @return Cell
+     * Get cell style.
      */
-    public function rebindParent(Worksheet $parent)
+    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.
+     */
+    public function rebindParent(Worksheet $parent): self
     {
         $this->parent = $parent->getCellCollection();
 
@@ -566,13 +678,11 @@ class Cell
     /**
      *    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());
@@ -591,7 +701,7 @@ class Cell
      *
      * @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;
@@ -606,10 +716,8 @@ class Cell
 
     /**
      * Get value binder to use.
-     *
-     * @return IValueBinder
      */
-    public static function getValueBinder()
+    public static function getValueBinder(): IValueBinder
     {
         if (self::$valueBinder === null) {
             self::$valueBinder = new DefaultValueBinder();
@@ -620,10 +728,8 @@ class Cell
 
     /**
      * Set value binder to use.
-     *
-     * @param IValueBinder $binder
      */
-    public static function setValueBinder(IValueBinder $binder)
+    public static function setValueBinder(IValueBinder $binder): void
     {
         self::$valueBinder = $binder;
     }
@@ -634,35 +740,29 @@ class Cell
     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();
     }
@@ -670,19 +770,21 @@ class Cell
     /**
      * Set the formula attributes.
      *
-     * @param mixed $pAttributes
+     * @param mixed $attributes
      *
      * @return $this
      */
-    public function setFormulaAttributes($pAttributes)
+    public function setFormulaAttributes($attributes): self
     {
-        $this->formulaAttributes = $pAttributes;
+        $this->formulaAttributes = $attributes;
 
         return $this;
     }
 
     /**
      * Get the formula attributes.
+     *
+     * @return mixed
      */
     public function getFormulaAttributes()
     {
@@ -698,4 +800,9 @@ class Cell
     {
         return (string) $this->getValue();
     }
+
+    public function getIgnoredErrors(): IgnoredErrors
+    {
+        return $this->ignoredErrors;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
new file mode 100644
index 000000000..a0c544f28
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellAddress
+{
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var string
+     */
+    protected $cellAddress;
+
+    /**
+     * @var string
+     */
+    protected $columnName;
+
+    /**
+     * @var int
+     */
+    protected $columnId;
+
+    /**
+     * @var int
+     */
+    protected $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;
+    }
+
+    /**
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    private static function validateColumnAndRow($columnId, $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');
+        }
+    }
+
+    /**
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    public static function fromColumnAndRow($columnId, $rowId, ?Worksheet $worksheet = null): self
+    {
+        self::validateColumnAndRow($columnId, $rowId);
+
+        /** @phpstan-ignore-next-line */
+        return new static(Coordinate::stringFromColumnIndex($columnId) . ((string) $rowId), $worksheet);
+    }
+
+    public static function fromColumnRowArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$columnId, $rowId] = $array;
+
+        return static::fromColumnAndRow($columnId, $rowId, $worksheet);
+    }
+
+    /**
+     * @param mixed $cellAddress
+     */
+    public static function fromCellAddress($cellAddress, ?Worksheet $worksheet = null): self
+    {
+        /** @phpstan-ignore-next-line */
+        return new static($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 static::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 static::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()
+    {
+        return $this->fullCellAddress();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
new file mode 100644
index 000000000..908a0d076
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellRange implements AddressRange
+{
+    /**
+     * @var CellAddress
+     */
+    protected $from;
+
+    /**
+     * @var CellAddress
+     */
+    protected $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
new file mode 100644
index 000000000..1e521a131
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ColumnRange implements AddressRange
+{
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var int
+     */
+    protected $from;
+
+    /**
+     * @var int
+     */
+    protected $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 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
index cc0543f6a..db1d06d15 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
@@ -13,6 +14,8 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
  */
 abstract class Coordinate
 {
+    public const A1_COORDINATE_REGEX = '/^(?<col>\$?[A-Z]{1,3})(?<row>\$?\d{1,7})$/i';
+
     /**
      * Default range variable constant.
      *
@@ -21,94 +24,108 @@ 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'
      *
-     * @throws Exception
-     *
-     * @return string[] Array containing column and row (indexes 0 and 1)
+     * @return array{0: string, 1: string} Array containing column and row (indexes 0 and 1)
      */
-    public static function coordinateFromString($pCoordinateString)
+    public static function coordinateFromString($cellAddress): array
     {
-        if (preg_match('/^([$]?[A-Z]{1,3})([$]?\\d{1,7})$/', $pCoordinateString, $matches)) {
-            return [$matches[1], $matches[2]];
-        } 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);
     }
 
     /**
-     * Checks if a coordinate represents a range of cells.
+     * Convert string coordinate to [0 => int column index, 1 => int row index, 2 => string column string].
      *
-     * @param string $coord eg: 'A1' or 'A1:A2' or 'A1:A2,C1:C2'
+     * @param string $coordinates eg: 'A1', '$B$12'
+     *
+     * @return array{0: int, 1: int, 2: string} Array containing column and row index, and column string
+     */
+    public static function indexesFromString(string $coordinates): array
+    {
+        [$column, $row] = self::coordinateFromString($coordinates);
+        $column = ltrim($column, '$');
+
+        return [
+            self::columnIndexFromString($column),
+            (int) ltrim($row, '$'),
+            $column,
+        ];
+    }
+
+    /**
+     * Checks if a Cell Address represents a range of cells.
+     *
+     * @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($cellAddress)
     {
-        return (strpos($coord, ':') !== false) || (strpos($coord, ',') !== false);
+        return (strpos($cellAddress, ':') !== false) || (strpos($cellAddress, ',') !== false);
     }
 
     /**
      * Make string row, column or cell coordinate absolute.
      *
-     * @param string $pCoordinateString e.g. 'A' or '1' or 'A1'
+     * @param 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
      *
-     * @throws Exception
-     *
      * @return string Absolute coordinate        e.g. '$A' or '$1' or '$A$1'
      */
-    public static function absoluteReference($pCoordinateString)
+    public static function absoluteReference($cellAddress)
     {
-        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 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'
-     *
-     * @throws Exception
+     * @param string $cellAddress e.g. 'A1'
      *
      * @return string Absolute coordinate        e.g. '$A$1'
      */
-    public static function absoluteCoordinate($pCoordinateString)
+    public static function absoluteCoordinate($cellAddress)
     {
-        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);
         $column = ltrim($column, '$');
         $row = ltrim($row, '$');
 
@@ -118,22 +135,23 @@ abstract class Coordinate
     /**
      * 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($range)
     {
         // Ensure $pRange is a valid range
-        if (empty($pRange)) {
-            $pRange = self::DEFAULT_RANGE;
+        if (empty($range)) {
+            $range = self::DEFAULT_RANGE;
         }
 
-        $exploded = explode(',', $pRange);
+        $exploded = explode(',', $range);
         $counter = count($exploded);
         for ($i = 0; $i < $counter; ++$i) {
+            // @phpstan-ignore-next-line
             $exploded[$i] = explode(':', $exploded[$i]);
         }
 
@@ -143,51 +161,59 @@ abstract class Coordinate
     /**
      * Build range from coordinate strings.
      *
-     * @param array $pRange Array containg one or more arrays containing one or two coordinate strings
-     *
-     * @throws Exception
+     * @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)
     {
         // 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 (strpos($range, ':') === false) {
+            $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
@@ -204,14 +230,14 @@ abstract class Coordinate
     /**
      * 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($range)
     {
         // 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)];
     }
@@ -219,77 +245,75 @@ abstract class Coordinate
     /**
      * 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($range)
     {
-        // Ensure $pRange is a valid range
-        if (empty($pRange)) {
-            $pRange = self::DEFAULT_RANGE;
-        }
+        [$rangeA, $rangeB] = self::rangeBoundaries($range);
 
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        // Extract range
-        if (strpos($pRange, ':') === false) {
-            $rangeA = $rangeB = $pRange;
-        } else {
-            [$rangeA, $rangeB] = explode(':', $pRange);
-        }
-
-        return [self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)];
+        return [
+            [self::stringFromColumnIndex($rangeA[0]), $rangeA[1]],
+            [self::stringFromColumnIndex($rangeB[0]), $rangeB[1]],
+        ];
     }
 
     /**
      * 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($columnAddress)
     {
         //    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')
+        );
     }
 
     /**
@@ -302,14 +326,15 @@ abstract class Coordinate
     public static function stringFromColumnIndex($columnIndex)
     {
         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;
         }
@@ -320,32 +345,81 @@ abstract class Coordinate
     /**
      * Extract all cell references in range, which may be comprised of multiple cell ranges.
      *
-     * @param string $pRange Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
+     * @param string $cellRange Range: e.g. 'A1' or 'A1:C10' or 'A1:E10,A20:E25' or 'A1:E5 C3:G7' or 'A1:C1,A3:C3 B1:C3'
      *
      * @return array Array containing single cell references
      */
-    public static function extractAllCellReferencesInRange($pRange)
+    public static function extractAllCellReferencesInRange($cellRange): array
     {
-        $returnValue = [];
-
-        // Explode spaces
-        $cellBlocks = self::getCellBlocksFromRangeString($pRange);
-        foreach ($cellBlocks as $cellBlock) {
-            $returnValue = array_merge($returnValue, self::getReferencesForCellBlock($cellBlock));
+        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 (substr($worksheet, 0, 1) === "'" && substr($worksheet, -1, 1) === "'") {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $worksheet = str_replace("'", "''", $worksheet);
+        }
+        [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange);
+
+        $cells = [];
+        foreach ($ranges as $range) {
+            $cells[] = self::getReferencesForCellBlock($range);
+        }
+
+        $cells = self::processRangeSetOperators($operators, $cells);
+
+        if (empty($cells)) {
+            return [];
+        }
+
+        $cellList = array_merge(...$cells);
+
+        return array_map(
+            function ($cellAddress) use ($worksheet, $quoted) {
+                return ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress;
+            },
+            self::sortCellReferenceArray($cellList)
+        );
+    }
+
+    private static function processRangeSetOperators(array $operators, array $cells): array
+    {
+        $operatorCount = count($operators);
+        for ($offset = 0; $offset < $operatorCount; ++$offset) {
+            $operator = $operators[$offset];
+            if ($operator !== ' ') {
+                continue;
+            }
+
+            $cells[$offset] = array_intersect($cells[$offset], $cells[$offset + 1]);
+            unset($operators[$offset], $cells[$offset + 1]);
+            $operators = array_values($operators);
+            $cells = array_values($cells);
+            --$offset;
+            --$operatorCount;
+        }
+
+        return $cells;
+    }
+
+    private static function sortCellReferenceArray(array $cellList): array
+    {
         //    Sort the result by column and row
         $sortKeys = [];
-        foreach (array_unique($returnValue) as $coord) {
+        foreach ($cellList as $coordinate) {
             $column = '';
             $row = 0;
-
-            sscanf($coord, '%[A-Z]%d', $column, $row);
-            $sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
+            sscanf($coordinate, '%[A-Z]%d', $column, $row);
+            $key = (--$row * 16384) + self::columnIndexFromString((string) $column);
+            $sortKeys[$key] = $coordinate;
         }
         ksort($sortKeys);
 
-        // Return value
         return array_values($sortKeys);
     }
 
@@ -387,7 +461,7 @@ abstract class Coordinate
             $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) {
@@ -416,16 +490,16 @@ abstract class Coordinate
      *
      *    [ '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)
     {
         $hashedValues = [];
         $mergedCoordCollection = [];
 
-        foreach ($pCoordCollection as $coord => $value) {
+        foreach ($coordinateCollection as $coord => $value) {
             if (self::coordinateIsRange($coord)) {
                 $mergedCoordCollection[$coord] = $value;
 
@@ -434,7 +508,7 @@ abstract class Coordinate
 
             [$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) [
@@ -490,15 +564,25 @@ abstract class Coordinate
     }
 
     /**
-     * Get the individual cell blocks from a range string, splitting by space and removing any $ characters.
+     * 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 $pRange
+     * @param string $rangeString
      *
-     * @return string[]
+     * @return array[]
      */
-    private static function getCellBlocksFromRangeString($pRange)
+    private static function getCellBlocksFromRangeString($rangeString)
     {
-        return explode(' ', str_replace('$', '', strtoupper($pRange)));
+        $rangeString = str_replace('$', '', strtoupper($rangeString));
+
+        // split range sets on intersection (space) or union (,) operators
+        $tokens = preg_split('/([ ,])/', $rangeString, -1, PREG_SPLIT_DELIM_CAPTURE);
+        /** @phpstan-ignore-next-line */
+        $split = array_chunk($tokens, 2);
+        $ranges = array_column($split, 0);
+        $operators = array_column($split, 1);
+
+        return [$ranges, $operators];
     }
 
     /**
@@ -511,7 +595,7 @@ abstract class Coordinate
      * @param int $currentRow
      * @param int $endRow
      */
-    private static function validateRange($cellBlock, $startColumnIndex, $endColumnIndex, $currentRow, $endRow)
+    private static function validateRange($cellBlock, $startColumnIndex, $endColumnIndex, $currentRow, $endRow): void
     {
         if ($startColumnIndex >= $endColumnIndex || $currentRow > $endRow) {
             throw new Exception('Invalid range: "' . $cellBlock . '"');
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
index ba0357917..f19984db6 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
@@ -16,11 +16,12 @@ 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 = [
         '#NULL!' => 0,
@@ -30,12 +31,15 @@ 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()
     {
@@ -45,41 +49,41 @@ class DataType
     /**
      * 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($textValue)
     {
-        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($value)
     {
-        $pValue = (string) $pValue;
+        $value = (string) $value;
 
-        if (!isset(self::$errorCodes[$pValue])) {
-            $pValue = '#NULL!';
+        if (!isset(self::$errorCodes[$value])) {
+            $value = '#NULL!';
         }
 
-        return $pValue;
+        return $value;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
index dfeb024c9..7ee53eae0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
@@ -140,13 +140,13 @@ class DataValidation
     /**
      * Set Formula 1.
      *
-     * @param string $value
+     * @param string $formula
      *
      * @return $this
      */
-    public function setFormula1($value)
+    public function setFormula1($formula)
     {
-        $this->formula1 = $value;
+        $this->formula1 = $formula;
 
         return $this;
     }
@@ -164,13 +164,13 @@ class DataValidation
     /**
      * Set Formula 2.
      *
-     * @param string $value
+     * @param string $formula
      *
      * @return $this
      */
-    public function setFormula2($value)
+    public function setFormula2($formula)
     {
-        $this->formula2 = $value;
+        $this->formula2 = $formula;
 
         return $this;
     }
@@ -188,13 +188,13 @@ class DataValidation
     /**
      * Set Type.
      *
-     * @param string $value
+     * @param string $type
      *
      * @return $this
      */
-    public function setType($value)
+    public function setType($type)
     {
-        $this->type = $value;
+        $this->type = $type;
 
         return $this;
     }
@@ -212,13 +212,13 @@ class DataValidation
     /**
      * Set Error style.
      *
-     * @param string $value see self::STYLE_*
+     * @param string $errorStyle see self::STYLE_*
      *
      * @return $this
      */
-    public function setErrorStyle($value)
+    public function setErrorStyle($errorStyle)
     {
-        $this->errorStyle = $value;
+        $this->errorStyle = $errorStyle;
 
         return $this;
     }
@@ -236,13 +236,13 @@ class DataValidation
     /**
      * Set Operator.
      *
-     * @param string $value
+     * @param string $operator
      *
      * @return $this
      */
-    public function setOperator($value)
+    public function setOperator($operator)
     {
-        $this->operator = $value;
+        $this->operator = $operator;
 
         return $this;
     }
@@ -260,13 +260,13 @@ class DataValidation
     /**
      * Set Allow Blank.
      *
-     * @param bool $value
+     * @param bool $allowBlank
      *
      * @return $this
      */
-    public function setAllowBlank($value)
+    public function setAllowBlank($allowBlank)
     {
-        $this->allowBlank = $value;
+        $this->allowBlank = $allowBlank;
 
         return $this;
     }
@@ -284,13 +284,13 @@ class DataValidation
     /**
      * Set Show DropDown.
      *
-     * @param bool $value
+     * @param bool $showDropDown
      *
      * @return $this
      */
-    public function setShowDropDown($value)
+    public function setShowDropDown($showDropDown)
     {
-        $this->showDropDown = $value;
+        $this->showDropDown = $showDropDown;
 
         return $this;
     }
@@ -308,13 +308,13 @@ class DataValidation
     /**
      * Set Show InputMessage.
      *
-     * @param bool $value
+     * @param bool $showInputMessage
      *
      * @return $this
      */
-    public function setShowInputMessage($value)
+    public function setShowInputMessage($showInputMessage)
     {
-        $this->showInputMessage = $value;
+        $this->showInputMessage = $showInputMessage;
 
         return $this;
     }
@@ -332,13 +332,13 @@ class DataValidation
     /**
      * Set Show ErrorMessage.
      *
-     * @param bool $value
+     * @param bool $showErrorMessage
      *
      * @return $this
      */
-    public function setShowErrorMessage($value)
+    public function setShowErrorMessage($showErrorMessage)
     {
-        $this->showErrorMessage = $value;
+        $this->showErrorMessage = $showErrorMessage;
 
         return $this;
     }
@@ -356,13 +356,13 @@ class DataValidation
     /**
      * Set Error title.
      *
-     * @param string $value
+     * @param string $errorTitle
      *
      * @return $this
      */
-    public function setErrorTitle($value)
+    public function setErrorTitle($errorTitle)
     {
-        $this->errorTitle = $value;
+        $this->errorTitle = $errorTitle;
 
         return $this;
     }
@@ -380,13 +380,13 @@ class DataValidation
     /**
      * Set Error.
      *
-     * @param string $value
+     * @param string $error
      *
      * @return $this
      */
-    public function setError($value)
+    public function setError($error)
     {
-        $this->error = $value;
+        $this->error = $error;
 
         return $this;
     }
@@ -404,13 +404,13 @@ class DataValidation
     /**
      * Set Prompt title.
      *
-     * @param string $value
+     * @param string $promptTitle
      *
      * @return $this
      */
-    public function setPromptTitle($value)
+    public function setPromptTitle($promptTitle)
     {
-        $this->promptTitle = $value;
+        $this->promptTitle = $promptTitle;
 
         return $this;
     }
@@ -428,13 +428,13 @@ class DataValidation
     /**
      * Set Prompt.
      *
-     * @param string $value
+     * @param string $prompt
      *
      * @return $this
      */
-    public function setPrompt($value)
+    public function setPrompt($prompt)
     {
-        $this->prompt = $value;
+        $this->prompt = $prompt;
 
         return $this;
     }
@@ -460,6 +460,7 @@ class DataValidation
             $this->error .
             $this->promptTitle .
             $this->prompt .
+            $this->sqref .
             __CLASS__
         );
     }
@@ -478,4 +479,19 @@ class DataValidation
             }
         }
     }
+
+    /** @var ?string */
+    private $sqref;
+
+    public function getSqref(): ?string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(?string $str): self
+    {
+        $this->sqref = $str;
+
+        return $this;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
index 430d81b96..692f316ec 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
+++ b/libraries/phpspreadsheet/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;
 
 /**
@@ -20,7 +20,7 @@ class DataValidator
      */
     public function isValid(Cell $cell)
     {
-        if (!$cell->hasDataValidation()) {
+        if (!$cell->hasDataValidation() || $cell->getDataValidation()->getType() === DataValidation::TYPE_NONE) {
             return true;
         }
 
@@ -31,13 +31,55 @@ class DataValidator
             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((string) $cellValue));
         }
 
-        return false;
+        return $returnValue;
+    }
+
+    /** @param float|int $cellValue */
+    private function numericOperator(DataValidation $dataValidation, $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;
     }
 
     /**
@@ -64,8 +106,11 @@ class DataValidator
 
                 try {
                     $result = $calculation->calculateFormula($matchFormula, $cell->getCoordinate(), $cell);
+                    while (is_array($result)) {
+                        $result = array_pop($result);
+                    }
 
-                    return $result !== Functions::NA();
+                    return $result !== ExcelError::NA();
                 } catch (Exception $ex) {
                     return false;
                 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
index cd05cf8bd..92e1d25ea 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
@@ -14,8 +14,6 @@ class DefaultValueBinder implements IValueBinder
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
      *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return bool
      */
     public function bindValue(Cell $cell, $value)
@@ -28,7 +26,8 @@ class DefaultValueBinder implements IValueBinder
             if ($value instanceof DateTimeInterface) {
                 $value = $value->format('Y-m-d H:i:s');
             } elseif (!($value instanceof RichText)) {
-                $value = (string) $value;
+                // Attempt to cast any unexpected objects to string
+                $value = (string) $value; // @phpstan-ignore-line
             }
         }
 
@@ -42,37 +41,39 @@ class DefaultValueBinder implements IValueBinder
     /**
      * DataType for value.
      *
-     * @param mixed $pValue
+     * @param mixed $value
      *
      * @return string
      */
-    public static function dataTypeForValue($pValue)
+    public static function dataTypeForValue($value)
     {
         // Match the value against a few data types
-        if ($pValue === null) {
+        if ($value === null) {
             return DataType::TYPE_NULL;
-        } elseif (is_float($pValue) || is_int($pValue)) {
+        } elseif (is_float($value) || is_int($value)) {
             return DataType::TYPE_NUMERIC;
-        } elseif (is_bool($pValue)) {
+        } elseif (is_bool($value)) {
             return DataType::TYPE_BOOL;
-        } elseif ($pValue === '') {
+        } elseif ($value === '') {
             return DataType::TYPE_STRING;
-        } elseif ($pValue instanceof RichText) {
+        } elseif ($value instanceof RichText) {
             return DataType::TYPE_INLINE;
-        } elseif (is_string($pValue) && $pValue[0] === '=' && strlen($pValue) > 1) {
+        } elseif (is_string($value) && strlen($value) > 1 && $value[0] === '=') {
             return DataType::TYPE_FORMULA;
-        } elseif (preg_match('/^[\+\-]?(\d+\\.?\d*|\d*\\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $pValue)) {
-            $tValue = ltrim($pValue, '+-');
-            if (is_string($pValue) && $tValue[0] === '0' && strlen($tValue) > 1 && $tValue[1] !== '.') {
+        } elseif (preg_match('/^[\+\-]?(\d+\\.?\d*|\d*\\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $value)) {
+            $tValue = ltrim($value, '+-');
+            if (is_string($value) && strlen($tValue) > 1 && $tValue[0] === '0' && $tValue[1] !== '.') {
                 return DataType::TYPE_STRING;
-            } elseif ((strpos($pValue, '.') === false) && ($pValue > PHP_INT_MAX)) {
+            } elseif ((strpos($value, '.') === false) && ($value > PHP_INT_MAX)) {
+                return DataType::TYPE_STRING;
+            } elseif (!is_numeric($value)) {
                 return DataType::TYPE_STRING;
             }
 
             return DataType::TYPE_NUMERIC;
-        } elseif (is_string($pValue)) {
+        } elseif (is_string($value)) {
             $errorCodes = DataType::getErrorCodes();
-            if (isset($errorCodes[$pValue])) {
+            if (isset($errorCodes[$value])) {
                 return DataType::TYPE_ERROR;
             }
         }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
index 003d51014..ffdcbacd2 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
@@ -21,14 +21,14 @@ class Hyperlink
     /**
      * 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($url = '', $tooltip = '')
     {
         // Initialise member variables
-        $this->url = $pUrl;
-        $this->tooltip = $pTooltip;
+        $this->url = $url;
+        $this->tooltip = $tooltip;
     }
 
     /**
@@ -44,13 +44,13 @@ class Hyperlink
     /**
      * Set URL.
      *
-     * @param string $value
+     * @param string $url
      *
      * @return $this
      */
-    public function setUrl($value)
+    public function setUrl($url)
     {
-        $this->url = $value;
+        $this->url = $url;
 
         return $this;
     }
@@ -68,13 +68,13 @@ class Hyperlink
     /**
      * Set tooltip.
      *
-     * @param string $value
+     * @param string $tooltip
      *
      * @return $this
      */
-    public function setTooltip($value)
+    public function setTooltip($tooltip)
     {
-        $this->tooltip = $value;
+        $this->tooltip = $tooltip;
 
         return $this;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
new file mode 100644
index 000000000..ee4b51562
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+class IgnoredErrors
+{
+    /** @var bool */
+    private $numberStoredAsText = false;
+
+    /** @var bool */
+    private $formula = false;
+
+    /** @var bool */
+    private $twoDigitTextYear = false;
+
+    /** @var bool */
+    private $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
new file mode 100644
index 000000000..38e6c1415
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class RowRange implements AddressRange
+{
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var int
+     */
+    protected $from;
+
+    /**
+     * @var int
+     */
+    protected $to;
+
+    public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo($from, $to ?? $from);
+        $this->worksheet = $worksheet;
+    }
+
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
index 0552677f2..1dcb6129c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
@@ -2,30 +2,123 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class StringValueBinder implements IValueBinder
 {
+    /**
+     * @var bool
+     */
+    protected $convertNull = true;
+
+    /**
+     * @var bool
+     */
+    protected $convertBoolean = true;
+
+    /**
+     * @var bool
+     */
+    protected $convertNumeric = true;
+
+    /**
+     * @var bool
+     */
+    protected $convertFormula = true;
+
+    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
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
-     * @return bool
      */
     public function bindValue(Cell $cell, $value)
     {
+        if (is_object($value)) {
+            return $this->bindObjectValue($cell, $value);
+        }
+
         // sanitize UTF-8 strings
         if (is_string($value)) {
             $value = StringHelper::sanitizeUTF8($value);
         }
 
-        $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        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) {
+            $cell->setValueExplicit($value, DataType::TYPE_FORMULA);
+        } else {
+            if (is_string($value) && strlen($value) > 1 && $value[0] === '=') {
+                $cell->getStyle()->setQuotePrefix(true);
+            }
+            $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        }
+
+        return true;
+    }
+
+    protected function bindObjectValue(Cell $cell, object $value): bool
+    {
+        // Handle any objects that might be injected
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d H:i:s');
+        } elseif ($value instanceof RichText) {
+            $cell->setValueExplicit($value, DataType::TYPE_INLINE);
+
+            return true;
+        }
+
+        $cell->setValueExplicit((string) $value, DataType::TYPE_STRING); // @phpstan-ignore-line
 
-        // Done!
         return true;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
new file mode 100644
index 000000000..0e164543b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class CellReferenceHelper
+{
+    /**
+     * @var string
+     */
+    protected $beforeCellAddress;
+
+    /**
+     * @var int
+     */
+    protected $beforeColumn;
+
+    /**
+     * @var int
+     */
+    protected $beforeRow;
+
+    /**
+     * @var int
+     */
+    protected $numberOfColumns;
+
+    /**
+     * @var int
+     */
+    protected $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 = (int) 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): 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 = (int) Coordinate::columnIndexFromString(str_replace('$', '', $newColumn));
+        $newRowIndex = (int) str_replace('$', '', $newRow);
+
+        $absoluteColumn = $newColumn[0] === '$' ? '$' : '';
+        $absoluteRow = $newRow[0] === '$' ? '$' : '';
+        // Verify which parts should be updated
+        if ($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
index 66242e340..3d4813468 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
@@ -10,20 +10,55 @@ namespace PhpOffice\PhpSpreadsheet\Chart;
  */
 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.
+     *
+     * @var ?GridLines
+     */
+    private $majorGridlines;
+
+    /**
+     * Chart Minor Gridlines as.
+     *
+     * @var ?GridLines
+     */
+    private $minorGridlines;
+
     /**
      * Axis Number.
      *
-     * @var array of mixed
+     * @var mixed[]
      */
     private $axisNumber = [
         'format' => self::FORMAT_CODE_GENERAL,
         'source_linked' => 1,
+        'numeric' => null,
     ];
 
+    /** @var string */
+    private $axisType = '';
+
+    /** @var ?AxisText */
+    private $axisText;
+
     /**
      * Axis Options.
      *
-     * @var array of mixed
+     * @var mixed[]
      */
     private $axisOptions = [
         'minimum' => null,
@@ -36,112 +71,44 @@ 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,
     ];
 
     /**
      * Fill Properties.
      *
-     * @var array of mixed
+     * @var ChartColor
      */
-    private $fillProperties = [
-        'type' => self::EXCEL_COLOR_TYPE_ARGB,
-        'value' => null,
-        'alpha' => 0,
+    private $fillColor;
+
+    private const NUMERIC_FORMAT = [
+        Properties::FORMAT_CODE_NUMBER,
+        Properties::FORMAT_CODE_DATE,
+        Properties::FORMAT_CODE_DATE_ISO8601,
     ];
 
-    /**
-     * Line Properties.
-     *
-     * @var array of mixed
-     */
-    private $lineProperties = [
-        'type' => self::EXCEL_COLOR_TYPE_ARGB,
-        'value' => null,
-        'alpha' => 0,
-    ];
-
-    /**
-     * Line Style Properties.
-     *
-     * @var array of mixed
-     */
-    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,
-            ],
-        ],
-    ];
-
-    /**
-     * Shadow Properties.
-     *
-     * @var array of 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,
-    ];
-
-    /**
-     * Glow Properties.
-     *
-     * @var array of mixed
-     */
-    private $glowProperties = [
-        'size' => null,
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => 'black',
-            'alpha' => 40,
-        ],
-    ];
-
-    /**
-     * Soft Edge Properties.
-     *
-     * @var array of mixed
-     */
-    private $softEdges = [
-        'size' => null,
-    ];
+    /** @var bool */
+    private $noFill = false;
 
     /**
      * Get Series Data Type.
      *
      * @param mixed $format_code
-     *
-     * @return string
      */
-    public function setAxisNumberProperties($format_code)
+    public function setAxisNumberProperties($format_code, ?bool $numeric = null, int $sourceLinked = 0): void
     {
-        $this->axisNumber['format'] = (string) $format_code;
-        $this->axisNumber['source_linked'] = 0;
+        $format = (string) $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;
+        }
     }
 
     /**
@@ -164,33 +131,53 @@ class Axis extends Properties
         return (string) $this->axisNumber['source_linked'];
     }
 
+    public function getAxisIsNumericFormat(): bool
+    {
+        return $this->axisType === self::AXIS_TYPE_DATE || (bool) $this->axisNumber['numeric'];
+    }
+
+    public function setAxisOption(string $key, ?string $value): void
+    {
+        if ($value !== null && $value !== '') {
+            $this->axisOptions[$key] = $value;
+        }
+    }
+
     /**
      * 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)
-    {
-        $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;
+    public function setAxisOptionsProperties(
+        string $axisLabels,
+        ?string $horizontalCrossesValue = null,
+        ?string $horizontalCrosses = null,
+        ?string $axisOrientation = null,
+        ?string $majorTmt = null,
+        ?string $minorTmt = null,
+        ?string $minimum = null,
+        ?string $maximum = null,
+        ?string $majorUnit = null,
+        ?string $minorUnit = null,
+        ?string $textRotation = null,
+        ?string $hidden = null,
+        ?string $baseTimeUnit = null,
+        ?string $majorTimeUnit = null,
+        ?string $minorTimeUnit = 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);
     }
 
     /**
@@ -198,10 +185,18 @@ class Axis extends Properties
      *
      * @param string $property
      *
-     * @return string
+     * @return ?string
      */
     public function getAxisOptionsProperty($property)
     {
+        if ($property === 'textRotation') {
+            if ($this->axisText !== null) {
+                if ($this->axisText->getRotation() !== null) {
+                    return (string) $this->axisText->getRotation();
+                }
+            }
+        }
+
         return $this->axisOptions[$property];
     }
 
@@ -210,33 +205,37 @@ class Axis extends Properties
      *
      * @param string $orientation
      */
-    public function setAxisOrientation($orientation)
+    public function setAxisOrientation($orientation): void
     {
         $this->axisOptions['orientation'] = (string) $orientation;
     }
 
+    public function getAxisType(): string
+    {
+        return $this->axisType;
+    }
+
+    public function setAxisType(string $type): self
+    {
+        if ($type === self::AXIS_TYPE_CATEGORY || $type === self::AXIS_TYPE_VALUE || $type === self::AXIS_TYPE_DATE) {
+            $this->axisType = $type;
+        } else {
+            $this->axisType = '';
+        }
+
+        return $this;
+    }
+
     /**
      * Set Fill Property.
      *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
+     * @param ?string $color
+     * @param ?int $alpha
+     * @param ?string $AlphaType
      */
-    public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
+    public function setFillParameters($color, $alpha = null, $AlphaType = ChartColor::EXCEL_COLOR_TYPE_RGB): void
     {
-        $this->fillProperties = $this->setColorProperties($color, $alpha, $type);
-    }
-
-    /**
-     * Set Line Property.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     */
-    public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
-    {
-        $this->lineProperties = $this->setColorProperties($color, $alpha, $type);
+        $this->fillColor->setColorProperties($color, $alpha, $AlphaType);
     }
 
     /**
@@ -248,310 +247,90 @@ class Axis extends Properties
      */
     public function getFillProperty($property)
     {
-        return $this->fillProperties[$property];
+        return (string) $this->fillColor->getColorProperty($property);
+    }
+
+    public function getFillColorObject(): ChartColor
+    {
+        return $this->fillColor;
     }
 
     /**
-     * Get Line Property.
+     * Get Line Color Property.
      *
-     * @param string $property
+     * @deprecated 1.24.0
+     *      Use the getLineColor property in the Properties class instead
+     * @see Properties::getLineColorProperty()
      *
-     * @return string
+     * @param string $propertyName
+     *
+     * @return null|int|string
      */
-    public function getLineProperty($property)
+    public function getLineProperty($propertyName)
     {
-        return $this->lineProperties[$property];
+        return $this->getLineColorProperty($propertyName);
     }
 
-    /**
-     * 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)
-    {
-        ($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;
-    }
+    /** @var string */
+    private $crossBetween = ''; // 'between' or 'midCat' might be better
 
-    /**
-     * Get Line Style Property.
-     *
-     * @param array|string $elements
-     *
-     * @return string
-     */
-    public function getLineStyleProperty($elements)
+    public function setCrossBetween(string $crossBetween): self
     {
-        return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
-    }
-
-    /**
-     * Get Line Style Arrow Excel Width.
-     *
-     * @param string $arrow
-     *
-     * @return string
-     */
-    public function getLineStyleArrowWidth($arrow)
-    {
-        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'w');
-    }
-
-    /**
-     * Get Line Style Arrow Excel Length.
-     *
-     * @param string $arrow
-     *
-     * @return string
-     */
-    public function getLineStyleArrowLength($arrow)
-    {
-        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'len');
-    }
-
-    /**
-     * 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)
-    {
-        $this->setShadowPresetsProperties((int) $sh_presets)
-            ->setShadowColor(
-                $sh_color_value === null ? $this->shadowProperties['color']['value'] : $sh_color_value,
-                $sh_color_alpha === null ? (int) $this->shadowProperties['color']['alpha'] : $sh_color_alpha,
-                $sh_color_type === null ? $this->shadowProperties['color']['type'] : $sh_color_type
-            )
-            ->setShadowBlur($sh_blur)
-            ->setShadowAngle($sh_angle)
-            ->setShadowDistance($sh_distance);
-    }
-
-    /**
-     * Set Shadow Color.
-     *
-     * @param int $shadow_presets
-     *
-     * @return $this
-     */
-    private function setShadowPresetsProperties($shadow_presets)
-    {
-        $this->shadowProperties['presets'] = $shadow_presets;
-        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+        $this->crossBetween = $crossBetween;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Properties from Mapped Values.
-     *
-     * @param array $properties_map
-     * @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->crossBetween;
+    }
+
+    public function getMajorGridlines(): ?GridLines
+    {
+        return $this->majorGridlines;
+    }
+
+    public function getMinorGridlines(): ?GridLines
+    {
+        return $this->minorGridlines;
+    }
+
+    public function setMajorGridlines(?GridLines $gridlines): self
+    {
+        $this->majorGridlines = $gridlines;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setShadowColor($color, $alpha, $type)
+    public function setMinorGridlines(?GridLines $gridlines): self
     {
-        $this->shadowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+        $this->minorGridlines = $gridlines;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Blur.
-     *
-     * @param float $blur
-     *
-     * @return $this
-     */
-    private function setShadowBlur($blur)
+    public function getAxisText(): ?AxisText
     {
-        if ($blur !== null) {
-            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
-        }
+        return $this->axisText;
+    }
+
+    public function setAxisText(?AxisText $axisText): self
+    {
+        $this->axisText = $axisText;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Angle.
-     *
-     * @param int $angle
-     *
-     * @return $this
-     */
-    private function setShadowAngle($angle)
+    public function setNoFill(bool $noFill): self
     {
-        if ($angle !== null) {
-            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
-        }
+        $this->noFill = $noFill;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Distance.
-     *
-     * @param float $distance
-     *
-     * @return $this
-     */
-    private function setShadowDistance($distance)
+    public function getNoFill(): bool
     {
-        if ($distance !== null) {
-            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get Shadow Property.
-     *
-     * @param string|string[] $elements
-     *
-     * @return null|array|int|string
-     */
-    public function getShadowProperty($elements)
-    {
-        return $this->getArrayElementsValue($this->shadowProperties, $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)
-    {
-        $this->setGlowSize($size)
-            ->setGlowColor(
-                $color_value === null ? $this->glowProperties['color']['value'] : $color_value,
-                $color_alpha === null ? (int) $this->glowProperties['color']['alpha'] : $color_alpha,
-                $color_type === null ? $this->glowProperties['color']['type'] : $color_type
-            );
-    }
-
-    /**
-     * Get Glow Property.
-     *
-     * @param array|string $property
-     *
-     * @return string
-     */
-    public function getGlowProperty($property)
-    {
-        return $this->getArrayElementsValue($this->glowProperties, $property);
-    }
-
-    /**
-     * Set Glow Color.
-     *
-     * @param float $size
-     *
-     * @return $this
-     */
-    private function setGlowSize($size)
-    {
-        if ($size !== null) {
-            $this->glowProperties['size'] = $this->getExcelPointsWidth($size);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set Glow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setGlowColor($color, $alpha, $type)
-    {
-        $this->glowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
-
-        return $this;
-    }
-
-    /**
-     * Set Soft Edges Size.
-     *
-     * @param float $size
-     */
-    public function setSoftEdges($size)
-    {
-        if ($size !== null) {
-            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
-        }
-    }
-
-    /**
-     * Get Soft Edges Size.
-     *
-     * @return string
-     */
-    public function getSoftEdgesSize()
-    {
-        return $this->softEdges['size'];
+        return $this->noFill;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
new file mode 100644
index 000000000..cd9ba2ce2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class AxisText extends Properties
+{
+    /** @var ?int */
+    private $rotation;
+
+    /** @var Font */
+    private $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;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
index 59c9ed5d6..38c69a463 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
@@ -17,42 +17,42 @@ class Chart
     /**
      * Worksheet.
      *
-     * @var Worksheet
+     * @var ?Worksheet
      */
     private $worksheet;
 
     /**
      * Chart Title.
      *
-     * @var Title
+     * @var ?Title
      */
     private $title;
 
     /**
      * Chart Legend.
      *
-     * @var Legend
+     * @var ?Legend
      */
     private $legend;
 
     /**
      * X-Axis Label.
      *
-     * @var Title
+     * @var ?Title
      */
     private $xAxisLabel;
 
     /**
      * Y-Axis Label.
      *
-     * @var Title
+     * @var ?Title
      */
     private $yAxisLabel;
 
     /**
      * Chart Plot Area.
      *
-     * @var PlotArea
+     * @var ?PlotArea
      */
     private $plotArea;
 
@@ -68,7 +68,7 @@ class Chart
      *
      * @var string
      */
-    private $displayBlanksAs = '0';
+    private $displayBlanksAs = DataSeries::EMPTY_AS_GAP;
 
     /**
      * Chart Asix Y as.
@@ -84,20 +84,6 @@ class Chart
      */
     private $xAxis;
 
-    /**
-     * Chart Major Gridlines as.
-     *
-     * @var GridLines
-     */
-    private $majorGridlines;
-
-    /**
-     * Chart Minor Gridlines as.
-     *
-     * @var GridLines
-     */
-    private $minorGridlines;
-
     /**
      * Top-Left Cell Position.
      *
@@ -124,7 +110,7 @@ class Chart
      *
      * @var string
      */
-    private $bottomRightCellRef = 'A1';
+    private $bottomRightCellRef = '';
 
     /**
      * Bottom-Right X-Offset.
@@ -140,23 +126,45 @@ class Chart
      */
     private $bottomRightYOffset = 10;
 
+    /** @var ?int */
+    private $rotX;
+
+    /** @var ?int */
+    private $rotY;
+
+    /** @var ?int */
+    private $rAngAx;
+
+    /** @var ?int */
+    private $perspective;
+
+    /** @var bool */
+    private $oneCellAnchor = false;
+
+    /** @var bool */
+    private $autoTitleDeleted = false;
+
+    /** @var bool */
+    private $noFill = false;
+
+    /** @var bool */
+    private $roundedCorners = false;
+
+    /** @var GridLines */
+    private $borderLines;
+
+    /** @var ChartColor */
+    private $fillColor;
+
     /**
      * Create a new Chart.
+     * majorGridlines and minorGridlines are deprecated, moved to Axis.
      *
      * @param mixed $name
-     * @param null|Title $title
-     * @param null|Legend $legend
-     * @param null|PlotArea $plotArea
      * @param mixed $plotVisibleOnly
-     * @param mixed $displayBlanksAs
-     * @param null|Title $xAxisLabel
-     * @param null|Title $yAxisLabel
-     * @param null|Axis $xAxis
-     * @param null|Axis $yAxis
-     * @param null|GridLines $majorGridlines
-     * @param null|GridLines $minorGridlines
+     * @param string $displayBlanksAs
      */
-    public function __construct($name, Title $title = null, Legend $legend = null, PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = 'gap', Title $xAxisLabel = null, Title $yAxisLabel = null, Axis $xAxis = null, Axis $yAxis = null, GridLines $majorGridlines = null, GridLines $minorGridlines = null)
+    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)
     {
         $this->name = $name;
         $this->title = $title;
@@ -166,10 +174,16 @@ class Chart
         $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();
     }
 
     /**
@@ -182,12 +196,17 @@ class Chart
         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;
     }
@@ -195,23 +214,16 @@ class Chart
     /**
      * Set Worksheet.
      *
-     * @param Worksheet $pValue
-     *
      * @return $this
      */
-    public function setWorksheet(Worksheet $pValue = null)
+    public function setWorksheet(?Worksheet $worksheet = null)
     {
-        $this->worksheet = $pValue;
+        $this->worksheet = $worksheet;
 
         return $this;
     }
 
-    /**
-     * Get Title.
-     *
-     * @return Title
-     */
-    public function getTitle()
+    public function getTitle(): ?Title
     {
         return $this->title;
     }
@@ -219,8 +231,6 @@ class Chart
     /**
      * Set Title.
      *
-     * @param Title $title
-     *
      * @return $this
      */
     public function setTitle(Title $title)
@@ -230,12 +240,7 @@ class Chart
         return $this;
     }
 
-    /**
-     * Get Legend.
-     *
-     * @return Legend
-     */
-    public function getLegend()
+    public function getLegend(): ?Legend
     {
         return $this->legend;
     }
@@ -243,8 +248,6 @@ class Chart
     /**
      * Set Legend.
      *
-     * @param Legend $legend
-     *
      * @return $this
      */
     public function setLegend(Legend $legend)
@@ -254,12 +257,7 @@ class Chart
         return $this;
     }
 
-    /**
-     * Get X-Axis Label.
-     *
-     * @return Title
-     */
-    public function getXAxisLabel()
+    public function getXAxisLabel(): ?Title
     {
         return $this->xAxisLabel;
     }
@@ -267,8 +265,6 @@ class Chart
     /**
      * Set X-Axis Label.
      *
-     * @param Title $label
-     *
      * @return $this
      */
     public function setXAxisLabel(Title $label)
@@ -278,12 +274,7 @@ class Chart
         return $this;
     }
 
-    /**
-     * Get Y-Axis Label.
-     *
-     * @return Title
-     */
-    public function getYAxisLabel()
+    public function getYAxisLabel(): ?Title
     {
         return $this->yAxisLabel;
     }
@@ -291,8 +282,6 @@ class Chart
     /**
      * Set Y-Axis Label.
      *
-     * @param Title $label
-     *
      * @return $this
      */
     public function setYAxisLabel(Title $label)
@@ -302,16 +291,21 @@ class Chart
         return $this;
     }
 
-    /**
-     * Get Plot Area.
-     *
-     * @return PlotArea
-     */
-    public function getPlotArea()
+    public function getPlotArea(): ?PlotArea
     {
         return $this->plotArea;
     }
 
+    /**
+     * Set Plot Area.
+     */
+    public function setPlotArea(PlotArea $plotArea): self
+    {
+        $this->plotArea = $plotArea;
+
+        return $this;
+    }
+
     /**
      * Get Plot Visible Only.
      *
@@ -360,74 +354,74 @@ class Chart
         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;
+    }
+
+    public function getChartAxisX(): Axis
+    {
+        return $this->xAxis;
+    }
+
+    /**
+     * Set xAxis.
+     */
+    public function setChartAxisX(?Axis $axis): self
+    {
+        $this->xAxis = $axis ?? new Axis();
+
+        return $this;
     }
 
     /**
      * Get Major Gridlines.
      *
-     * @return GridLines
+     * @deprecated 1.24.0 Use Axis->getMajorGridlines()
+     * @see Axis::getMajorGridlines()
+     *
+     * @codeCoverageIgnore
      */
-    public function getMajorGridlines()
+    public function getMajorGridlines(): ?GridLines
     {
-        if ($this->majorGridlines !== null) {
-            return $this->majorGridlines;
-        }
-
-        return new GridLines();
+        return $this->yAxis->getMajorGridLines();
     }
 
     /**
      * Get Minor Gridlines.
      *
-     * @return GridLines
+     * @deprecated 1.24.0 Use Axis->getMinorGridlines()
+     * @see Axis::getMinorGridlines()
+     *
+     * @codeCoverageIgnore
      */
-    public function getMinorGridlines()
+    public function getMinorGridlines(): ?GridLines
     {
-        if ($this->minorGridlines !== null) {
-            return $this->minorGridlines;
-        }
-
-        return new GridLines();
+        return $this->yAxis->getMinorGridLines();
     }
 
     /**
      * Set the Top Left position for the chart.
      *
-     * @param string $cell
+     * @param string $cellAddress
      * @param int $xOffset
      * @param int $yOffset
      *
      * @return $this
      */
-    public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null)
+    public function setTopLeftPosition($cellAddress, $xOffset = null, $yOffset = null)
     {
-        $this->topLeftCellRef = $cell;
+        $this->topLeftCellRef = $cellAddress;
         if ($xOffset !== null) {
             $this->setTopLeftXOffset($xOffset);
         }
@@ -441,9 +435,11 @@ class Chart
     /**
      * Get the top left position of the chart.
      *
-     * @return array an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+     * 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,
@@ -465,13 +461,13 @@ class Chart
     /**
      * Set the Top Left cell position for the chart.
      *
-     * @param string $cell
+     * @param string $cellAddress
      *
      * @return $this
      */
-    public function setTopLeftCell($cell)
+    public function setTopLeftCell($cellAddress)
     {
-        $this->topLeftCellRef = $cell;
+        $this->topLeftCellRef = $cellAddress;
 
         return $this;
     }
@@ -479,8 +475,8 @@ class Chart
     /**
      * Set the offset position within the Top Left cell for the chart.
      *
-     * @param int $xOffset
-     * @param int $yOffset
+     * @param ?int $xOffset
+     * @param ?int $yOffset
      *
      * @return $this
      */
@@ -510,6 +506,11 @@ class Chart
         ];
     }
 
+    /**
+     * @param int $xOffset
+     *
+     * @return $this
+     */
     public function setTopLeftXOffset($xOffset)
     {
         $this->topLeftXOffset = $xOffset;
@@ -517,11 +518,16 @@ class Chart
         return $this;
     }
 
-    public function getTopLeftXOffset()
+    public function getTopLeftXOffset(): int
     {
         return $this->topLeftXOffset;
     }
 
+    /**
+     * @param int $yOffset
+     *
+     * @return $this
+     */
     public function setTopLeftYOffset($yOffset)
     {
         $this->topLeftYOffset = $yOffset;
@@ -529,7 +535,7 @@ class Chart
         return $this;
     }
 
-    public function getTopLeftYOffset()
+    public function getTopLeftYOffset(): int
     {
         return $this->topLeftYOffset;
     }
@@ -537,15 +543,15 @@ class Chart
     /**
      * Set the Bottom Right position of the chart.
      *
-     * @param string $cell
+     * @param string $cellAddress
      * @param int $xOffset
      * @param int $yOffset
      *
      * @return $this
      */
-    public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null)
+    public function setBottomRightPosition($cellAddress = '', $xOffset = null, $yOffset = null)
     {
-        $this->bottomRightCellRef = $cell;
+        $this->bottomRightCellRef = $cellAddress;
         if ($xOffset !== null) {
             $this->setBottomRightXOffset($xOffset);
         }
@@ -570,19 +576,22 @@ class Chart
         ];
     }
 
-    public function setBottomRightCell($cell)
+    /**
+     * Set the Bottom Right cell for the chart.
+     *
+     * @return $this
+     */
+    public function setBottomRightCell(string $cellAddress = '')
     {
-        $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;
     }
@@ -590,8 +599,8 @@ class Chart
     /**
      * Set the offset position within the Bottom Right cell for the chart.
      *
-     * @param int $xOffset
-     * @param int $yOffset
+     * @param ?int $xOffset
+     * @param ?int $yOffset
      *
      * @return $this
      */
@@ -621,6 +630,11 @@ class Chart
         ];
     }
 
+    /**
+     * @param int $xOffset
+     *
+     * @return $this
+     */
     public function setBottomRightXOffset($xOffset)
     {
         $this->bottomRightXOffset = $xOffset;
@@ -628,11 +642,16 @@ class Chart
         return $this;
     }
 
-    public function getBottomRightXOffset()
+    public function getBottomRightXOffset(): int
     {
         return $this->bottomRightXOffset;
     }
 
+    /**
+     * @param int $yOffset
+     *
+     * @return $this
+     */
     public function setBottomRightYOffset($yOffset)
     {
         $this->bottomRightYOffset = $yOffset;
@@ -640,14 +659,14 @@ class Chart
         return $this;
     }
 
-    public function getBottomRightYOffset()
+    public function getBottomRightYOffset(): int
     {
         return $this->bottomRightYOffset;
     }
 
-    public function refresh()
+    public function refresh(): void
     {
-        if ($this->worksheet !== null) {
+        if ($this->worksheet !== null && $this->plotArea !== null) {
             $this->plotArea->refresh($this->worksheet);
         }
     }
@@ -675,6 +694,121 @@ class Chart
 
         $renderer = new $libraryName($this);
 
-        return $renderer->render($outputDestination);
+        return $renderer->render($outputDestination); // @phpstan-ignore-line
+    }
+
+    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;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
new file mode 100644
index 000000000..87f310200
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
@@ -0,0 +1,177 @@
+<?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';
+    /** @deprecated 1.24 use EXCEL_COLOR_TYPE_RGB instead */
+    const EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
+    const EXCEL_COLOR_TYPES = [
+        self::EXCEL_COLOR_TYPE_ARGB,
+        self::EXCEL_COLOR_TYPE_SCHEME,
+        self::EXCEL_COLOR_TYPE_STANDARD,
+    ];
+
+    /** @var string */
+    private $value = '';
+
+    /** @var string */
+    private $type = '';
+
+    /** @var ?int */
+    private $alpha;
+
+    /** @var ?int */
+    private $brightness;
+
+    /**
+     * @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;
+    }
+
+    /**
+     * @param null|float|int|string $alpha
+     * @param null|float|int|string $brightness
+     */
+    public function setColorProperties(?string $color, $alpha = null, ?string $type = null, $brightness = null): self
+    {
+        if (empty($type) && !empty($color)) {
+            if (substr($color, 0, 1) === '*') {
+                $type = 'schemeClr';
+                $color = substr($color, 1);
+            } elseif (substr($color, 0, 1) === '/') {
+                $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.
+     *
+     * @param string $propertyName
+     *
+     * @return null|int|string
+     */
+    public function getColorProperty($propertyName)
+    {
+        $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';
+    }
+
+    /**
+     * @param float|int|string $alpha
+     */
+    public static function alphaFromXml($alpha): int
+    {
+        return 100 - ((int) $alpha / 1000);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
index c20efabe8..5d33e96d0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
@@ -40,6 +40,10 @@ class DataSeries
     const STYLE_MARKER = 'marker';
     const STYLE_FILLED = 'filled';
 
+    const EMPTY_AS_GAP = 'gap';
+    const EMPTY_AS_ZERO = 'zero';
+    const EMPTY_AS_SPAN = 'span';
+
     /**
      * Series Plot Type.
      *
@@ -71,26 +75,26 @@ class DataSeries
     /**
      * Order of plots in Series.
      *
-     * @var array of integer
+     * @var int[]
      */
     private $plotOrder = [];
 
     /**
      * Plot Label.
      *
-     * @var array of DataSeriesValues
+     * @var DataSeriesValues[]
      */
     private $plotLabel = [];
 
     /**
      * Plot Category.
      *
-     * @var array of DataSeriesValues
+     * @var DataSeriesValues[]
      */
     private $plotCategory = [];
 
     /**
-     * Smooth Line.
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
      *
      * @var bool
      */
@@ -99,10 +103,17 @@ class DataSeries
     /**
      * Plot Values.
      *
-     * @var array of DataSeriesValues
+     * @var DataSeriesValues[]
      */
     private $plotValues = [];
 
+    /**
+     * Plot Bubble Sizes.
+     *
+     * @var DataSeriesValues[]
+     */
+    private $plotBubbleSizes = [];
+
     /**
      * Create a new DataSeries.
      *
@@ -123,12 +134,12 @@ class DataSeries
         $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;
@@ -227,7 +238,7 @@ class DataSeries
     /**
      * Get Plot Labels.
      *
-     * @return array of DataSeriesValues
+     * @return DataSeriesValues[]
      */
     public function getPlotLabels()
     {
@@ -239,15 +250,13 @@ class DataSeries
      *
      * @param mixed $index
      *
-     * @return DataSeriesValues
+     * @return DataSeriesValues|false
      */
     public function getPlotLabelByIndex($index)
     {
         $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;
@@ -256,7 +265,7 @@ class DataSeries
     /**
      * Get Plot Categories.
      *
-     * @return array of DataSeriesValues
+     * @return DataSeriesValues[]
      */
     public function getPlotCategories()
     {
@@ -268,7 +277,7 @@ class DataSeries
      *
      * @param mixed $index
      *
-     * @return DataSeriesValues
+     * @return DataSeriesValues|false
      */
     public function getPlotCategoryByIndex($index)
     {
@@ -309,7 +318,7 @@ class DataSeries
     /**
      * Get Plot Values.
      *
-     * @return array of DataSeriesValues
+     * @return DataSeriesValues[]
      */
     public function getPlotValues()
     {
@@ -321,20 +330,40 @@ class DataSeries
      *
      * @param mixed $index
      *
-     * @return DataSeriesValues
+     * @return DataSeriesValues|false
      */
     public function getPlotValuesByIndex($index)
     {
         $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 Plot Bubble Sizes.
+     *
+     * @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.
      *
@@ -369,7 +398,7 @@ class DataSeries
         return $this;
     }
 
-    public function refresh(Worksheet $worksheet)
+    public function refresh(Worksheet $worksheet): void
     {
         foreach ($this->plotValues as $plotValues) {
             if ($plotValues !== null) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
index ec40cb842..c86f5569b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -7,12 +7,12 @@ use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 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,
     ];
@@ -27,7 +27,7 @@ class DataSeriesValues
     /**
      * Series Data Source.
      *
-     * @var string
+     * @var ?string
      */
     private $dataSource;
 
@@ -45,6 +45,19 @@ class DataSeriesValues
      */
     private $pointMarker;
 
+    /** @var ChartColor */
+    private $markerFillColor;
+
+    /** @var ChartColor */
+    private $markerBorderColor;
+
+    /**
+     * Series Point Size.
+     *
+     * @var int
+     */
+    private $pointSize = 3;
+
     /**
      * Point Count (The number of datapoints in the dataseries).
      *
@@ -55,23 +68,28 @@ class DataSeriesValues
     /**
      * Data Values.
      *
-     * @var array of mixed
+     * @var mixed[]
      */
     private $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;
+    /** @var bool */
+    private $scatterLines = true;
+
+    /** @var bool */
+    private $bubble3D = false;
+
+    /** @var ?Layout */
+    private $labelLayout;
+
+    /** @var TrendLine[] */
+    private $trendLines = [];
 
     /**
      * Create a new DataSeriesValues object.
@@ -82,17 +100,26 @@ class DataSeriesValues
      * @param int $pointCount
      * @param mixed $dataValues
      * @param null|mixed $marker
-     * @param null|string|string[] $fillColor
+     * @param null|ChartColor|ChartColor[]|string|string[] $fillColor
+     * @param string $pointSize
      */
-    public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = [], $marker = null, $fillColor = null)
+    public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = [], $marker = null, $fillColor = null, $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;
+        }
     }
 
     /**
@@ -115,13 +142,11 @@ class DataSeriesValues
      *                                    DataSeriesValues::DATASERIES_TYPE_NUMBER
      *                                        Normally used for chart data values
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function setDataType($dataType)
     {
-        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;
@@ -132,7 +157,7 @@ class DataSeriesValues
     /**
      * Get Series Data Source (formula).
      *
-     * @return string
+     * @return ?string
      */
     public function getDataSource()
     {
@@ -142,7 +167,7 @@ class DataSeriesValues
     /**
      * Set Series Data Source (formula).
      *
-     * @param string $dataSource
+     * @param ?string $dataSource
      *
      * @return $this
      */
@@ -177,6 +202,36 @@ class DataSeriesValues
         return $this;
     }
 
+    public function getMarkerFillColor(): ChartColor
+    {
+        return $this->markerFillColor;
+    }
+
+    public function getMarkerBorderColor(): ChartColor
+    {
+        return $this->markerBorderColor;
+    }
+
+    /**
+     * Get Point Size.
+     */
+    public function getPointSize(): int
+    {
+        return $this->pointSize;
+    }
+
+    /**
+     * Set Point Size.
+     *
+     * @return $this
+     */
+    public function setPointSize(int $size = 3)
+    {
+        $this->pointSize = $size;
+
+        return $this;
+    }
+
     /**
      * Get Series Format Code.
      *
@@ -211,6 +266,51 @@ class DataSeriesValues
         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 (substr($fillString, 0, 1) === '*') {
+            $type = 'schemeClr';
+            $value = substr($fillString, 1);
+        } elseif (substr($fillString, 0, 1) === '/') {
+            $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.
      *
@@ -218,26 +318,44 @@ class DataSeriesValues
      */
     public function getFillColor()
     {
-        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
      */
     public function setFillColor($color)
     {
         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,8 +365,6 @@ class DataSeriesValues
      *
      * @param string $color value for color
      *
-     * @throws \Exception thrown if color is invalid
-     *
      * @return bool true if validation was successful
      */
     private function validateColor($color)
@@ -263,24 +379,23 @@ class DataSeriesValues
     /**
      * Get line width for series.
      *
-     * @return int
+     * @return null|float|int
      */
     public function getLineWidth()
     {
-        return $this->lineWidth;
+        return $this->lineStyleProperties['width'];
     }
 
     /**
      * Set line width for the series.
      *
-     * @param int $width
+     * @param null|float|int $width
      *
      * @return $this
      */
     public function setLineWidth($width)
     {
-        $minWidth = 12700;
-        $this->lineWidth = max($minWidth, $width);
+        $this->lineStyleProperties['width'] = $width;
 
         return $this;
     }
@@ -292,7 +407,7 @@ class DataSeriesValues
      */
     public function isMultiLevelSeries()
     {
-        if (count($this->dataValues) > 0) {
+        if (!empty($this->dataValues)) {
             return is_array(array_values($this->dataValues)[0]);
         }
 
@@ -317,7 +432,7 @@ class DataSeriesValues
     /**
      * Get Series Data Values.
      *
-     * @return array of mixed
+     * @return mixed[]
      */
     public function getDataValues()
     {
@@ -356,7 +471,7 @@ class DataSeriesValues
         return $this;
     }
 
-    public function refresh(Worksheet $worksheet, $flatten = true)
+    public function refresh(Worksheet $worksheet, bool $flatten = true): void
     {
         if ($this->dataSource !== null) {
             $calcEngine = Calculation::getInstance($worksheet->getParent());
@@ -381,7 +496,7 @@ class DataSeriesValues
                 if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
                     $this->dataValues = Functions::flattenArray($newDataValues);
                 } else {
-                    $newArray = array_values(array_shift($newDataValues));
+                    $newArray = array_values(array_shift(/** @scrutinizer ignore-type */ $newDataValues));
                     foreach ($newArray as $i => $newDataSet) {
                         $newArray[$i] = [$newDataSet];
                     }
@@ -398,4 +513,83 @@ class DataSeriesValues
             $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.
+     *
+     * @var bool
+     */
+    private $smoothLine;
+
+    /**
+     * Get Smooth Line.
+     *
+     * @return bool
+     */
+    public function getSmoothLine()
+    {
+        return $this->smoothLine;
+    }
+
+    /**
+     * Set Smooth Line.
+     *
+     * @param bool $smoothLine
+     *
+     * @return $this
+     */
+    public function setSmoothLine($smoothLine)
+    {
+        $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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
index b07fcae59..8b86ccbde 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
@@ -10,446 +10,4 @@ namespace PhpOffice\PhpSpreadsheet\Chart;
  */
 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)
-    {
-        $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)
-    {
-        $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)
-    {
-        $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)
-    {
-        $this->activateObject()
-            ->setShadowPresetsProperties((int) $sh_presets)
-            ->setShadowColor(
-                $sh_color_value === null ? $this->shadowProperties['color']['value'] : $sh_color_value,
-                $sh_color_alpha === null ? (int) $this->shadowProperties['color']['alpha'] : $this->getTrueAlpha($sh_color_alpha),
-                $sh_color_type === null ? $this->shadowProperties['color']['type'] : $sh_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 array $properties_map
-     * @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)
-    {
-        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
index 3e989c6d5..ac36c25c9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
@@ -2,62 +2,77 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart;
 
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
 class Layout
 {
     /**
      * layoutTarget.
      *
-     * @var string
+     * @var ?string
      */
     private $layoutTarget;
 
     /**
      * X Mode.
      *
-     * @var string
+     * @var ?string
      */
     private $xMode;
 
     /**
      * Y Mode.
      *
-     * @var string
+     * @var ?string
      */
     private $yMode;
 
     /**
      * X-Position.
      *
-     * @var float
+     * @var ?float
      */
     private $xPos;
 
     /**
      * Y-Position.
      *
-     * @var float
+     * @var ?float
      */
     private $yPos;
 
     /**
      * width.
      *
-     * @var float
+     * @var ?float
      */
     private $width;
 
     /**
      * height.
      *
-     * @var float
+     * @var ?float
      */
     private $height;
 
+    /**
+     * Position - t=top.
+     *
+     * @var string
+     */
+    private $dLblPos = '';
+
+    /** @var string */
+    private $numFmtCode = '';
+
+    /** @var bool */
+    private $numFmtLinked = false;
+
     /**
      * show legend key
      * Specifies that legend keys should be shown in data labels.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showLegendKey;
 
@@ -65,7 +80,7 @@ class Layout
      * show value
      * Specifies that the value should be shown in a data label.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showVal;
 
@@ -73,7 +88,7 @@ class Layout
      * show category name
      * Specifies that the category name should be shown in the data label.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showCatName;
 
@@ -81,7 +96,7 @@ class Layout
      * show data series name
      * Specifies that the series name should be shown in the data label.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showSerName;
 
@@ -89,14 +104,14 @@ class Layout
      * show percentage
      * Specifies that the percentage should be shown in the data label.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showPercent;
 
     /**
      * show bubble size.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showBubbleSize;
 
@@ -104,14 +119,24 @@ class Layout
      * show leader lines
      * Specifies that leader lines should be shown for the data label.
      *
-     * @var bool
+     * @var ?bool
      */
     private $showLeaderLines;
 
+    /** @var ?ChartColor */
+    private $labelFillColor;
+
+    /** @var ?ChartColor */
+    private $labelBorderColor;
+
+    /** @var ?Font */
+    private $labelFont;
+
+    /** @var Properties */
+    private $labelEffects;
+
     /**
      * Create a new Layout.
-     *
-     * @param array $layout
      */
     public function __construct(array $layout = [])
     {
@@ -136,12 +161,54 @@ class 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
+     * @return ?string
      */
     public function getLayoutTarget()
     {
@@ -151,13 +218,13 @@ class Layout
     /**
      * Set Layout Target.
      *
-     * @param string $value
+     * @param ?string $target
      *
      * @return $this
      */
-    public function setLayoutTarget($value)
+    public function setLayoutTarget($target)
     {
-        $this->layoutTarget = $value;
+        $this->layoutTarget = $target;
 
         return $this;
     }
@@ -165,7 +232,7 @@ class Layout
     /**
      * Get X-Mode.
      *
-     * @return string
+     * @return ?string
      */
     public function getXMode()
     {
@@ -175,13 +242,13 @@ class Layout
     /**
      * Set X-Mode.
      *
-     * @param string $value
+     * @param ?string $mode
      *
      * @return $this
      */
-    public function setXMode($value)
+    public function setXMode($mode)
     {
-        $this->xMode = (string) $value;
+        $this->xMode = (string) $mode;
 
         return $this;
     }
@@ -189,7 +256,7 @@ class Layout
     /**
      * Get Y-Mode.
      *
-     * @return string
+     * @return ?string
      */
     public function getYMode()
     {
@@ -199,13 +266,13 @@ class Layout
     /**
      * Set Y-Mode.
      *
-     * @param string $value
+     * @param ?string $mode
      *
      * @return $this
      */
-    public function setYMode($value)
+    public function setYMode($mode)
     {
-        $this->yMode = (string) $value;
+        $this->yMode = (string) $mode;
 
         return $this;
     }
@@ -213,7 +280,7 @@ class Layout
     /**
      * Get X-Position.
      *
-     * @return number
+     * @return null|float|int
      */
     public function getXPosition()
     {
@@ -223,13 +290,13 @@ class Layout
     /**
      * Set X-Position.
      *
-     * @param float $value
+     * @param ?float $position
      *
      * @return $this
      */
-    public function setXPosition($value)
+    public function setXPosition($position)
     {
-        $this->xPos = (float) $value;
+        $this->xPos = (float) $position;
 
         return $this;
     }
@@ -237,7 +304,7 @@ class Layout
     /**
      * Get Y-Position.
      *
-     * @return number
+     * @return null|float
      */
     public function getYPosition()
     {
@@ -247,13 +314,13 @@ class Layout
     /**
      * Set Y-Position.
      *
-     * @param float $value
+     * @param ?float $position
      *
      * @return $this
      */
-    public function setYPosition($value)
+    public function setYPosition($position)
     {
-        $this->yPos = (float) $value;
+        $this->yPos = (float) $position;
 
         return $this;
     }
@@ -261,7 +328,7 @@ class Layout
     /**
      * Get Width.
      *
-     * @return number
+     * @return ?float
      */
     public function getWidth()
     {
@@ -271,13 +338,13 @@ class Layout
     /**
      * Set Width.
      *
-     * @param float $value
+     * @param ?float $width
      *
      * @return $this
      */
-    public function setWidth($value)
+    public function setWidth($width)
     {
-        $this->width = $value;
+        $this->width = $width;
 
         return $this;
     }
@@ -285,7 +352,7 @@ class Layout
     /**
      * Get Height.
      *
-     * @return number
+     * @return null|float
      */
     public function getHeight()
     {
@@ -295,23 +362,18 @@ class Layout
     /**
      * Set Height.
      *
-     * @param float $value
+     * @param ?float $height
      *
      * @return $this
      */
-    public function setHeight($value)
+    public function setHeight($height)
     {
-        $this->height = $value;
+        $this->height = $height;
 
         return $this;
     }
 
-    /**
-     * Get show legend key.
-     *
-     * @return bool
-     */
-    public function getShowLegendKey()
+    public function getShowLegendKey(): ?bool
     {
         return $this->showLegendKey;
     }
@@ -319,24 +381,15 @@ class Layout
     /**
      * 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;
     }
@@ -344,24 +397,15 @@ class Layout
     /**
      * 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;
     }
@@ -369,114 +413,164 @@ class Layout
     /**
      * 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;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
index d07762651..04040aed6 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
+++ b/libraries/phpspreadsheet/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 => '??',
@@ -44,22 +44,38 @@ class Legend
     /**
      * Legend Layout.
      *
-     * @var Layout
+     * @var ?Layout
      */
     private $layout;
 
+    /** @var GridLines */
+    private $borderLines;
+
+    /** @var ChartColor */
+    private $fillColor;
+
+    /** @var ?AxisText */
+    private $legendText;
+
     /**
      * Create a new Legend.
      *
      * @param string $position
-     * @param null|Layout $layout
+     * @param ?Layout $layout
      * @param bool $overlay
      */
-    public function __construct($position = self::POSITION_RIGHT, Layout $layout = null, $overlay = false)
+    public function __construct($position = self::POSITION_RIGHT, ?Layout $layout = null, $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;
     }
 
     /**
@@ -81,7 +97,7 @@ class Legend
      */
     public function setPosition($position)
     {
-        if (!in_array($position, self::$positionXLref)) {
+        if (!in_array($position, self::POSITION_XLREF)) {
             return false;
         }
 
@@ -93,11 +109,12 @@ class Legend
     /**
      * Get legend position as an Excel internal numeric value.
      *
-     * @return int
+     * @return false|int
      */
     public function getPositionXL()
     {
-        return array_search($this->position, self::$positionXLref);
+        // Scrutinizer thinks the following could return string. It is wrong.
+        return array_search($this->position, self::POSITION_XLREF);
     }
 
     /**
@@ -109,11 +126,11 @@ class Legend
      */
     public function setPositionXL($positionXL)
     {
-        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;
     }
@@ -132,27 +149,43 @@ class Legend
      * Set allow overlay of other elements?
      *
      * @param bool $overlay
-     *
-     * @return bool
      */
-    public function setOverlay($overlay)
+    public function setOverlay($overlay): void
     {
-        if (!is_bool($overlay)) {
-            return false;
-        }
-
         $this->overlay = $overlay;
-
-        return true;
     }
 
     /**
      * Get Layout.
      *
-     * @return Layout
+     * @return ?Layout
      */
     public function getLayout()
     {
         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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
index 9da4aa329..2b78d9a4e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
@@ -6,10 +6,34 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class PlotArea
 {
+    /**
+     * No fill in plot area (show Excel gridlines through chart).
+     *
+     * @var bool
+     */
+    private $noFill = false;
+
+    /**
+     * PlotArea Gradient Stop list.
+     * Each entry is a 2-element array.
+     *     First is position in %.
+     *     Second is ChartColor.
+     *
+     * @var array[]
+     */
+    private $gradientFillStops = [];
+
+    /**
+     * PlotArea Gradient Angle.
+     *
+     * @var ?float
+     */
+    private $gradientFillAngle;
+
     /**
      * PlotArea Layout.
      *
-     * @var Layout
+     * @var ?Layout
      */
     private $layout;
 
@@ -23,31 +47,23 @@ class PlotArea
     /**
      * Create a new PlotArea.
      *
-     * @param null|Layout $layout
      * @param DataSeries[] $plotSeries
      */
-    public function __construct(Layout $layout = null, array $plotSeries = [])
+    public function __construct(?Layout $layout = null, array $plotSeries = [])
     {
         $this->layout = $layout;
         $this->plotSeries = $plotSeries;
     }
 
-    /**
-     * Get Layout.
-     *
-     * @return Layout
-     */
-    public function getLayout()
+    public function getLayout(): ?Layout
     {
         return $this->layout;
     }
 
     /**
      * Get Number of Plot Groups.
-     *
-     * @return array of DataSeries
      */
-    public function getPlotGroupCount()
+    public function getPlotGroupCount(): int
     {
         return count($this->plotSeries);
     }
@@ -70,7 +86,7 @@ class PlotArea
     /**
      * Get Plot Series.
      *
-     * @return array of DataSeries
+     * @return DataSeries[]
      */
     public function getPlotGroup()
     {
@@ -103,10 +119,93 @@ class PlotArea
         return $this;
     }
 
-    public function refresh(Worksheet $worksheet)
+    public function refresh(Worksheet $worksheet): void
     {
         foreach ($this->plotSeries as $plotSeries) {
             $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.
+     *
+     * @return array
+     */
+    public function getGradientFillStops()
+    {
+        return $this->gradientFillStops;
+    }
+
+    /** @var ?int */
+    private $gapWidth;
+
+    /** @var bool */
+    private $useUpBars = false;
+
+    /** @var bool */
+    private $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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
index 98095f0d1..edb775456 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
@@ -10,10 +10,12 @@ namespace PhpOffice\PhpSpreadsheet\Chart;
  */
 abstract class Properties
 {
-    const
-        EXCEL_COLOR_TYPE_STANDARD = 'prstClr';
-    const EXCEL_COLOR_TYPE_SCHEME = 'schemeClr';
-    const EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
+    /** @deprecated 1.24 use constant from ChartColor instead */
+    const EXCEL_COLOR_TYPE_STANDARD = ChartColor::EXCEL_COLOR_TYPE_STANDARD;
+    /** @deprecated 1.24 use constant from ChartColor instead */
+    const EXCEL_COLOR_TYPE_SCHEME = ChartColor::EXCEL_COLOR_TYPE_SCHEME;
+    /** @deprecated 1.24 use constant from ChartColor instead */
+    const EXCEL_COLOR_TYPE_ARGB = ChartColor::EXCEL_COLOR_TYPE_ARGB;
 
     const
         AXIS_LABELS_LOW = 'low';
@@ -37,6 +39,7 @@ abstract class Properties
     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 = '# ?/?';
@@ -56,6 +59,8 @@ abstract class Properties
     const LINE_STYLE_COMPOUND_TRIPLE = 'tri';
     const LINE_STYLE_DASH_SOLID = 'solid';
     const LINE_STYLE_DASH_ROUND_DOT = 'sysDot';
+    const LINE_STYLE_DASH_SQUARE_DOT = 'sysDash';
+    /** @deprecated 1.24 use LINE_STYLE_DASH_SQUARE_DOT instead */
     const LINE_STYLE_DASH_SQUERE_DOT = 'sysDash';
     const LINE_STYPE_DASH_DASH = 'dash';
     const LINE_STYLE_DASH_DASH_DOT = 'dashDot';
@@ -65,7 +70,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;
@@ -110,249 +115,325 @@ abstract class Properties
     const SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22;
     const SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
 
-    /**
-     * @param float $width
-     *
-     * @return float
-     */
-    protected function getExcelPointsWidth($width)
+    const POINTS_WIDTH_MULTIPLIER = 12700;
+    const ANGLE_MULTIPLIER = 60000; // direction and size-kx size-ky
+    const PERCENTAGE_MULTIPLIER = 100000; // size sx and sy
+
+    /** @var bool */
+    protected $objectState = false; // used only for minor gridlines
+
+    /** @var ?float */
+    protected $glowSize;
+
+    /** @var ChartColor */
+    protected $glowColor;
+
+    /** @var array */
+    protected $softEdges = [
+        'size' => null,
+    ];
+
+    /** @var array */
+    protected $shadowProperties = self::PRESETS_OPTIONS[0];
+
+    /** @var ChartColor */
+    protected $shadowColor;
+
+    public function __construct()
     {
-        return $width * 12700;
+        $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 $angle
+     * Get Object State.
      *
-     * @return float
+     * @return bool
      */
-    protected function getExcelPointsAngle($angle)
+    public function getObjectState()
     {
-        return $angle * 60000;
+        return $this->objectState;
     }
 
-    protected function getTrueAlpha($alpha)
+    /**
+     * Change Object State to True.
+     *
+     * @return $this
+     */
+    public function activateObject()
     {
-        return (string) 100 - $alpha . '000';
+        $this->objectState = true;
+
+        return $this;
     }
 
-    protected function setColorProperties($color, $alpha, $type)
+    public static function pointsToXml(float $width): string
+    {
+        return (string) (int) ($width * self::POINTS_WIDTH_MULTIPLIER);
+    }
+
+    public static function xmlToPoints(string $width): float
+    {
+        return ((float) $width) / self::POINTS_WIDTH_MULTIPLIER;
+    }
+
+    public static function angleToXml(float $angle): string
+    {
+        return (string) (int) ($angle * self::ANGLE_MULTIPLIER);
+    }
+
+    public static function xmlToAngle(string $angle): float
+    {
+        return ((float) $angle) / self::ANGLE_MULTIPLIER;
+    }
+
+    public static function tenthOfPercentToXml(float $value): string
+    {
+        return (string) (int) ($value * self::PERCENTAGE_MULTIPLIER);
+    }
+
+    public static function xmlToTenthOfPercent(string $value): float
+    {
+        return ((float) $value) / self::PERCENTAGE_MULTIPLIER;
+    }
+
+    /**
+     * @param null|float|int|string $alpha
+     */
+    protected function setColorProperties(?string $color, $alpha, ?string $colorType): array
     {
         return [
-            'type' => (string) $type,
-            'value' => (string) $color,
-            'alpha' => (string) $this->getTrueAlpha($alpha),
+            'type' => $colorType,
+            'value' => $color,
+            'alpha' => ($alpha === null) ? null : (int) $alpha,
         ];
     }
 
-    protected function getLineStyleArrowSize($array_selector, $array_kay_selector)
+    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,
+            ],
+            '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,
+            ],
+            '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,
+            ],
+            '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,
+            ],
+            '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,
+            ],
+            '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,
+            ],
+            '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',
+        ],
+    ];
+
+    protected function getShadowPresetsMap(int $presetsOption): array
     {
-        $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 $sizes[$array_selector][$array_kay_selector];
-    }
-
-    protected function getShadowPresetsMap($shadow_presets_option)
-    {
-        $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',
-            ],
-            18 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '13500000',
-            ],
-            //perspective
-            19 => [
-                'effect' => 'outerShdw',
-                'blur' => '152400',
-                'distance' => '317500',
-                'size' => [
-                    'sx' => '90000',
-                    'sy' => '-19000',
-                ],
-                'direction' => '5400000',
-                'rotWithShape' => '0',
-            ],
-            20 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'direction' => '18900000',
-                'size' => [
-                    'sy' => '23000',
-                    'kx' => '-1200000',
-                ],
-                'algn' => 'bl',
-                'rotWithShape' => '0',
-            ],
-            21 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'direction' => '13500000',
-                'size' => [
-                    'sy' => '23000',
-                    'kx' => '1200000',
-                ],
-                'algn' => 'br',
-                'rotWithShape' => '0',
-            ],
-            22 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'distance' => '12700',
-                'direction' => '2700000',
-                'size' => [
-                    'sy' => '-23000',
-                    'kx' => '-800400',
-                ],
-                'algn' => 'bl',
-                'rotWithShape' => '0',
-            ],
-            23 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'distance' => '12700',
-                'direction' => '8100000',
-                'size' => [
-                    'sy' => '-23000',
-                    'kx' => '800400',
-                ],
-                'algn' => 'br',
-                'rotWithShape' => '0',
-            ],
-        ];
-
-        return $presets_options[$shadow_presets_option];
+        return self::PRESETS_OPTIONS[$presetsOption] ?? self::PRESETS_OPTIONS[0];
     }
 
+    /**
+     * Get value of array element.
+     *
+     * @param mixed $properties
+     * @param mixed $elements
+     *
+     * @return mixed
+     */
     protected function getArrayElementsValue($properties, $elements)
     {
         $reference = &$properties;
@@ -366,4 +447,539 @@ abstract class Properties
 
         return $reference;
     }
+
+    /**
+     * Set Glow Properties.
+     *
+     * @param float $size
+     * @param ?string $colorValue
+     * @param ?int $colorAlpha
+     * @param ?string $colorType
+     */
+    public function setGlowProperties($size, $colorValue = null, $colorAlpha = null, $colorType = null): void
+    {
+        $this
+            ->activateObject()
+            ->setGlowSize($size);
+        $this->glowColor->setColorPropertiesArray(
+            [
+                'value' => $colorValue,
+                'type' => $colorType,
+                'alpha' => $colorAlpha,
+            ]
+        );
+    }
+
+    /**
+     * Get Glow Property.
+     *
+     * @param array|string $property
+     *
+     * @return null|array|float|int|string
+     */
+    public function getGlowProperty($property)
+    {
+        $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.
+     *
+     * @param string $propertyName
+     *
+     * @return null|int|string
+     */
+    public function getGlowColor($propertyName)
+    {
+        return $this->glowColor->getColorProperty($propertyName);
+    }
+
+    public function getGlowColorObject(): ChartColor
+    {
+        return $this->glowColor;
+    }
+
+    /**
+     * Get Glow Size.
+     *
+     * @return ?float
+     */
+    public function getGlowSize()
+    {
+        return $this->glowSize;
+    }
+
+    /**
+     * Set Glow Size.
+     *
+     * @param ?float $size
+     *
+     * @return $this
+     */
+    protected function setGlowSize($size)
+    {
+        $this->glowSize = $size;
+
+        return $this;
+    }
+
+    /**
+     * Set Soft Edges Size.
+     *
+     * @param ?float $size
+     */
+    public function setSoftEdges($size): void
+    {
+        if ($size !== null) {
+            $this->activateObject();
+            $this->softEdges['size'] = $size;
+        }
+    }
+
+    /**
+     * Get Soft Edges Size.
+     *
+     * @return string
+     */
+    public function getSoftEdgesSize()
+    {
+        return $this->softEdges['size'];
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function setShadowProperty(string $propertyName, $value): self
+    {
+        $this->activateObject();
+        if ($propertyName === 'color' && is_array($value)) {
+            $this->shadowColor->setColorPropertiesArray($value);
+        } else {
+            $this->shadowProperties[$propertyName] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties.
+     *
+     * @param int $presets
+     * @param string $colorValue
+     * @param string $colorType
+     * @param null|float|int|string $colorAlpha
+     * @param null|float $blur
+     * @param null|int $angle
+     * @param null|float $distance
+     */
+    public function setShadowProperties($presets, $colorValue = null, $colorType = null, $colorAlpha = null, $blur = null, $angle = null, $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.
+     *
+     * @param int $presets
+     *
+     * @return $this
+     */
+    protected function setShadowPresetsProperties($presets)
+    {
+        $this->shadowProperties['presets'] = $presets;
+        $this->setShadowPropertiesMapValues($this->getShadowPresetsMap($presets));
+
+        return $this;
+    }
+
+    protected const SHADOW_ARRAY_KEYS = ['size', 'color'];
+
+    /**
+     * Set Shadow Properties Values.
+     *
+     * @param mixed $reference
+     *
+     * @return $this
+     */
+    protected function setShadowPropertiesMapValues(array $propertiesMap, &$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.
+     *
+     * @param ?float $blur
+     *
+     * @return $this
+     */
+    protected function setShadowBlur($blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = $blur;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle.
+     *
+     * @param null|float|int|string $angle
+     *
+     * @return $this
+     */
+    protected function setShadowAngle($angle)
+    {
+        if (is_numeric($angle)) {
+            $this->shadowProperties['direction'] = $angle;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance.
+     *
+     * @param ?float $distance
+     *
+     * @return $this
+     */
+    protected function setShadowDistance($distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = $distance;
+        }
+
+        return $this;
+    }
+
+    public function getShadowColorObject(): ChartColor
+    {
+        return $this->shadowColor;
+    }
+
+    /**
+     * Get Shadow Property.
+     *
+     * @param string|string[] $elements
+     *
+     * @return array|string
+     */
+    public function getShadowProperty($elements)
+    {
+        if ($elements === 'color') {
+            return [
+                'value' => $this->shadowColor->getValue(),
+                'type' => $this->shadowColor->getType(),
+                'alpha' => $this->shadowColor->getAlpha(),
+            ];
+        }
+
+        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+    }
+
+    public function getShadowArray(): array
+    {
+        $array = $this->shadowProperties;
+        if ($this->getShadowColorObject()->isUsable()) {
+            $array['color'] = $this->getShadowProperty('color');
+        }
+
+        return $array;
+    }
+
+    /** @var ChartColor */
+    protected $lineColor;
+
+    /** @var array */
+    protected $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.
+     *
+     * @param string $value
+     * @param ?int $alpha
+     * @param ?string $colorType
+     */
+    public function setLineColorProperties($value, $alpha = null, $colorType = null): void
+    {
+        $this->activateObject();
+        $this->lineColor->setColorPropertiesArray(
+            $this->setColorProperties(
+                $value,
+                $alpha,
+                $colorType
+            )
+        );
+    }
+
+    /**
+     * Get Line Color Property.
+     *
+     * @param string $propertyName
+     *
+     * @return null|int|string
+     */
+    public function getLineColorProperty($propertyName)
+    {
+        return $this->lineColor->getColorProperty($propertyName);
+    }
+
+    /**
+     * Set Line Style Properties.
+     *
+     * @param null|float|int|string $lineWidth
+     * @param string $compoundType
+     * @param string $dashType
+     * @param string $capType
+     * @param string $joinType
+     * @param string $headArrowType
+     * @param string $headArrowSize
+     * @param string $endArrowType
+     * @param string $endArrowSize
+     * @param string $headArrowWidth
+     * @param string $headArrowLength
+     * @param string $endArrowWidth
+     * @param string $endArrowLength
+     */
+    public function setLineStyleProperties($lineWidth = null, $compoundType = '', $dashType = '', $capType = '', $joinType = '', $headArrowType = '', $headArrowSize = '', $endArrowType = '', $endArrowSize = '', $headArrowWidth = '', $headArrowLength = '', $endArrowWidth = '', $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 (array_key_exists($headArrowSize, self::ARROW_SIZES)) {
+            $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 (array_key_exists($endArrowSize, self::ARROW_SIZES)) {
+            $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;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function setLineStyleProperty(string $propertyName, $value): self
+    {
+        $this->activateObject();
+        $this->lineStyleProperties[$propertyName] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get Line Style Property.
+     *
+     * @param array|string $elements
+     *
+     * @return string
+     */
+    public function getLineStyleProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+    }
+
+    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.
+     *
+     * @param int $arraySelector
+     * @param string $arrayKaySelector
+     *
+     * @return string
+     */
+    protected function getLineStyleArrowSize($arraySelector, $arrayKaySelector)
+    {
+        return self::ARROW_SIZES[$arraySelector][$arrayKaySelector] ?? '';
+    }
+
+    /**
+     * Get Line Style Arrow Parameters.
+     *
+     * @param string $arrowSelector
+     * @param string $propertySelector
+     *
+     * @return string
+     */
+    public function getLineStyleArrowParameters($arrowSelector, $propertySelector)
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrowSelector]['size'], $propertySelector);
+    }
+
+    /**
+     * Get Line Style Arrow Width.
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowWidth($arrow)
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'w']);
+    }
+
+    /**
+     * Get Line Style Arrow Excel Length.
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowLength($arrow)
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'len']);
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
index c6fcfbfc9..3032f6ba2 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
@@ -8,8 +8,6 @@ interface IRenderer
 {
     /**
      * IRenderer constructor.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Chart\Chart $chart
      */
     public function __construct(Chart $chart);
 
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
index 9dcab049d..faadd9a30 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -2,54 +2,28 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
 
-use PhpOffice\PhpSpreadsheet\Chart\Chart;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-
-require_once __DIR__ . '/Polyfill.php';
-
-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.
-     *
-     * @param Chart $chart
-     */
-    public function __construct(Chart $chart)
-    {
-        self::init();
-        $this->graph = null;
-        $this->chart = $chart;
-    }
-
-    private static function init()
+    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');
@@ -61,796 +35,6 @@ class JpGraph implements IRenderer
         \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()
-    {
-        $title = $this->getCaption($this->chart->getTitle());
-        if ($title !== null) {
-            $this->graph->title->Set($title);
-        }
-    }
-
-    private function renderLegend()
-    {
-        $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')
-    {
-        $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()
-    {
-        $this->graph = new \PieGraph(self::$width, self::$height);
-
-        $this->renderTitle();
-    }
-
-    private function renderRadarPlotArea()
-    {
-        $this->graph = new \RadarGraph(self::$width, self::$height);
-        $this->graph->SetScale('lin');
-
-        $this->renderTitle();
-    }
-
-    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d')
-    {
-        $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);
-        }
-
-        //    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')
-    {
-        $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);
-        }
-
-        //    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)
-    {
-        $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)
-    {
-        $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)
-    {
-        $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)
-    {
-        $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')
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, true, false, $dimensions);
-        }
-    }
-
-    private function renderLineChart($groupCount, $dimensions = '2d')
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, false, false, $dimensions);
-        }
-    }
-
-    private function renderBarChart($groupCount, $dimensions = '2d')
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotBar($i, $dimensions);
-        }
-    }
-
-    private function renderScatterChart($groupCount)
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, false);
-        }
-    }
-
-    private function renderBubbleChart($groupCount)
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, true);
-        }
-    }
-
-    private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
-    {
-        $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)
-    {
-        $this->renderRadarPlotArea();
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotRadar($groupID);
-        }
-    }
-
-    private function renderStockChart($groupCount)
-    {
-        $this->renderCartesianPlotArea('intint');
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotStock($groupID);
-        }
-    }
-
-    private function renderContourChart($groupCount, $dimensions)
-    {
-        $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
new file mode 100644
index 000000000..d676f1d33
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -0,0 +1,873 @@
+<?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 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)
+    {
+        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,
+        ];
+    }
+
+    /**
+     * 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($groupID, $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($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): 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);
+            }
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->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();
+
+        $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();
+            }
+            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
+    {
+        $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;
+                }
+            }
+            //var_dump($dataValuesY, $dataValuesX, $bubbleSize);
+
+            $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();
+
+        //    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));
+
+            $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
+    {
+        $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($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, $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) {
+            $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)
+    {
+        $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($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, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
new file mode 100644
index 000000000..b5e70d3a1
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+/**
+ * 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;
+        }
+
+        \mitoteam\jpgraph\MtJpGraph::load([
+            'bar',
+            'contour',
+            'line',
+            'pie',
+            'pie3d',
+            'radar',
+            'regstat',
+            'scatter',
+            'stock',
+        ], true); // enable Extended mode
+
+        $loaded = true;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt
index 4abab7a25..bc940600f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php
deleted file mode 100644
index 7fa383944..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// This is a dirty workaround to output JpGraph charts even when antialiasing is not available
-if (!function_exists('imageantialias')) {
-    function imageantialias(...$args)
-    {
-        // Do nothing
-    }
-}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
index 650bcdc15..9c99ccac1 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
@@ -2,48 +2,82 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart;
 
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+
 class Title
 {
     /**
      * Title Caption.
      *
-     * @var string
+     * @var array|RichText|string
      */
-    private $caption;
+    private $caption = '';
+
+    /**
+     * Allow overlay of other elements?
+     *
+     * @var bool
+     */
+    private $overlay = true;
 
     /**
      * Title Layout.
      *
-     * @var Layout
+     * @var ?Layout
      */
     private $layout;
 
     /**
      * Create a new Title.
      *
-     * @param null|mixed $caption
-     * @param null|Layout $layout
+     * @param array|RichText|string $caption
+     * @param ?Layout $layout
+     * @param bool $overlay
      */
-    public function __construct($caption = null, Layout $layout = null)
+    public function __construct($caption = '', ?Layout $layout = null, $overlay = false)
     {
         $this->caption = $caption;
         $this->layout = $layout;
+        $this->setOverlay($overlay);
     }
 
     /**
      * Get caption.
      *
-     * @return string
+     * @return array|RichText|string
      */
     public function getCaption()
     {
         return $this->caption;
     }
 
+    public function getCaptionText(): string
+    {
+        $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 = $textx;
+            if ($text instanceof RichText) {
+                $retVal .= $text->getPlainText();
+            } else {
+                $retVal .= $text;
+            }
+        }
+
+        return $retVal;
+    }
+
     /**
      * Set caption.
      *
-     * @param string $caption
+     * @param array|RichText|string $caption
      *
      * @return $this
      */
@@ -55,11 +89,26 @@ class Title
     }
 
     /**
-     * Get Layout.
+     * Get allow overlay of other elements?
      *
-     * @return Layout
+     * @return bool
      */
-    public function getLayout()
+    public function getOverlay()
+    {
+        return $this->overlay;
+    }
+
+    /**
+     * Set allow overlay of other elements?
+     *
+     * @param bool $overlay
+     */
+    public function setOverlay($overlay): void
+    {
+        $this->overlay = $overlay;
+    }
+
+    public function getLayout(): ?Layout
     {
         return $this->layout;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
new file mode 100644
index 000000000..75a5896c9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
@@ -0,0 +1,226 @@
+<?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,
+    ];
+
+    /** @var string */
+    private $trendLineType = 'linear'; // TRENDLINE_LINEAR
+
+    /** @var int */
+    private $order = 2;
+
+    /** @var int */
+    private $period = 3;
+
+    /** @var bool */
+    private $dispRSqr = false;
+
+    /** @var bool */
+    private $dispEq = false;
+
+    /** @var string */
+    private $name = '';
+
+    /** @var float */
+    private $backward = 0.0;
+
+    /** @var float */
+    private $forward = 0.0;
+
+    /** @var float */
+    private $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
index 84c3d3009..9a9df227e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
@@ -2,37 +2,41 @@
 
 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
 {
+    protected const MAX_COLUMN_ID = 16384;
+
     /**
-     * @var \Psr\SimpleCache\CacheInterface
+     * @var CacheInterface
      */
     private $cache;
 
     /**
      * Parent worksheet.
      *
-     * @var Worksheet
+     * @var null|Worksheet
      */
     private $parent;
 
     /**
      * The currently active Cell.
      *
-     * @var Cell
+     * @var null|Cell
      */
     private $currentCell;
 
     /**
      * Coordinate of the currently active Cell.
      *
-     * @var string
+     * @var null|string
      */
     private $currentCoordinate;
 
@@ -44,9 +48,10 @@ class Cells
     private $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 = [];
 
@@ -61,7 +66,6 @@ class Cells
      * Initialise this new cell collection.
      *
      * @param Worksheet $parent The worksheet for this cell collection
-     * @param CacheInterface $cache
      */
     public function __construct(Worksheet $parent, CacheInterface $cache)
     {
@@ -76,7 +80,7 @@ class Cells
     /**
      * Return the parent worksheet for this cell collection.
      *
-     * @return Worksheet
+     * @return null|Worksheet
      */
     public function getParent()
     {
@@ -86,30 +90,19 @@ class Cells
     /**
      * 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($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
-     *
-     * @throws PhpSpreadsheetException
-     *
-     * @return Cell
      */
-    public function update(Cell $cell)
+    public function update(Cell $cell): Cell
     {
         return $this->add($cell->getCoordinate(), $cell);
     }
@@ -117,21 +110,21 @@ class Cells
     /**
      * 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)
+    public function delete($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);
     }
 
     /**
@@ -151,16 +144,43 @@ class Cells
      */
     public function getSortedCoordinates()
     {
-        $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);
+    }
+
+    /**
+     * Return the cell coordinate of the currently active cell object.
+     *
+     * @return null|string
+     */
+    public function getCurrentCoordinate()
+    {
+        return $this->currentCoordinate;
+    }
+
+    /**
+     * Return the column coordinate of the currently active cell object.
+     */
+    public function getCurrentColumn(): string
+    {
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
+
+        return (string) $column;
+    }
+
+    /**
+     * Return the row coordinate of the currently active cell object.
+     */
+    public function getCurrentRow(): int
+    {
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
+
+        return (int) $row;
     }
 
     /**
@@ -171,70 +191,24 @@ class Cells
     public function getHighestRowAndColumn()
     {
         // 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;
+        $maxRow = $maxColumn = 1;
+        foreach ($this->index as $coordinate) {
+            $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+            $maxRow = ($maxRow > $row) ? $maxRow : $row;
+            $column = $coordinate % self::MAX_COLUMN_ID;
+            $maxColumn = ($maxColumn > $column) ? $maxColumn : $column;
         }
 
-        // Determine highest column and row
-        $highestRow = max($row);
-        $highestColumn = substr(max($col), 1);
-
         return [
-            'row' => $highestRow,
-            'column' => $highestColumn,
+            'row' => $maxRow,
+            'column' => Coordinate::stringFromColumnIndex($maxColumn),
         ];
     }
 
-    /**
-     * Return the cell coordinate of the currently active cell object.
-     *
-     * @return string
-     */
-    public function getCurrentCoordinate()
-    {
-        return $this->currentCoordinate;
-    }
-
-    /**
-     * Return the column coordinate of the currently active cell object.
-     *
-     * @return string
-     */
-    public function getCurrentColumn()
-    {
-        $column = '';
-        $row = 0;
-
-        sscanf($this->currentCoordinate, '%[A-Z]%d', $column, $row);
-
-        return $column;
-    }
-
-    /**
-     * Return the row coordinate of the currently active cell object.
-     *
-     * @return int
-     */
-    public function getCurrentRow()
-    {
-        $column = '';
-        $row = 0;
-
-        sscanf($this->currentCoordinate, '%[A-Z]%d', $column, $row);
-
-        return (int) $row;
-    }
-
     /**
      * 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
@@ -242,30 +216,32 @@ class Cells
     public function getHighestColumn($row = null)
     {
         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;
+            $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
@@ -273,24 +249,20 @@ class Cells
     public function getHighestRow($column = null)
     {
         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;
     }
 
     /**
@@ -300,44 +272,35 @@ class Cells
      */
     private function getUniqueID()
     {
-        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)
     {
         $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->cache->get($this->cachePrefix . $key)
+            );
+            if ($stored === false) {
+                $this->destructIfNeeded($newCollection, 'Failed to copy cells in cache');
+            }
         }
 
         return $newCollection;
@@ -346,17 +309,23 @@ class Cells
     /**
      * 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)
+    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}");
             }
         }
     }
@@ -366,15 +335,16 @@ class Cells
      *
      * @param string $column Column ID to remove
      */
-    public function removeColumn($column)
+    public function removeColumn($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}");
             }
         }
     }
@@ -382,19 +352,15 @@ class Cells
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      * and the 'nullify' the current cell object.
-     *
-     * @throws PhpSpreadsheetException
      */
-    private function storeCurrentCell()
+    private function storeCurrentCell(): void
     {
-        if ($this->currentCellIsDirty && !empty($this->currentCoordinate)) {
-            $this->currentCell->detach();
+        if ($this->currentCellIsDirty && isset($this->currentCoordinate, $this->currentCell)) {
+            $this->currentCell->/** @scrutinizer ignore-call */ 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;
         }
@@ -403,24 +369,32 @@ class Cells
         $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
      *
-     * @throws PhpSpreadsheetException
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Cell\Cell
+     * @return Cell
      */
-    public function add($pCoord, Cell $cell)
+    public function add($cellCoordinate, 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;
 
@@ -430,32 +404,30 @@ class Cells
     /**
      * Get cell at a specific coordinate.
      *
-     * @param string $pCoord Coordinate of the cell
+     * @param string $cellCoordinate Coordinate of the cell
      *
-     * @throws PhpSpreadsheetException
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Cell\Cell Cell that was found, or null if not found
+     * @return null|Cell Cell that was found, or null if not found
      */
-    public function get($pCoord)
+    public function get($cellCoordinate)
     {
-        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);
+        // Check if the entry that has been requested actually exists in the cache
+        $cell = $this->cache->get($this->cachePrefix . $cellCoordinate);
         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.");
+            throw new PhpSpreadsheetException("Cell entry {$cellCoordinate} no longer exists in cache. This probably means that the cache was cleared by someone else.");
         }
 
         // 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);
@@ -467,7 +439,7 @@ class Cells
     /**
      * Clear the cell collection and disconnect from our parent.
      */
-    public function unsetWorksheetCells()
+    public function unsetWorksheetCells(): void
     {
         if ($this->currentCell !== null) {
             $this->currentCell->detach();
@@ -495,11 +467,11 @@ class Cells
     /**
      * Returns all known cache keys.
      *
-     * @return \Generator|string[]
+     * @return Generator|string[]
      */
     private function getAllCacheKeys()
     {
-        foreach ($this->getCoordinates() as $coordinate) {
+        foreach ($this->index as $coordinate => $value) {
             yield $this->cachePrefix . $coordinate;
         }
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
index 7f34c2315..b3833bd8b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
similarity index 60%
rename from libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php
rename to libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
index a32551b0e..a0eb6ec22 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheet\Collection;
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
 
+use DateInterval;
 use Psr\SimpleCache\CacheInterface;
 
 /**
@@ -10,10 +11,16 @@ use Psr\SimpleCache\CacheInterface;
  * Alternatives implementation should leverage off-memory, non-volatile storage
  * to reduce overall memory usage.
  */
-class Memory implements CacheInterface
+class SimpleCache1 implements CacheInterface
 {
+    /**
+     * @var array Cell Cache
+     */
     private $cache = [];
 
+    /**
+     * @return bool
+     */
     public function clear()
     {
         $this->cache = [];
@@ -21,6 +28,11 @@ class Memory implements CacheInterface
         return true;
     }
 
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
     public function delete($key)
     {
         unset($this->cache[$key]);
@@ -28,6 +40,11 @@ class Memory implements CacheInterface
         return true;
     }
 
+    /**
+     * @param iterable $keys
+     *
+     * @return bool
+     */
     public function deleteMultiple($keys)
     {
         foreach ($keys as $key) {
@@ -37,6 +54,12 @@ class Memory implements CacheInterface
         return true;
     }
 
+    /**
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
     public function get($key, $default = null)
     {
         if ($this->has($key)) {
@@ -46,6 +69,12 @@ class Memory implements CacheInterface
         return $default;
     }
 
+    /**
+     * @param iterable $keys
+     * @param mixed    $default
+     *
+     * @return iterable
+     */
     public function getMultiple($keys, $default = null)
     {
         $results = [];
@@ -56,11 +85,23 @@ class Memory implements CacheInterface
         return $results;
     }
 
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
     public function has($key)
     {
         return array_key_exists($key, $this->cache);
     }
 
+    /**
+     * @param string                 $key
+     * @param mixed                  $value
+     * @param null|DateInterval|int $ttl
+     *
+     * @return bool
+     */
     public function set($key, $value, $ttl = null)
     {
         $this->cache[$key] = $value;
@@ -68,6 +109,12 @@ class Memory implements CacheInterface
         return true;
     }
 
+    /**
+     * @param iterable               $values
+     * @param null|DateInterval|int $ttl
+     *
+     * @return bool
+     */
     public function setMultiple($values, $ttl = null)
     {
         foreach ($values as $key => $value) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
new file mode 100644
index 000000000..34f644705
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
+
+use DateInterval;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * This is the default implementation for in-memory cell collection.
+ *
+ * Alternatives implementation should leverage off-memory, non-volatile storage
+ * to reduce overall memory usage.
+ */
+class SimpleCache3 implements CacheInterface
+{
+    /**
+     * @var array Cell Cache
+     */
+    private $cache = [];
+
+    public function clear(): bool
+    {
+        $this->cache = [];
+
+        return true;
+    }
+
+    /**
+     * @param string $key
+     */
+    public function delete($key): bool
+    {
+        unset($this->cache[$key]);
+
+        return true;
+    }
+
+    /**
+     * @param iterable $keys
+     */
+    public function deleteMultiple($keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->delete($key);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed  $default
+     */
+    public function get($key, $default = null): mixed
+    {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param iterable $keys
+     * @param mixed    $default
+     */
+    public function getMultiple($keys, $default = null): iterable
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            $results[$key] = $this->get($key, $default);
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param string $key
+     */
+    public function has($key): bool
+    {
+        return array_key_exists($key, $this->cache);
+    }
+
+    /**
+     * @param string                 $key
+     * @param mixed                  $value
+     * @param null|DateInterval|int $ttl
+     */
+    public function set($key, $value, $ttl = null): bool
+    {
+        $this->cache[$key] = $value;
+
+        return true;
+    }
+
+    /**
+     * @param iterable               $values
+     * @param null|DateInterval|int $ttl
+     */
+    public function setMultiple($values, $ttl = null): bool
+    {
+        foreach ($values as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return true;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
index 8041ddaf3..abadc7dfb 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
@@ -2,7 +2,13 @@
 
 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;
 
 class Comment implements IComparable
 {
@@ -58,7 +64,7 @@ class Comment implements IComparable
     /**
      * Comment fill color.
      *
-     * @var Style\Color
+     * @var Color
      */
     private $fillColor;
 
@@ -69,6 +75,13 @@ class Comment implements IComparable
      */
     private $alignment;
 
+    /**
+     * Background image in comment.
+     *
+     * @var Drawing
+     */
+    private $backgroundImage;
+
     /**
      * Create a new Comment.
      */
@@ -77,28 +90,23 @@ class Comment implements IComparable
         // 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,166 +115,146 @@ class Comment implements IComparable
 
     /**
      * Get Rich text comment.
-     *
-     * @return RichText
      */
-    public function getText()
+    public function getText(): RichText
     {
         return $this->text;
     }
 
     /**
      * Set Rich text comment.
-     *
-     * @param RichText $pValue
-     *
-     * @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;
+    }
+
+    /**
+     * Set fill color.
+     */
+    public function setFillColor(Color $color): self
+    {
+        $this->fillColor = $color;
 
         return $this;
     }
 
     /**
      * Get fill color.
-     *
-     * @return Style\Color
      */
-    public function getFillColor()
+    public function getFillColor(): Color
     {
         return $this->fillColor;
     }
 
     /**
      * Set Alignment.
-     *
-     * @param string $alignment see Style\Alignment::HORIZONTAL_*
-     *
-     * @return $this
      */
-    public function setAlignment($alignment)
+    public function setAlignment(string $alignment): self
     {
         $this->alignment = $alignment;
 
@@ -275,20 +263,16 @@ class Comment implements IComparable
 
     /**
      * Get Alignment.
-     *
-     * @return string
      */
-    public function getAlignment()
+    public function getAlignment(): string
     {
         return $this->alignment;
     }
 
     /**
      * Get hash code.
-     *
-     * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
             $this->author .
@@ -300,6 +284,7 @@ class Comment implements IComparable
             ($this->visible ? 1 : 0) .
             $this->fillColor->getHashCode() .
             $this->alignment .
+            ($this->hasBackgroundImage() ? $this->backgroundImage->getHashCode() : '') .
             __CLASS__
         );
     }
@@ -321,11 +306,57 @@ class Comment implements IComparable
 
     /**
      * 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
new file mode 100644
index 000000000..07433b100
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
@@ -0,0 +1,275 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+abstract class DefinedName
+{
+    protected const REGEXP_IDENTIFY_FORMULA = '[^_\p{N}\p{L}:, \$\'!]';
+
+    /**
+     * Name.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Worksheet on which the defined name can be resolved.
+     *
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * Value of the named object.
+     *
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * Is the defined named local? (i.e. can only be used on $this->worksheet).
+     *
+     * @var bool
+     */
+    protected $localOnly;
+
+    /**
+     * Scope.
+     *
+     * @var ?Worksheet
+     */
+    protected $scope;
+
+    /**
+     * Whether this is a named range or a named formula.
+     *
+     * @var bool
+     */
+    protected $isFormula;
+
+    /**
+     * Create a new Defined Name.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null) {
+            $worksheet = $scope;
+        }
+
+        // Set local members
+        $this->name = $name;
+        $this->worksheet = $worksheet;
+        $this->value = (string) $value;
+        $this->localOnly = $localOnly;
+        // If local only, then the scope will be set to worksheet unless a scope is explicitly set
+        $this->scope = ($localOnly === true) ? (($scope === null) ? $worksheet : $scope) : null;
+        // If the range string contains characters that aren't associated with the range definition (A-Z,1-9
+        //      for cell references, and $, or the range operators (colon comma or space), quotes and ! for
+        //      worksheet names
+        //  then this is treated as a named formula, and not a named range
+        $this->isFormula = self::testIfFormula($this->value);
+    }
+
+    /**
+     * Create a new defined name, either a range or a formula.
+     */
+    public static function createInstance(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ): self {
+        $value = (string) $value;
+        $isFormula = self::testIfFormula($value);
+        if ($isFormula) {
+            return new NamedFormula($name, $worksheet, $value, $localOnly, $scope);
+        }
+
+        return new NamedRange($name, $worksheet, $value, $localOnly, $scope);
+    }
+
+    public static function testIfFormula(string $value): bool
+    {
+        if (substr($value, 0, 1) === '=') {
+            $value = substr($value, 1);
+        }
+
+        if (is_numeric($value)) {
+            return true;
+        }
+
+        $segMatcher = false;
+        foreach (explode("'", $value) as $subVal) {
+            //    Only test in alternate array entries (the non-quoted blocks)
+            $segMatcher = $segMatcher === false;
+            if (
+                $segMatcher &&
+                (preg_match('/' . self::REGEXP_IDENTIFY_FORMULA . '/miu', $subVal))
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name.
+     */
+    public function setName(string $name): self
+    {
+        if (!empty($name)) {
+            // Old title
+            $oldTitle = $this->name;
+
+            // Re-attach
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParentOrThrow()->removeNamedRange($this->name, $this->worksheet);
+            }
+            $this->name = $name;
+
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParentOrThrow()->addDefinedName($this);
+            }
+
+            if ($this->worksheet !== null) {
+                // New title
+                $newTitle = $this->name;
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->worksheet->getParentOrThrow(), $oldTitle, $newTitle);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set worksheet.
+     */
+    public function setWorksheet(?Worksheet $worksheet): self
+    {
+        $this->worksheet = $worksheet;
+
+        return $this;
+    }
+
+    /**
+     * Get range or formula value.
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set range or formula  value.
+     */
+    public function setValue(string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get localOnly.
+     */
+    public function getLocalOnly(): bool
+    {
+        return $this->localOnly;
+    }
+
+    /**
+     * Set localOnly.
+     */
+    public function setLocalOnly(bool $localScope): self
+    {
+        $this->localOnly = $localScope;
+        $this->scope = $localScope ? $this->worksheet : null;
+
+        return $this;
+    }
+
+    /**
+     * Get scope.
+     */
+    public function getScope(): ?Worksheet
+    {
+        return $this->scope;
+    }
+
+    /**
+     * Set scope.
+     */
+    public function setScope(?Worksheet $worksheet): self
+    {
+        $this->scope = $worksheet;
+        $this->localOnly = $worksheet !== null;
+
+        return $this;
+    }
+
+    /**
+     * Identify whether this is a named range or a named formula.
+     */
+    public function isFormula(): bool
+    {
+        return $this->isFormula;
+    }
+
+    /**
+     * Resolve a named range to a regular cell range or formula.
+     */
+    public static function resolveName(string $definedName, Worksheet $worksheet, string $sheetName = ''): ?self
+    {
+        if ($sheetName === '') {
+            $worksheet2 = $worksheet;
+        } else {
+            $worksheet2 = $worksheet->getParentOrThrow()->getSheetByName($sheetName);
+            if ($worksheet2 === null) {
+                return null;
+            }
+        }
+
+        return $worksheet->getParentOrThrow()->getDefinedName($definedName, $worksheet2);
+    }
+
+    /**
+     * 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
index 58fd2ef60..302afee79 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
@@ -2,15 +2,26 @@
 
 namespace PhpOffice\PhpSpreadsheet\Document;
 
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Shared\IntOrFloat;
+
 class Properties
 {
     /** constants */
-    const PROPERTY_TYPE_BOOLEAN = 'b';
-    const PROPERTY_TYPE_INTEGER = 'i';
-    const PROPERTY_TYPE_FLOAT = 'f';
-    const PROPERTY_TYPE_DATE = 'd';
-    const PROPERTY_TYPE_STRING = 's';
-    const PROPERTY_TYPE_UNKNOWN = 'u';
+    public const PROPERTY_TYPE_BOOLEAN = 'b';
+    public const PROPERTY_TYPE_INTEGER = 'i';
+    public const PROPERTY_TYPE_FLOAT = 'f';
+    public const PROPERTY_TYPE_DATE = 'd';
+    public const PROPERTY_TYPE_STRING = 's';
+    public const PROPERTY_TYPE_UNKNOWN = 'u';
+
+    private const VALID_PROPERTY_TYPE_LIST = [
+        self::PROPERTY_TYPE_BOOLEAN,
+        self::PROPERTY_TYPE_INTEGER,
+        self::PROPERTY_TYPE_FLOAT,
+        self::PROPERTY_TYPE_DATE,
+        self::PROPERTY_TYPE_STRING,
+    ];
 
     /**
      * Creator.
@@ -29,14 +40,14 @@ class Properties
     /**
      * Created.
      *
-     * @var int
+     * @var float|int
      */
     private $created;
 
     /**
      * Modified.
      *
-     * @var int
+     * @var float|int
      */
     private $modified;
 
@@ -87,15 +98,17 @@ class Properties
      *
      * @var string
      */
-    private $company = 'Microsoft Corporation';
+    private $company = '';
 
     /**
      * Custom Properties.
      *
-     * @var string
+     * @var array{value: mixed, type: string}[]
      */
     private $customProperties = [];
 
+    private string $hyperlinkBase = '';
+
     /**
      * Create a new Document Properties instance.
      */
@@ -103,16 +116,14 @@ class Properties
     {
         // Initialise values
         $this->lastModifiedBy = $this->creator;
-        $this->created = time();
-        $this->modified = time();
+        $this->created = self::intOrFloatTimestamp(null);
+        $this->modified = $this->created;
     }
 
     /**
      * Get Creator.
-     *
-     * @return string
      */
-    public function getCreator()
+    public function getCreator(): string
     {
         return $this->creator;
     }
@@ -120,11 +131,9 @@ class Properties
     /**
      * Set Creator.
      *
-     * @param string $creator
-     *
      * @return $this
      */
-    public function setCreator($creator)
+    public function setCreator(string $creator): self
     {
         $this->creator = $creator;
 
@@ -133,10 +142,8 @@ class Properties
 
     /**
      * Get Last Modified By.
-     *
-     * @return string
      */
-    public function getLastModifiedBy()
+    public function getLastModifiedBy(): string
     {
         return $this->lastModifiedBy;
     }
@@ -144,21 +151,42 @@ class Properties
     /**
      * Set Last Modified By.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setLastModifiedBy($pValue)
+    public function setLastModifiedBy(string $modifiedBy): self
     {
-        $this->lastModifiedBy = $pValue;
+        $this->lastModifiedBy = $modifiedBy;
 
         return $this;
     }
 
+    /**
+     * @param null|float|int|string $timestamp
+     *
+     * @return float|int
+     */
+    private static function intOrFloatTimestamp($timestamp)
+    {
+        if ($timestamp === null) {
+            $timestamp = (float) (new DateTime())->format('U');
+        } elseif (is_string($timestamp)) {
+            if (is_numeric($timestamp)) {
+                $timestamp = (float) $timestamp;
+            } else {
+                $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');
+            }
+        }
+
+        return IntOrFloat::evaluate($timestamp);
+    }
+
     /**
      * Get Created.
      *
-     * @return int
+     * @return float|int
      */
     public function getCreated()
     {
@@ -168,23 +196,13 @@ class Properties
     /**
      * Set Created.
      *
-     * @param int|string $time
+     * @param null|float|int|string $timestamp
      *
      * @return $this
      */
-    public function setCreated($time)
+    public function setCreated($timestamp): self
     {
-        if ($time === null) {
-            $time = time();
-        } elseif (is_string($time)) {
-            if (is_numeric($time)) {
-                $time = (int) $time;
-            } else {
-                $time = strtotime($time);
-            }
-        }
-
-        $this->created = $time;
+        $this->created = self::intOrFloatTimestamp($timestamp);
 
         return $this;
     }
@@ -192,7 +210,7 @@ class Properties
     /**
      * Get Modified.
      *
-     * @return int
+     * @return float|int
      */
     public function getModified()
     {
@@ -202,33 +220,21 @@ class Properties
     /**
      * Set Modified.
      *
-     * @param int|string $time
+     * @param null|float|int|string $timestamp
      *
      * @return $this
      */
-    public function setModified($time)
+    public function setModified($timestamp): self
     {
-        if ($time === null) {
-            $time = time();
-        } elseif (is_string($time)) {
-            if (is_numeric($time)) {
-                $time = (int) $time;
-            } else {
-                $time = strtotime($time);
-            }
-        }
-
-        $this->modified = $time;
+        $this->modified = self::intOrFloatTimestamp($timestamp);
 
         return $this;
     }
 
     /**
      * Get Title.
-     *
-     * @return string
      */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
@@ -236,11 +242,9 @@ class Properties
     /**
      * Set Title.
      *
-     * @param string $title
-     *
      * @return $this
      */
-    public function setTitle($title)
+    public function setTitle(string $title): self
     {
         $this->title = $title;
 
@@ -249,10 +253,8 @@ class Properties
 
     /**
      * Get Description.
-     *
-     * @return string
      */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->description;
     }
@@ -260,11 +262,9 @@ class Properties
     /**
      * Set Description.
      *
-     * @param string $description
-     *
      * @return $this
      */
-    public function setDescription($description)
+    public function setDescription(string $description): self
     {
         $this->description = $description;
 
@@ -273,10 +273,8 @@ class Properties
 
     /**
      * Get Subject.
-     *
-     * @return string
      */
-    public function getSubject()
+    public function getSubject(): string
     {
         return $this->subject;
     }
@@ -284,11 +282,9 @@ class Properties
     /**
      * Set Subject.
      *
-     * @param string $subject
-     *
      * @return $this
      */
-    public function setSubject($subject)
+    public function setSubject(string $subject): self
     {
         $this->subject = $subject;
 
@@ -297,10 +293,8 @@ class Properties
 
     /**
      * Get Keywords.
-     *
-     * @return string
      */
-    public function getKeywords()
+    public function getKeywords(): string
     {
         return $this->keywords;
     }
@@ -308,11 +302,9 @@ class Properties
     /**
      * Set Keywords.
      *
-     * @param string $keywords
-     *
      * @return $this
      */
-    public function setKeywords($keywords)
+    public function setKeywords(string $keywords): self
     {
         $this->keywords = $keywords;
 
@@ -321,10 +313,8 @@ class Properties
 
     /**
      * Get Category.
-     *
-     * @return string
      */
-    public function getCategory()
+    public function getCategory(): string
     {
         return $this->category;
     }
@@ -332,11 +322,9 @@ class Properties
     /**
      * Set Category.
      *
-     * @param string $category
-     *
      * @return $this
      */
-    public function setCategory($category)
+    public function setCategory(string $category): self
     {
         $this->category = $category;
 
@@ -345,10 +333,8 @@ class Properties
 
     /**
      * Get Company.
-     *
-     * @return string
      */
-    public function getCompany()
+    public function getCompany(): string
     {
         return $this->company;
     }
@@ -356,11 +342,9 @@ class Properties
     /**
      * Set Company.
      *
-     * @param string $company
-     *
      * @return $this
      */
-    public function setCompany($company)
+    public function setCompany(string $company): self
     {
         $this->company = $company;
 
@@ -369,10 +353,8 @@ class Properties
 
     /**
      * Get Manager.
-     *
-     * @return string
      */
-    public function getManager()
+    public function getManager(): string
     {
         return $this->manager;
     }
@@ -380,11 +362,9 @@ class Properties
     /**
      * Set Manager.
      *
-     * @param string $manager
-     *
      * @return $this
      */
-    public function setManager($manager)
+    public function setManager(string $manager): self
     {
         $this->manager = $manager;
 
@@ -394,60 +374,69 @@ class Properties
     /**
      * Get a List of Custom Property Names.
      *
-     * @return array of string
+     * @return string[]
      */
-    public function getCustomProperties()
+    public function getCustomProperties(): array
     {
         return array_keys($this->customProperties);
     }
 
     /**
      * Check if a Custom Property is defined.
-     *
-     * @param string $propertyName
-     *
-     * @return bool
      */
-    public function isCustomPropertySet($propertyName)
+    public function isCustomPropertySet(string $propertyName): bool
     {
-        return isset($this->customProperties[$propertyName]);
+        return array_key_exists($propertyName, $this->customProperties);
     }
 
     /**
      * Get a Custom Property Value.
      *
-     * @param string $propertyName
-     *
      * @return mixed
      */
-    public function getCustomPropertyValue($propertyName)
+    public function getCustomPropertyValue(string $propertyName)
     {
         if (isset($this->customProperties[$propertyName])) {
             return $this->customProperties[$propertyName]['value'];
         }
+
+        return null;
     }
 
     /**
      * Get a Custom Property Type.
      *
-     * @param string $propertyName
-     *
-     * @return string
+     * @return null|string
      */
-    public function getCustomPropertyType($propertyName)
+    public function getCustomPropertyType(string $propertyName)
     {
-        if (isset($this->customProperties[$propertyName])) {
-            return $this->customProperties[$propertyName]['type'];
+        return $this->customProperties[$propertyName]['type'] ?? null;
+    }
+
+    /**
+     * @param mixed $propertyValue
+     */
+    private function identifyPropertyType($propertyValue): string
+    {
+        if (is_float($propertyValue)) {
+            return self::PROPERTY_TYPE_FLOAT;
         }
+        if (is_int($propertyValue)) {
+            return self::PROPERTY_TYPE_INTEGER;
+        }
+        if (is_bool($propertyValue)) {
+            return self::PROPERTY_TYPE_BOOLEAN;
+        }
+
+        return self::PROPERTY_TYPE_STRING;
     }
 
     /**
      * Set a Custom Property.
      *
-     * @param string $propertyName
      * @param mixed $propertyValue
      * @param string $propertyType
-     *      'i'    : Integer
+     *   'i' : Integer
      *   'f' : Floating Point
      *   's' : String
      *   'd' : Date/Time
@@ -455,175 +444,108 @@ class Properties
      *
      * @return $this
      */
-    public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
+    public function setCustomProperty(string $propertyName, $propertyValue = '', $propertyType = null): self
     {
-        if (($propertyType === null) || (!in_array($propertyType, [self::PROPERTY_TYPE_INTEGER,
-                                                                        self::PROPERTY_TYPE_FLOAT,
-                                                                        self::PROPERTY_TYPE_STRING,
-                                                                        self::PROPERTY_TYPE_DATE,
-                                                                        self::PROPERTY_TYPE_BOOLEAN, ]))) {
-            if ($propertyValue === null) {
-                $propertyType = self::PROPERTY_TYPE_STRING;
-            } elseif (is_float($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_FLOAT;
-            } elseif (is_int($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_INTEGER;
-            } elseif (is_bool($propertyValue)) {
-                $propertyType = self::PROPERTY_TYPE_BOOLEAN;
-            } else {
-                $propertyType = self::PROPERTY_TYPE_STRING;
-            }
+        if (($propertyType === null) || (!in_array($propertyType, self::VALID_PROPERTY_TYPE_LIST))) {
+            $propertyType = $this->identifyPropertyType($propertyValue);
         }
 
-        $this->customProperties[$propertyName] = [
-            'value' => $propertyValue,
-            'type' => $propertyType,
-        ];
+        if (!is_object($propertyValue)) {
+            $this->customProperties[$propertyName] = [
+                'value' => self::convertProperty($propertyValue, $propertyType),
+                'type' => $propertyType,
+            ];
+        }
 
         return $this;
     }
 
+    private const PROPERTY_TYPE_ARRAY = [
+        'i' => self::PROPERTY_TYPE_INTEGER,      //    Integer
+        'i1' => self::PROPERTY_TYPE_INTEGER,     //    1-Byte Signed Integer
+        'i2' => self::PROPERTY_TYPE_INTEGER,     //    2-Byte Signed Integer
+        'i4' => self::PROPERTY_TYPE_INTEGER,     //    4-Byte Signed Integer
+        'i8' => self::PROPERTY_TYPE_INTEGER,     //    8-Byte Signed Integer
+        'int' => self::PROPERTY_TYPE_INTEGER,    //    Integer
+        'ui1' => self::PROPERTY_TYPE_INTEGER,    //    1-Byte Unsigned Integer
+        'ui2' => self::PROPERTY_TYPE_INTEGER,    //    2-Byte Unsigned Integer
+        'ui4' => self::PROPERTY_TYPE_INTEGER,    //    4-Byte Unsigned Integer
+        'ui8' => self::PROPERTY_TYPE_INTEGER,    //    8-Byte Unsigned Integer
+        'uint' => self::PROPERTY_TYPE_INTEGER,   //    Unsigned Integer
+        'f' => self::PROPERTY_TYPE_FLOAT,        //    Real Number
+        'r4' => self::PROPERTY_TYPE_FLOAT,       //    4-Byte Real Number
+        'r8' => self::PROPERTY_TYPE_FLOAT,       //    8-Byte Real Number
+        'decimal' => self::PROPERTY_TYPE_FLOAT,  //    Decimal
+        's' => self::PROPERTY_TYPE_STRING,       //    String
+        'empty' => self::PROPERTY_TYPE_STRING,   //    Empty
+        'null' => self::PROPERTY_TYPE_STRING,    //    Null
+        'lpstr' => self::PROPERTY_TYPE_STRING,   //    LPSTR
+        'lpwstr' => self::PROPERTY_TYPE_STRING,  //    LPWSTR
+        'bstr' => self::PROPERTY_TYPE_STRING,    //    Basic String
+        'd' => self::PROPERTY_TYPE_DATE,         //    Date and Time
+        'date' => self::PROPERTY_TYPE_DATE,      //    Date and Time
+        'filetime' => self::PROPERTY_TYPE_DATE,  //    File Time
+        'b' => self::PROPERTY_TYPE_BOOLEAN,      //    Boolean
+        'bool' => self::PROPERTY_TYPE_BOOLEAN,   //    Boolean
+    ];
+
+    private const SPECIAL_TYPES = [
+        'empty' => '',
+        'null' => null,
+    ];
+
     /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * Convert property to form desired by Excel.
+     *
+     * @param mixed $propertyValue
+     *
+     * @return mixed
      */
-    public function __clone()
+    public static function convertProperty($propertyValue, string $propertyType)
     {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
+        return self::SPECIAL_TYPES[$propertyType] ?? self::convertProperty2($propertyValue, $propertyType);
     }
 
-    public static function convertProperty($propertyValue, $propertyType)
+    /**
+     * Convert property to form desired by Excel.
+     *
+     * @param mixed $propertyValue
+     *
+     * @return mixed
+     */
+    private static function convertProperty2($propertyValue, string $type)
     {
+        $propertyType = self::convertPropertyType($type);
         switch ($propertyType) {
-            case 'empty':     //    Empty
-                return '';
+            case self::PROPERTY_TYPE_INTEGER:
+                $intValue = (int) $propertyValue;
 
-                break;
-            case 'null':      //    Null
-                return null;
-
-                break;
-            case 'i1':        //    1-Byte Signed Integer
-            case 'i2':        //    2-Byte Signed Integer
-            case 'i4':        //    4-Byte Signed Integer
-            case 'i8':        //    8-Byte Signed Integer
-            case 'int':       //    Integer
-                return (int) $propertyValue;
-
-                break;
-            case 'ui1':       //    1-Byte Unsigned Integer
-            case 'ui2':       //    2-Byte Unsigned Integer
-            case 'ui4':       //    4-Byte Unsigned Integer
-            case 'ui8':       //    8-Byte Unsigned Integer
-            case 'uint':      //    Unsigned Integer
-                return abs((int) $propertyValue);
-
-                break;
-            case 'r4':        //    4-Byte Real Number
-            case 'r8':        //    8-Byte Real Number
-            case 'decimal':   //    Decimal
+                return ($type[0] === 'u') ? abs($intValue) : $intValue;
+            case self::PROPERTY_TYPE_FLOAT:
                 return (float) $propertyValue;
-
-                break;
-            case 'lpstr':     //    LPSTR
-            case 'lpwstr':    //    LPWSTR
-            case 'bstr':      //    Basic String
+            case self::PROPERTY_TYPE_DATE:
+                return self::intOrFloatTimestamp($propertyValue);
+            case self::PROPERTY_TYPE_BOOLEAN:
+                return is_bool($propertyValue) ? $propertyValue : ($propertyValue === 'true');
+            default: // includes string
                 return $propertyValue;
-
-                break;
-            case 'date':      //    Date and Time
-            case 'filetime':  //    File Time
-                return strtotime($propertyValue);
-
-                break;
-            case 'bool':     //    Boolean
-                return $propertyValue == 'true';
-
-                break;
-            case 'cy':       //    Currency
-            case 'error':    //    Error Status Code
-            case 'vector':   //    Vector
-            case 'array':    //    Array
-            case 'blob':     //    Binary Blob
-            case 'oblob':    //    Binary Blob Object
-            case 'stream':   //    Binary Stream
-            case 'ostream':  //    Binary Stream Object
-            case 'storage':  //    Binary Storage
-            case 'ostorage': //    Binary Storage Object
-            case 'vstream':  //    Binary Versioned Stream
-            case 'clsid':    //    Class ID
-            case 'cf':       //    Clipboard Data
-                return $propertyValue;
-
-                break;
         }
-
-        return $propertyValue;
     }
 
-    public static function convertPropertyType($propertyType)
+    public static function convertPropertyType(string $propertyType): string
     {
-        switch ($propertyType) {
-            case 'i1':       //    1-Byte Signed Integer
-            case 'i2':       //    2-Byte Signed Integer
-            case 'i4':       //    4-Byte Signed Integer
-            case 'i8':       //    8-Byte Signed Integer
-            case 'int':      //    Integer
-            case 'ui1':      //    1-Byte Unsigned Integer
-            case 'ui2':      //    2-Byte Unsigned Integer
-            case 'ui4':      //    4-Byte Unsigned Integer
-            case 'ui8':      //    8-Byte Unsigned Integer
-            case 'uint':     //    Unsigned Integer
-                return self::PROPERTY_TYPE_INTEGER;
+        return self::PROPERTY_TYPE_ARRAY[$propertyType] ?? self::PROPERTY_TYPE_UNKNOWN;
+    }
 
-                break;
-            case 'r4':       //    4-Byte Real Number
-            case 'r8':       //    8-Byte Real Number
-            case 'decimal':  //    Decimal
-                return self::PROPERTY_TYPE_FLOAT;
+    public function getHyperlinkBase(): string
+    {
+        return $this->hyperlinkBase;
+    }
 
-                break;
-            case 'empty':    //    Empty
-            case 'null':     //    Null
-            case 'lpstr':    //    LPSTR
-            case 'lpwstr':   //    LPWSTR
-            case 'bstr':     //    Basic String
-                return self::PROPERTY_TYPE_STRING;
+    public function setHyperlinkBase(string $hyperlinkBase): self
+    {
+        $this->hyperlinkBase = $hyperlinkBase;
 
-                break;
-            case 'date':     //    Date and Time
-            case 'filetime': //    File Time
-                return self::PROPERTY_TYPE_DATE;
-
-                break;
-            case 'bool':     //    Boolean
-                return self::PROPERTY_TYPE_BOOLEAN;
-
-                break;
-            case 'cy':       //    Currency
-            case 'error':    //    Error Status Code
-            case 'vector':   //    Vector
-            case 'array':    //    Array
-            case 'blob':     //    Binary Blob
-            case 'oblob':    //    Binary Blob Object
-            case 'stream':   //    Binary Stream
-            case 'ostream':  //    Binary Stream Object
-            case 'storage':  //    Binary Storage
-            case 'ostorage': //    Binary Storage Object
-            case 'vstream':  //    Binary Versioned Stream
-            case 'clsid':    //    Class ID
-            case 'cf':       //    Clipboard Data
-                return self::PROPERTY_TYPE_UNKNOWN;
-
-                break;
-        }
-
-        return self::PROPERTY_TYPE_UNKNOWN;
+        return $this;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
index cef3db8c4..279aed437 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
@@ -50,94 +50,57 @@ class Security
 
     /**
      * Is some sort of document security enabled?
-     *
-     * @return bool
      */
-    public function isSecurityEnabled()
+    public function isSecurityEnabled(): bool
     {
         return  $this->lockRevision ||
                 $this->lockStructure ||
                 $this->lockWindows;
     }
 
-    /**
-     * Get LockRevision.
-     *
-     * @return bool
-     */
-    public function getLockRevision()
+    public function getLockRevision(): bool
     {
         return $this->lockRevision;
     }
 
-    /**
-     * Set LockRevision.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setLockRevision($pValue)
+    public function setLockRevision(?bool $locked): self
     {
-        $this->lockRevision = $pValue;
+        if ($locked !== null) {
+            $this->lockRevision = $locked;
+        }
 
         return $this;
     }
 
-    /**
-     * Get LockStructure.
-     *
-     * @return bool
-     */
-    public function getLockStructure()
+    public function getLockStructure(): bool
     {
         return $this->lockStructure;
     }
 
-    /**
-     * Set LockStructure.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setLockStructure($pValue)
+    public function setLockStructure(?bool $locked): self
     {
-        $this->lockStructure = $pValue;
+        if ($locked !== null) {
+            $this->lockStructure = $locked;
+        }
 
         return $this;
     }
 
-    /**
-     * Get LockWindows.
-     *
-     * @return bool
-     */
-    public function getLockWindows()
+    public function getLockWindows(): bool
     {
         return $this->lockWindows;
     }
 
-    /**
-     * Set LockWindows.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setLockWindows($pValue)
+    public function setLockWindows(?bool $locked): self
     {
-        $this->lockWindows = $pValue;
+        if ($locked !== null) {
+            $this->lockWindows = $locked;
+        }
 
         return $this;
     }
 
-    /**
-     * Get RevisionsPassword (hashed).
-     *
-     * @return string
-     */
-    public function getRevisionsPassword()
+    public function getRevisionsPassword(): string
     {
         return $this->revisionsPassword;
     }
@@ -145,27 +108,24 @@ class Security
     /**
      * Set RevisionsPassword.
      *
-     * @param string $pValue
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
+     * @param string $password
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
      *
      * @return $this
      */
-    public function setRevisionsPassword($pValue, $pAlreadyHashed = false)
+    public function setRevisionsPassword(?string $password, bool $alreadyHashed = false)
     {
-        if (!$pAlreadyHashed) {
-            $pValue = PasswordHasher::hashPassword($pValue);
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
+            }
+            $this->revisionsPassword = $password;
         }
-        $this->revisionsPassword = $pValue;
 
         return $this;
     }
 
-    /**
-     * Get WorkbookPassword (hashed).
-     *
-     * @return string
-     */
-    public function getWorkbookPassword()
+    public function getWorkbookPassword(): string
     {
         return $this->workbookPassword;
     }
@@ -173,33 +133,20 @@ class Security
     /**
      * Set WorkbookPassword.
      *
-     * @param string $pValue
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
+     * @param string $password
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
      *
      * @return $this
      */
-    public function setWorkbookPassword($pValue, $pAlreadyHashed = false)
+    public function setWorkbookPassword(?string $password, bool $alreadyHashed = false)
     {
-        if (!$pAlreadyHashed) {
-            $pValue = PasswordHasher::hashPassword($pValue);
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
+            }
+            $this->workbookPassword = $password;
         }
-        $this->workbookPassword = $pValue;
 
         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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
index 4e8f0a5c9..6de7d0305 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
@@ -2,52 +2,51 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+/**
+ * @template T of IComparable
+ */
 class HashTable
 {
     /**
      * HashTable elements.
      *
-     * @var IComparable[]
+     * @var array<string, T>
      */
     protected $items = [];
 
     /**
      * HashTable key map.
      *
-     * @var string[]
+     * @var array<int, string>
      */
     protected $keyMap = [];
 
     /**
-     * Create a new \PhpOffice\PhpSpreadsheet\HashTable.
+     * Create a new HashTable.
      *
-     * @param IComparable[] $pSource Optional source array to create HashTable from
-     *
-     * @throws Exception
+     * @param T[] $source Optional source array to create HashTable from
      */
-    public function __construct($pSource = null)
+    public function __construct($source = null)
     {
-        if ($pSource !== null) {
+        if ($source !== null) {
             // Create HashTable
-            $this->addFromSource($pSource);
+            $this->addFromSource($source);
         }
     }
 
     /**
      * Add HashTable items from source.
      *
-     * @param IComparable[] $pSource Source array to create HashTable from
-     *
-     * @throws Exception
+     * @param T[] $source Source array to create HashTable from
      */
-    public function addFromSource(array $pSource = null)
+    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);
         }
     }
@@ -55,13 +54,13 @@ class HashTable
     /**
      * Add HashTable item.
      *
-     * @param IComparable $pSource Item to add
+     * @param T $source Item to add
      */
-    public function add(IComparable $pSource)
+    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;
         }
     }
@@ -69,11 +68,11 @@ class HashTable
     /**
      * Remove HashTable item.
      *
-     * @param IComparable $pSource Item to remove
+     * @param T $source Item to remove
      */
-    public function remove(IComparable $pSource)
+    public function remove(IComparable $source): void
     {
-        $hash = $pSource->getHashCode();
+        $hash = $source->getHashCode();
         if (isset($this->items[$hash])) {
             unset($this->items[$hash]);
 
@@ -94,7 +93,7 @@ class HashTable
     /**
      * Clear HashTable.
      */
-    public function clear()
+    public function clear(): void
     {
         $this->items = [];
         $this->keyMap = [];
@@ -113,26 +112,23 @@ class HashTable
     /**
      * Get index for hash code.
      *
-     * @param string $pHashCode
-     *
-     * @return int Index
+     * @return false|int Index
      */
-    public function getIndexForHashCode($pHashCode)
+    public function getIndexForHashCode(string $hashCode)
     {
-        return array_search($pHashCode, $this->keyMap);
+        // Scrutinizer thinks the following could return string. It is wrong.
+        return array_search($hashCode, $this->keyMap, true);
     }
 
     /**
      * Get by index.
      *
-     * @param int $pIndex
-     *
-     * @return IComparable
+     * @return null|T
      */
-    public function getByIndex($pIndex)
+    public function getByIndex(int $index)
     {
-        if (isset($this->keyMap[$pIndex])) {
-            return $this->getByHashCode($this->keyMap[$pIndex]);
+        if (isset($this->keyMap[$index])) {
+            return $this->getByHashCode($this->keyMap[$index]);
         }
 
         return null;
@@ -141,14 +137,12 @@ class HashTable
     /**
      * Get by hashcode.
      *
-     * @param string $pHashCode
-     *
-     * @return IComparable
+     * @return null|T
      */
-    public function getByHashCode($pHashCode)
+    public function getByHashCode(string $hashCode)
     {
-        if (isset($this->items[$pHashCode])) {
-            return $this->items[$pHashCode];
+        if (isset($this->items[$hashCode])) {
+            return $this->items[$hashCode];
         }
 
         return null;
@@ -157,7 +151,7 @@ class HashTable
     /**
      * HashTable to array.
      *
-     * @return IComparable[]
+     * @return T[]
      */
     public function toArray()
     {
@@ -171,8 +165,15 @@ class HashTable
     {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
+            // each member of this class is an array
+            if (is_array($value)) {
+                $array1 = $value;
+                foreach ($array1 as $key1 => $value1) {
+                    if (is_object($value1)) {
+                        $array1[$key1] = clone $value1;
+                    }
+                }
+                $this->$key = $array1;
             }
         }
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
new file mode 100644
index 000000000..ff07ce5b8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
@@ -0,0 +1,115 @@
+<?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 $size;
+
+    /**
+     * @var null|string
+     */
+    protected $unit;
+
+    /**
+     * Phpstan bug has been fixed; this function allows us to
+     * pass Phpstan whether fixed or not.
+     *
+     * @param mixed $value
+     */
+    private static function stanBugFixed($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
new file mode 100644
index 000000000..e66ae4258
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+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
+    {
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
new file mode 100644
index 000000000..d05197cef
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class Handler
+{
+    /** @var string */
+    private static $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
index eaf73028f..89c28dffa 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
@@ -12,7 +12,7 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 
 class Html
 {
-    protected static $colourMap = [
+    private const COLOUR_MAP = [
         'aliceblue' => 'f0f8ff',
         'antiquewhite' => 'faebd7',
         'antiquewhite1' => 'ffefdb',
@@ -532,25 +532,34 @@ class Html
         'yellowgreen' => '9acd32',
     ];
 
-    protected $face;
+    /** @var ?string */
+    private $face;
 
-    protected $size;
+    /** @var ?string */
+    private $size;
 
-    protected $color;
+    /** @var ?string */
+    private $color;
 
-    protected $bold = false;
+    /** @var bool */
+    private $bold = false;
 
-    protected $italic = false;
+    /** @var bool */
+    private $italic = false;
 
-    protected $underline = false;
+    /** @var bool */
+    private $underline = false;
 
-    protected $superscript = false;
+    /** @var bool */
+    private $superscript = false;
 
-    protected $subscript = false;
+    /** @var bool */
+    private $subscript = false;
 
-    protected $strikethrough = false;
+    /** @var bool */
+    private $strikethrough = false;
 
-    protected $startTagCallbacks = [
+    private const START_TAG_CALLBACKS = [
         'font' => 'startFontTag',
         'b' => 'startBoldTag',
         'strong' => 'startBoldTag',
@@ -563,7 +572,7 @@ class Html
         'sub' => 'startSubscriptTag',
     ];
 
-    protected $endTagCallbacks = [
+    private const END_TAG_CALLBACKS = [
         'font' => 'endFontTag',
         'b' => 'endBoldTag',
         'strong' => 'endBoldTag',
@@ -584,16 +593,18 @@ class Html
         'h6' => 'breakTag',
     ];
 
-    protected $stack = [];
+    /** @var array */
+    private $stack = [];
 
-    protected $stringData = '';
+    /** @var string */
+    private $stringData = '';
 
     /**
      * @var RichText
      */
-    protected $richTextObject;
+    private $richTextObject;
 
-    protected function initialise()
+    private function initialise(): void
     {
         $this->face = $this->size = $this->color = null;
         $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
@@ -619,6 +630,7 @@ class Html
         //    Load the HTML file into the DOM object
         //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
         $prefix = '<?xml encoding="UTF-8">';
+        /** @scrutinizer ignore-unhandled */
         @$dom->loadHTML($prefix . $html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         //    Discard excess white space
         $dom->preserveWhiteSpace = false;
@@ -632,7 +644,7 @@ class Html
         return $this->richTextObject;
     }
 
-    protected function cleanWhitespace()
+    private function cleanWhitespace(): void
     {
         foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
             $text = $element->getText();
@@ -641,12 +653,12 @@ class Html
                 $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()
+    private function buildTextRun(): void
     {
         $text = $this->stringData;
         if (trim($text) === '') {
@@ -654,181 +666,187 @@ class Html
         }
 
         $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);
         }
 
-        return implode($values[0]);
+        return implode('', $values[0]);
     }
 
-    protected function colourNameLookup($rgb)
+    public static function colourNameLookup(string $colorName): string
     {
-        return self::$colourMap[$rgb];
+        return self::COLOUR_MAP[$colorName] ?? '';
     }
 
-    protected function startFontTag($tag)
+    protected function startFontTag(DOMElement $tag): void
     {
-        foreach ($tag->attributes as $attribute) {
-            $attributeName = strtolower($attribute->name);
-            $attributeValue = $attribute->value;
+        $attrs = $tag->attributes;
+        if ($attrs !== null) {
+            foreach ($attrs 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, '#');
+                if ($attributeName == 'color') {
+                    if (preg_match('/rgb\s*\(/', $attributeValue)) {
+                        $this->$attributeName = $this->rgbToColour($attributeValue);
+                    } elseif (strpos(trim($attributeValue), '#') === 0) {
+                        $this->$attributeName = ltrim($attributeValue, '#');
+                    } else {
+                        $this->$attributeName = static::colourNameLookup($attributeValue);
+                    }
                 } else {
-                    $this->$attributeName = $this->colourNameLookup($attributeValue);
+                    $this->$attributeName = $attributeValue;
                 }
-            } else {
-                $this->$attributeName = $attributeValue;
             }
         }
     }
 
-    protected function endFontTag()
+    protected function endFontTag(): void
     {
         $this->face = $this->size = $this->color = null;
     }
 
-    protected function startBoldTag()
+    protected function startBoldTag(): void
     {
         $this->bold = true;
     }
 
-    protected function endBoldTag()
+    protected function endBoldTag(): void
     {
         $this->bold = false;
     }
 
-    protected function startItalicTag()
+    protected function startItalicTag(): void
     {
         $this->italic = true;
     }
 
-    protected function endItalicTag()
+    protected function endItalicTag(): void
     {
         $this->italic = false;
     }
 
-    protected function startUnderlineTag()
+    protected function startUnderlineTag(): void
     {
         $this->underline = true;
     }
 
-    protected function endUnderlineTag()
+    protected function endUnderlineTag(): void
     {
         $this->underline = false;
     }
 
-    protected function startSubscriptTag()
+    protected function startSubscriptTag(): void
     {
         $this->subscript = true;
     }
 
-    protected function endSubscriptTag()
+    protected function endSubscriptTag(): void
     {
         $this->subscript = false;
     }
 
-    protected function startSuperscriptTag()
+    protected function startSuperscriptTag(): void
     {
         $this->superscript = true;
     }
 
-    protected function endSuperscriptTag()
+    protected function endSuperscriptTag(): void
     {
         $this->superscript = false;
     }
 
-    protected function startStrikethruTag()
+    protected function startStrikethruTag(): void
     {
         $this->strikethrough = true;
     }
 
-    protected function endStrikethruTag()
+    protected function endStrikethruTag(): void
     {
         $this->strikethrough = false;
     }
 
-    protected function breakTag()
+    protected function breakTag(): void
     {
         $this->stringData .= "\n";
     }
 
-    protected function parseTextNode(DOMText $textNode)
+    private function parseTextNode(DOMText $textNode): void
     {
-        $domText = preg_replace(
+        $domText = (string) preg_replace(
             '/\s+/u',
             ' ',
-            str_replace(["\r", "\n"], ' ', $textNode->nodeValue)
+            str_replace(["\r", "\n"], ' ', $textNode->nodeValue ?? '')
         );
         $this->stringData .= $domText;
         $this->buildTextRun();
     }
 
     /**
-     * @param DOMElement $element
      * @param string $callbackTag
-     * @param array $callbacks
      */
-    protected function handleCallback(DOMElement $element, $callbackTag, array $callbacks)
+    private function handleCallback(DOMElement $element, $callbackTag, array $callbacks): void
     {
         if (isset($callbacks[$callbackTag])) {
             $elementHandler = $callbacks[$callbackTag];
             if (method_exists($this, $elementHandler)) {
-                call_user_func([$this, $elementHandler], $element);
+                /** @var callable */
+                $callable = [$this, $elementHandler];
+                call_user_func($callable, $element);
             }
         }
     }
 
-    protected function parseElementNode(DOMElement $element)
+    private function parseElementNode(DOMElement $element): void
     {
         $callbackTag = strtolower($element->nodeName);
         $this->stack[] = $callbackTag;
 
-        $this->handleCallback($element, $callbackTag, $this->startTagCallbacks);
+        $this->handleCallback($element, $callbackTag, self::START_TAG_CALLBACKS);
 
         $this->parseElements($element);
         array_pop($this->stack);
 
-        $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
+        $this->handleCallback($element, $callbackTag, self::END_TAG_CALLBACKS);
     }
 
-    protected function parseElements(DOMNode $element)
+    private function parseElements(DOMNode $element): void
     {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Migrator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Migrator.php
deleted file mode 100644
index 26d5fcead..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Migrator.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Helper;
-
-class Migrator
-{
-    /**
-     * @var string[]
-     */
-    private $from;
-
-    /**
-     * @var string[]
-     */
-    private $to;
-
-    public function __construct()
-    {
-        $this->from = array_keys($this->getMapping());
-        $this->to = array_values($this->getMapping());
-    }
-
-    /**
-     * Return the ordered mapping from old PHPExcel class names to new PhpSpreadsheet one.
-     *
-     * @return string[]
-     */
-    public function getMapping()
-    {
-        // Order matters here, we should have the deepest namespaces first (the most "unique" strings)
-        $classes = [
-            'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip::class,
-            'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer::class,
-            'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE::class,
-            'PHPExcel_Shared_Escher_DgContainer_SpgrContainer' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer::class,
-            'PHPExcel_Shared_Escher_DggContainer_BstoreContainer' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer::class,
-            'PHPExcel_Shared_OLE_PPS_File' => \PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\File::class,
-            'PHPExcel_Shared_OLE_PPS_Root' => \PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\Root::class,
-            'PHPExcel_Worksheet_AutoFilter_Column_Rule' => \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::class,
-            'PHPExcel_Writer_OpenDocument_Cell_Comment' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment::class,
-            'PHPExcel_Calculation_Token_Stack' => \PhpOffice\PhpSpreadsheet\Calculation\Token\Stack::class,
-            'PHPExcel_Chart_Renderer_jpgraph' => \PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class,
-            'PHPExcel_Reader_Excel5_Escher' => \PhpOffice\PhpSpreadsheet\Reader\Xls\Escher::class,
-            'PHPExcel_Reader_Excel5_MD5' => \PhpOffice\PhpSpreadsheet\Reader\Xls\MD5::class,
-            'PHPExcel_Reader_Excel5_RC4' => \PhpOffice\PhpSpreadsheet\Reader\Xls\RC4::class,
-            'PHPExcel_Reader_Excel2007_Chart' => \PhpOffice\PhpSpreadsheet\Reader\Xlsx\Chart::class,
-            'PHPExcel_Reader_Excel2007_Theme' => \PhpOffice\PhpSpreadsheet\Reader\Xlsx\Theme::class,
-            'PHPExcel_Shared_Escher_DgContainer' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer::class,
-            'PHPExcel_Shared_Escher_DggContainer' => \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer::class,
-            'CholeskyDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\CholeskyDecomposition::class,
-            'EigenvalueDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\EigenvalueDecomposition::class,
-            'PHPExcel_Shared_JAMA_LUDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\LUDecomposition::class,
-            'PHPExcel_Shared_JAMA_Matrix' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\Matrix::class,
-            'QRDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\QRDecomposition::class,
-            'PHPExcel_Shared_JAMA_QRDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\QRDecomposition::class,
-            'SingularValueDecomposition' => \PhpOffice\PhpSpreadsheet\Shared\JAMA\SingularValueDecomposition::class,
-            'PHPExcel_Shared_OLE_ChainedBlockStream' => \PhpOffice\PhpSpreadsheet\Shared\OLE\ChainedBlockStream::class,
-            'PHPExcel_Shared_OLE_PPS' => \PhpOffice\PhpSpreadsheet\Shared\OLE\PPS::class,
-            'PHPExcel_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\BestFit::class,
-            'PHPExcel_Exponential_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\ExponentialBestFit::class,
-            'PHPExcel_Linear_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\LinearBestFit::class,
-            'PHPExcel_Logarithmic_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\LogarithmicBestFit::class,
-            'polynomialBestFit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\PolynomialBestFit::class,
-            'PHPExcel_Polynomial_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\PolynomialBestFit::class,
-            'powerBestFit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\PowerBestFit::class,
-            'PHPExcel_Power_Best_Fit' => \PhpOffice\PhpSpreadsheet\Shared\Trend\PowerBestFit::class,
-            'trendClass' => \PhpOffice\PhpSpreadsheet\Shared\Trend\Trend::class,
-            'PHPExcel_Worksheet_AutoFilter_Column' => \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::class,
-            'PHPExcel_Worksheet_Drawing_Shadow' => \PhpOffice\PhpSpreadsheet\Worksheet\Drawing\Shadow::class,
-            'PHPExcel_Writer_OpenDocument_Content' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Content::class,
-            'PHPExcel_Writer_OpenDocument_Meta' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Meta::class,
-            'PHPExcel_Writer_OpenDocument_MetaInf' => \PhpOffice\PhpSpreadsheet\Writer\Ods\MetaInf::class,
-            'PHPExcel_Writer_OpenDocument_Mimetype' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Mimetype::class,
-            'PHPExcel_Writer_OpenDocument_Settings' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Settings::class,
-            'PHPExcel_Writer_OpenDocument_Styles' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Styles::class,
-            'PHPExcel_Writer_OpenDocument_Thumbnails' => \PhpOffice\PhpSpreadsheet\Writer\Ods\Thumbnails::class,
-            'PHPExcel_Writer_OpenDocument_WriterPart' => \PhpOffice\PhpSpreadsheet\Writer\Ods\WriterPart::class,
-            'PHPExcel_Writer_PDF_Core' => \PhpOffice\PhpSpreadsheet\Writer\Pdf::class,
-            'PHPExcel_Writer_PDF_DomPDF' => \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class,
-            'PHPExcel_Writer_PDF_mPDF' => \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class,
-            'PHPExcel_Writer_PDF_tcPDF' => \PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf::class,
-            'PHPExcel_Writer_Excel5_BIFFwriter' => \PhpOffice\PhpSpreadsheet\Writer\Xls\BIFFwriter::class,
-            'PHPExcel_Writer_Excel5_Escher' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Escher::class,
-            'PHPExcel_Writer_Excel5_Font' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Font::class,
-            'PHPExcel_Writer_Excel5_Parser' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Parser::class,
-            'PHPExcel_Writer_Excel5_Workbook' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook::class,
-            'PHPExcel_Writer_Excel5_Worksheet' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Worksheet::class,
-            'PHPExcel_Writer_Excel5_Xf' => \PhpOffice\PhpSpreadsheet\Writer\Xls\Xf::class,
-            'PHPExcel_Writer_Excel2007_Chart' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Chart::class,
-            'PHPExcel_Writer_Excel2007_Comments' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Comments::class,
-            'PHPExcel_Writer_Excel2007_ContentTypes' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\ContentTypes::class,
-            'PHPExcel_Writer_Excel2007_DocProps' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\DocProps::class,
-            'PHPExcel_Writer_Excel2007_Drawing' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Drawing::class,
-            'PHPExcel_Writer_Excel2007_Rels' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Rels::class,
-            'PHPExcel_Writer_Excel2007_RelsRibbon' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsRibbon::class,
-            'PHPExcel_Writer_Excel2007_RelsVBA' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsVBA::class,
-            'PHPExcel_Writer_Excel2007_StringTable' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\StringTable::class,
-            'PHPExcel_Writer_Excel2007_Style' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Style::class,
-            'PHPExcel_Writer_Excel2007_Theme' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Theme::class,
-            'PHPExcel_Writer_Excel2007_Workbook' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Workbook::class,
-            'PHPExcel_Writer_Excel2007_Worksheet' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::class,
-            'PHPExcel_Writer_Excel2007_WriterPart' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx\WriterPart::class,
-            'PHPExcel_CachedObjectStorage_CacheBase' => \PhpOffice\PhpSpreadsheet\Collection\Cells::class,
-            'PHPExcel_CalcEngine_CyclicReferenceStack' => \PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack::class,
-            'PHPExcel_CalcEngine_Logger' => \PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger::class,
-            'PHPExcel_Calculation_Functions' => \PhpOffice\PhpSpreadsheet\Calculation\Functions::class,
-            'PHPExcel_Calculation_Function' => \PhpOffice\PhpSpreadsheet\Calculation\Category::class,
-            'PHPExcel_Calculation_Database' => \PhpOffice\PhpSpreadsheet\Calculation\Database::class,
-            'PHPExcel_Calculation_DateTime' => \PhpOffice\PhpSpreadsheet\Calculation\DateTime::class,
-            'PHPExcel_Calculation_Engineering' => \PhpOffice\PhpSpreadsheet\Calculation\Engineering::class,
-            'PHPExcel_Calculation_Exception' => \PhpOffice\PhpSpreadsheet\Calculation\Exception::class,
-            'PHPExcel_Calculation_ExceptionHandler' => \PhpOffice\PhpSpreadsheet\Calculation\ExceptionHandler::class,
-            'PHPExcel_Calculation_Financial' => \PhpOffice\PhpSpreadsheet\Calculation\Financial::class,
-            'PHPExcel_Calculation_FormulaParser' => \PhpOffice\PhpSpreadsheet\Calculation\FormulaParser::class,
-            'PHPExcel_Calculation_FormulaToken' => \PhpOffice\PhpSpreadsheet\Calculation\FormulaToken::class,
-            'PHPExcel_Calculation_Logical' => \PhpOffice\PhpSpreadsheet\Calculation\Logical::class,
-            'PHPExcel_Calculation_LookupRef' => \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::class,
-            'PHPExcel_Calculation_MathTrig' => \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::class,
-            'PHPExcel_Calculation_Statistical' => \PhpOffice\PhpSpreadsheet\Calculation\Statistical::class,
-            'PHPExcel_Calculation_TextData' => \PhpOffice\PhpSpreadsheet\Calculation\TextData::class,
-            'PHPExcel_Cell_AdvancedValueBinder' => \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class,
-            'PHPExcel_Cell_DataType' => \PhpOffice\PhpSpreadsheet\Cell\DataType::class,
-            'PHPExcel_Cell_DataValidation' => \PhpOffice\PhpSpreadsheet\Cell\DataValidation::class,
-            'PHPExcel_Cell_DefaultValueBinder' => \PhpOffice\PhpSpreadsheet\Cell\DefaultValueBinder::class,
-            'PHPExcel_Cell_Hyperlink' => \PhpOffice\PhpSpreadsheet\Cell\Hyperlink::class,
-            'PHPExcel_Cell_IValueBinder' => \PhpOffice\PhpSpreadsheet\Cell\IValueBinder::class,
-            'PHPExcel_Chart_Axis' => \PhpOffice\PhpSpreadsheet\Chart\Axis::class,
-            'PHPExcel_Chart_DataSeries' => \PhpOffice\PhpSpreadsheet\Chart\DataSeries::class,
-            'PHPExcel_Chart_DataSeriesValues' => \PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues::class,
-            'PHPExcel_Chart_Exception' => \PhpOffice\PhpSpreadsheet\Chart\Exception::class,
-            'PHPExcel_Chart_GridLines' => \PhpOffice\PhpSpreadsheet\Chart\GridLines::class,
-            'PHPExcel_Chart_Layout' => \PhpOffice\PhpSpreadsheet\Chart\Layout::class,
-            'PHPExcel_Chart_Legend' => \PhpOffice\PhpSpreadsheet\Chart\Legend::class,
-            'PHPExcel_Chart_PlotArea' => \PhpOffice\PhpSpreadsheet\Chart\PlotArea::class,
-            'PHPExcel_Properties' => \PhpOffice\PhpSpreadsheet\Chart\Properties::class,
-            'PHPExcel_Chart_Title' => \PhpOffice\PhpSpreadsheet\Chart\Title::class,
-            'PHPExcel_DocumentProperties' => \PhpOffice\PhpSpreadsheet\Document\Properties::class,
-            'PHPExcel_DocumentSecurity' => \PhpOffice\PhpSpreadsheet\Document\Security::class,
-            'PHPExcel_Helper_HTML' => \PhpOffice\PhpSpreadsheet\Helper\Html::class,
-            'PHPExcel_Reader_Abstract' => \PhpOffice\PhpSpreadsheet\Reader\BaseReader::class,
-            'PHPExcel_Reader_CSV' => \PhpOffice\PhpSpreadsheet\Reader\Csv::class,
-            'PHPExcel_Reader_DefaultReadFilter' => \PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter::class,
-            'PHPExcel_Reader_Excel2003XML' => \PhpOffice\PhpSpreadsheet\Reader\Xml::class,
-            'PHPExcel_Reader_Exception' => \PhpOffice\PhpSpreadsheet\Reader\Exception::class,
-            'PHPExcel_Reader_Gnumeric' => \PhpOffice\PhpSpreadsheet\Reader\Gnumeric::class,
-            'PHPExcel_Reader_HTML' => \PhpOffice\PhpSpreadsheet\Reader\Html::class,
-            'PHPExcel_Reader_IReadFilter' => \PhpOffice\PhpSpreadsheet\Reader\IReadFilter::class,
-            'PHPExcel_Reader_IReader' => \PhpOffice\PhpSpreadsheet\Reader\IReader::class,
-            'PHPExcel_Reader_OOCalc' => \PhpOffice\PhpSpreadsheet\Reader\Ods::class,
-            'PHPExcel_Reader_SYLK' => \PhpOffice\PhpSpreadsheet\Reader\Slk::class,
-            'PHPExcel_Reader_Excel5' => \PhpOffice\PhpSpreadsheet\Reader\Xls::class,
-            'PHPExcel_Reader_Excel2007' => \PhpOffice\PhpSpreadsheet\Reader\Xlsx::class,
-            'PHPExcel_RichText_ITextElement' => \PhpOffice\PhpSpreadsheet\RichText\ITextElement::class,
-            'PHPExcel_RichText_Run' => \PhpOffice\PhpSpreadsheet\RichText\Run::class,
-            'PHPExcel_RichText_TextElement' => \PhpOffice\PhpSpreadsheet\RichText\TextElement::class,
-            'PHPExcel_Shared_CodePage' => \PhpOffice\PhpSpreadsheet\Shared\CodePage::class,
-            'PHPExcel_Shared_Date' => \PhpOffice\PhpSpreadsheet\Shared\Date::class,
-            'PHPExcel_Shared_Drawing' => \PhpOffice\PhpSpreadsheet\Shared\Drawing::class,
-            'PHPExcel_Shared_Escher' => \PhpOffice\PhpSpreadsheet\Shared\Escher::class,
-            'PHPExcel_Shared_File' => \PhpOffice\PhpSpreadsheet\Shared\File::class,
-            'PHPExcel_Shared_Font' => \PhpOffice\PhpSpreadsheet\Shared\Font::class,
-            'PHPExcel_Shared_OLE' => \PhpOffice\PhpSpreadsheet\Shared\OLE::class,
-            'PHPExcel_Shared_OLERead' => \PhpOffice\PhpSpreadsheet\Shared\OLERead::class,
-            'PHPExcel_Shared_PasswordHasher' => \PhpOffice\PhpSpreadsheet\Shared\PasswordHasher::class,
-            'PHPExcel_Shared_String' => \PhpOffice\PhpSpreadsheet\Shared\StringHelper::class,
-            'PHPExcel_Shared_TimeZone' => \PhpOffice\PhpSpreadsheet\Shared\TimeZone::class,
-            'PHPExcel_Shared_XMLWriter' => \PhpOffice\PhpSpreadsheet\Shared\XMLWriter::class,
-            'PHPExcel_Shared_Excel5' => \PhpOffice\PhpSpreadsheet\Shared\Xls::class,
-            'PHPExcel_Style_Alignment' => \PhpOffice\PhpSpreadsheet\Style\Alignment::class,
-            'PHPExcel_Style_Border' => \PhpOffice\PhpSpreadsheet\Style\Border::class,
-            'PHPExcel_Style_Borders' => \PhpOffice\PhpSpreadsheet\Style\Borders::class,
-            'PHPExcel_Style_Color' => \PhpOffice\PhpSpreadsheet\Style\Color::class,
-            'PHPExcel_Style_Conditional' => \PhpOffice\PhpSpreadsheet\Style\Conditional::class,
-            'PHPExcel_Style_Fill' => \PhpOffice\PhpSpreadsheet\Style\Fill::class,
-            'PHPExcel_Style_Font' => \PhpOffice\PhpSpreadsheet\Style\Font::class,
-            'PHPExcel_Style_NumberFormat' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::class,
-            'PHPExcel_Style_Protection' => \PhpOffice\PhpSpreadsheet\Style\Protection::class,
-            'PHPExcel_Style_Supervisor' => \PhpOffice\PhpSpreadsheet\Style\Supervisor::class,
-            'PHPExcel_Worksheet_AutoFilter' => \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter::class,
-            'PHPExcel_Worksheet_BaseDrawing' => \PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing::class,
-            'PHPExcel_Worksheet_CellIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\CellIterator::class,
-            'PHPExcel_Worksheet_Column' => \PhpOffice\PhpSpreadsheet\Worksheet\Column::class,
-            'PHPExcel_Worksheet_ColumnCellIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\ColumnCellIterator::class,
-            'PHPExcel_Worksheet_ColumnDimension' => \PhpOffice\PhpSpreadsheet\Worksheet\ColumnDimension::class,
-            'PHPExcel_Worksheet_ColumnIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\ColumnIterator::class,
-            'PHPExcel_Worksheet_Drawing' => \PhpOffice\PhpSpreadsheet\Worksheet\Drawing::class,
-            'PHPExcel_Worksheet_HeaderFooter' => \PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooter::class,
-            'PHPExcel_Worksheet_HeaderFooterDrawing' => \PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing::class,
-            'PHPExcel_WorksheetIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\Iterator::class,
-            'PHPExcel_Worksheet_MemoryDrawing' => \PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing::class,
-            'PHPExcel_Worksheet_PageMargins' => \PhpOffice\PhpSpreadsheet\Worksheet\PageMargins::class,
-            'PHPExcel_Worksheet_PageSetup' => \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::class,
-            'PHPExcel_Worksheet_Protection' => \PhpOffice\PhpSpreadsheet\Worksheet\Protection::class,
-            'PHPExcel_Worksheet_Row' => \PhpOffice\PhpSpreadsheet\Worksheet\Row::class,
-            'PHPExcel_Worksheet_RowCellIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\RowCellIterator::class,
-            'PHPExcel_Worksheet_RowDimension' => \PhpOffice\PhpSpreadsheet\Worksheet\RowDimension::class,
-            'PHPExcel_Worksheet_RowIterator' => \PhpOffice\PhpSpreadsheet\Worksheet\RowIterator::class,
-            'PHPExcel_Worksheet_SheetView' => \PhpOffice\PhpSpreadsheet\Worksheet\SheetView::class,
-            'PHPExcel_Writer_Abstract' => \PhpOffice\PhpSpreadsheet\Writer\BaseWriter::class,
-            'PHPExcel_Writer_CSV' => \PhpOffice\PhpSpreadsheet\Writer\Csv::class,
-            'PHPExcel_Writer_Exception' => \PhpOffice\PhpSpreadsheet\Writer\Exception::class,
-            'PHPExcel_Writer_HTML' => \PhpOffice\PhpSpreadsheet\Writer\Html::class,
-            'PHPExcel_Writer_IWriter' => \PhpOffice\PhpSpreadsheet\Writer\IWriter::class,
-            'PHPExcel_Writer_OpenDocument' => \PhpOffice\PhpSpreadsheet\Writer\Ods::class,
-            'PHPExcel_Writer_PDF' => \PhpOffice\PhpSpreadsheet\Writer\Pdf::class,
-            'PHPExcel_Writer_Excel5' => \PhpOffice\PhpSpreadsheet\Writer\Xls::class,
-            'PHPExcel_Writer_Excel2007' => \PhpOffice\PhpSpreadsheet\Writer\Xlsx::class,
-            'PHPExcel_CachedObjectStorageFactory' => \PhpOffice\PhpSpreadsheet\Collection\CellsFactory::class,
-            'PHPExcel_Calculation' => \PhpOffice\PhpSpreadsheet\Calculation\Calculation::class,
-            'PHPExcel_Cell' => \PhpOffice\PhpSpreadsheet\Cell\Cell::class,
-            'PHPExcel_Chart' => \PhpOffice\PhpSpreadsheet\Chart\Chart::class,
-            'PHPExcel_Comment' => \PhpOffice\PhpSpreadsheet\Comment::class,
-            'PHPExcel_Exception' => \PhpOffice\PhpSpreadsheet\Exception::class,
-            'PHPExcel_HashTable' => \PhpOffice\PhpSpreadsheet\HashTable::class,
-            'PHPExcel_IComparable' => \PhpOffice\PhpSpreadsheet\IComparable::class,
-            'PHPExcel_IOFactory' => \PhpOffice\PhpSpreadsheet\IOFactory::class,
-            'PHPExcel_NamedRange' => \PhpOffice\PhpSpreadsheet\NamedRange::class,
-            'PHPExcel_ReferenceHelper' => \PhpOffice\PhpSpreadsheet\ReferenceHelper::class,
-            'PHPExcel_RichText' => \PhpOffice\PhpSpreadsheet\RichText\RichText::class,
-            'PHPExcel_Settings' => \PhpOffice\PhpSpreadsheet\Settings::class,
-            'PHPExcel_Style' => \PhpOffice\PhpSpreadsheet\Style\Style::class,
-            'PHPExcel_Worksheet' => \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::class,
-        ];
-
-        $methods = [
-            'MINUTEOFHOUR' => 'MINUTE',
-            'SECONDOFMINUTE' => 'SECOND',
-            'DAYOFWEEK' => 'WEEKDAY',
-            'WEEKOFYEAR' => 'WEEKNUM',
-            'ExcelToPHPObject' => 'excelToDateTimeObject',
-            'ExcelToPHP' => 'excelToTimestamp',
-            'FormattedPHPToExcel' => 'formattedPHPToExcel',
-            'Cell::absoluteCoordinate' => 'Coordinate::absoluteCoordinate',
-            'Cell::absoluteReference' => 'Coordinate::absoluteReference',
-            'Cell::buildRange' => 'Coordinate::buildRange',
-            'Cell::columnIndexFromString' => 'Coordinate::columnIndexFromString',
-            'Cell::coordinateFromString' => 'Coordinate::coordinateFromString',
-            'Cell::extractAllCellReferencesInRange' => 'Coordinate::extractAllCellReferencesInRange',
-            'Cell::getRangeBoundaries' => 'Coordinate::getRangeBoundaries',
-            'Cell::mergeRangesInCollection' => 'Coordinate::mergeRangesInCollection',
-            'Cell::rangeBoundaries' => 'Coordinate::rangeBoundaries',
-            'Cell::rangeDimension' => 'Coordinate::rangeDimension',
-            'Cell::splitRange' => 'Coordinate::splitRange',
-            'Cell::stringFromColumnIndex' => 'Coordinate::stringFromColumnIndex',
-        ];
-
-        // Keep '\' prefix for class names
-        $prefixedClasses = [];
-        foreach ($classes as $key => &$value) {
-            $value = str_replace('PhpOffice\\', '\\PhpOffice\\', $value);
-            $prefixedClasses['\\' . $key] = $value;
-        }
-        $mapping = $prefixedClasses + $classes + $methods;
-
-        return $mapping;
-    }
-
-    /**
-     * Search in all files in given directory.
-     *
-     * @param string $path
-     */
-    private function recursiveReplace($path)
-    {
-        $patterns = [
-            '/*.md',
-            '/*.txt',
-            '/*.TXT',
-            '/*.php',
-            '/*.phpt',
-            '/*.php3',
-            '/*.php4',
-            '/*.php5',
-            '/*.phtml',
-        ];
-
-        foreach ($patterns as $pattern) {
-            foreach (glob($path . $pattern) as $file) {
-                if (strpos($path, '/vendor/') !== false) {
-                    echo $file . " skipped\n";
-
-                    continue;
-                }
-                $original = file_get_contents($file);
-                $converted = $this->replace($original);
-
-                if ($original !== $converted) {
-                    echo $file . " converted\n";
-                    file_put_contents($file, $converted);
-                }
-            }
-        }
-
-        // Do the recursion in subdirectory
-        foreach (glob($path . '/*', GLOB_ONLYDIR) as $subpath) {
-            if (strpos($subpath, $path . '/') === 0) {
-                $this->recursiveReplace($subpath);
-            }
-        }
-    }
-
-    public function migrate()
-    {
-        $path = realpath(getcwd());
-        echo 'This will search and replace recursively in ' . $path . PHP_EOL;
-        echo 'You MUST backup your files first, or you risk losing data.' . PHP_EOL;
-        echo 'Are you sure ? (y/n)';
-
-        $confirm = fread(STDIN, 1);
-        if ($confirm === 'y') {
-            $this->recursiveReplace($path);
-        }
-    }
-
-    /**
-     * Migrate the given code from PHPExcel to PhpSpreadsheet.
-     *
-     * @param string $original
-     *
-     * @return string
-     */
-    public function replace($original)
-    {
-        $converted = str_replace($this->from, $this->to, $original);
-
-        // The string "PHPExcel" gets special treatment because of how common it might be.
-        // This regex requires a word boundary around the string, and it can't be
-        // preceded by $ or -> (goal is to filter out cases where a variable is named $PHPExcel or similar)
-        $converted = preg_replace('~(?<!\$|->)(\b|\\\\)PHPExcel\b~', '\\' . \PhpOffice\PhpSpreadsheet\Spreadsheet::class, $converted);
-
-        return $converted;
-    }
-}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
index e199c807c..034d79b68 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
@@ -2,15 +2,20 @@
 
 namespace PhpOffice\PhpSpreadsheet\Helper;
 
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
 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;
+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.
@@ -70,12 +75,17 @@ class Sample
     /**
      * Returns an array of all known samples.
      *
-     * @return string[] [$name => $path]
+     * @return string[][] [$name => $path]
      */
     public function getSamples()
     {
         // 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);
@@ -83,9 +93,14 @@ class Sample
         $files = [];
         foreach ($regex as $file) {
             $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
+            if (is_array($file)) {
+                // @codeCoverageIgnoreStart
+                throw new RuntimeException('str_replace returned array');
+                // @codeCoverageIgnoreEnd
+            }
             $info = pathinfo($file);
-            $category = str_replace('_', ' ', $info['dirname']);
-            $name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename']));
+            $category = str_replace('_', ' ', $info['dirname'] ?? '');
+            $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename']));
             if (!in_array($category, ['.', 'boostrap', 'templates'])) {
                 if (!isset($files[$category])) {
                     $files[$category] = [];
@@ -106,11 +121,10 @@ class Sample
     /**
      * Write documents.
      *
-     * @param Spreadsheet $spreadsheet
      * @param string $filename
      * @param string[] $writers
      */
-    public function write(Spreadsheet $spreadsheet, $filename, array $writers = ['Xlsx', 'Xls'])
+    public function write(Spreadsheet $spreadsheet, $filename, array $writers = ['Xlsx', 'Xls'], bool $withCharts = false, ?callable $writerCallback = null): void
     {
         // Set active sheet index to the first sheet, so Excel opens this as the first sheet
         $spreadsheet->setActiveSheetIndex(0);
@@ -119,31 +133,40 @@ class Sample
         foreach ($writers as $writerType) {
             $path = $this->getFilename($filename, mb_strtolower($writerType));
             $writer = IOFactory::createWriter($spreadsheet, $writerType);
-            if ($writer instanceof Pdf) {
-                // PDF writer needs temporary directory
-                $tempDir = $this->getTemporaryFolder();
-                $writer->setTempDir($tempDir);
+            $writer->setIncludeCharts($withCharts);
+            if ($writerCallback !== null) {
+                $writerCallback($writer);
             }
             $callStartTime = microtime(true);
-            $writer->save($path);
-            $this->logWrite($writer, $path, $callStartTime);
+            if (PHP_VERSION_ID >= 80400 && $writer instanceof Dompdf) {
+                @$writer->save($path);
+            } else {
+                $writer->save($path);
+            }
+            $this->logWrite($writer, $path, /** @scrutinizer ignore-type */ $callStartTime);
+            if ($this->isCli() === false) {
+                echo '<a href="/download.php?type=' . pathinfo($path, PATHINFO_EXTENSION) . '&name=' . basename($path) . '">Download ' . basename($path) . '</a><br />';
+            }
         }
 
         $this->logEndingNotes();
     }
 
+    protected function isDirOrMkdir(string $folder): bool
+    {
+        return \is_dir($folder) || \mkdir($folder);
+    }
+
     /**
      * Returns the temporary directory and make sure it exists.
      *
      * @return string
      */
-    private function getTemporaryFolder()
+    public function getTemporaryFolder()
     {
         $tempFolder = sys_get_temp_dir() . '/phpspreadsheet';
-        if (!is_dir($tempFolder)) {
-            if (!mkdir($tempFolder) && !is_dir($tempFolder)) {
-                throw new \RuntimeException(sprintf('Directory "%s" was not created', $tempFolder));
-            }
+        if (!$this->isDirOrMkdir($tempFolder)) {
+            throw new RuntimeException(sprintf('Directory "%s" was not created', $tempFolder));
         }
 
         return $tempFolder;
@@ -154,14 +177,12 @@ class Sample
      *
      * @param string $filename
      * @param string $extension
-     *
-     * @return string
      */
-    public function getFilename($filename, $extension = 'xlsx')
+    public function getFilename($filename, $extension = 'xlsx'): string
     {
         $originalExtension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        return $this->getTemporaryFolder() . '/' . str_replace('.' . $originalExtension, '.' . $extension, basename($filename));
+        return $this->getTemporaryFolder() . '/' . str_replace('.' . /** @scrutinizer ignore-type */ $originalExtension, '.' . $extension, basename($filename));
     }
 
     /**
@@ -174,21 +195,75 @@ class Sample
     public function getTemporaryFilename($extension = 'xlsx')
     {
         $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)
+    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;
+    }
+
+    public function renderChart(Chart $chart, string $fileName): void
+    {
+        if ($this->isCli() === true) {
+            return;
+        }
+
+        Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+
+        $fileName = $this->getFilename($fileName, 'png');
+
+        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>';
+            }
+        } catch (Throwable $e) {
+            $this->log('Error rendering chart: ' . $e->getMessage() . PHP_EOL);
+        }
+    }
+
+    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)->getValue());
+        }
+        $this->log($worksheet->getCell($formulaCell)->getValue());
+        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValue());
     }
 
     /**
      * Log ending notes.
      */
-    public function logEndingNotes()
+    public function logEndingNotes(): void
     {
         // Do not show execution time for index
         $this->log('Peak memory usage: ' . (memory_get_peak_usage(true) / 1024 / 1024) . 'MB');
@@ -197,17 +272,19 @@ class Sample
     /**
      * Log a line about the write operation.
      *
-     * @param IWriter $writer
      * @param string $path
      * @param float $callStartTime
      */
-    public function logWrite(IWriter $writer, $path, $callStartTime)
+    public function logWrite(IWriter $writer, $path, $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';
+
+        $message = ($this->isCli() === true)
+            ? "Write {$format} format to {$path}  in " . sprintf('%.4f', $callTime) . ' seconds'
+            : "Write {$format} format to <code>{$path}</code>  in " . sprintf('%.4f', $callTime) . ' seconds';
 
         $this->log($message);
     }
@@ -219,7 +296,7 @@ class Sample
      * @param string $path
      * @param float $callStartTime
      */
-    public function logRead($format, $path, $callStartTime)
+    public function logRead($format, $path, $callStartTime): void
     {
         $callEndTime = microtime(true);
         $callTime = $callEndTime - $callStartTime;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
new file mode 100644
index 000000000..12ba4ef73
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class Size
+{
+    const REGEXP_SIZE_VALIDATION = '/^(?P<size>\d*\.?\d+)(?P<unit>pt|px|em)?$/i';
+
+    /**
+     * @var bool
+     */
+    protected $valid;
+
+    /**
+     * @var string
+     */
+    protected $size = '';
+
+    /**
+     * @var string
+     */
+    protected $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()
+    {
+        return $this->size . $this->unit;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
new file mode 100644
index 000000000..3a4a98f02
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class TextGrid
+{
+    /**
+     * @var bool
+     */
+    private $isCli = true;
+
+    /**
+     * @var array
+     */
+    protected $matrix;
+
+    /**
+     * @var array
+     */
+    protected $rows;
+
+    /**
+     * @var array
+     */
+    protected $columns;
+
+    /**
+     * @var string
+     */
+    private $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
index 4266ea546..c088397d8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
+++ b/libraries/phpspreadsheet/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 @@ use PhpOffice\PhpSpreadsheet\Shared\File;
  */
 abstract class IOFactory
 {
+    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 string[] */
     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,
+        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,
     ];
 
+    /** @var string[] */
     private static $writers = [
-        'Xls' => Writer\Xls::class,
-        'Xlsx' => Writer\Xlsx::class,
-        'Ods' => Writer\Ods::class,
-        'Csv' => Writer\Csv::class,
-        'Html' => Writer\Html::class,
+        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,42 +56,31 @@ abstract class IOFactory
 
     /**
      * Create Writer\IWriter.
-     *
-     * @param Spreadsheet $spreadsheet
-     * @param string $writerType Example: Xlsx
-     *
-     * @throws Writer\Exception
-     *
-     * @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");
         }
 
         // Instantiate writer
+        /** @var IWriter */
         $className = self::$writers[$writerType];
 
         return new $className($spreadsheet);
     }
 
     /**
-     * Create Reader\IReader.
-     *
-     * @param string $readerType Example: Xlsx
-     *
-     * @throws Reader\Exception
-     *
-     * @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");
         }
 
         // Instantiate reader
+        /** @var IReader */
         $className = self::$readers[$readerType];
 
         return new $className();
@@ -80,31 +89,31 @@ abstract class IOFactory
     /**
      * Loads Spreadsheet from file using automatic Reader\IReader resolution.
      *
-     * @param string $pFilename The name of the spreadsheet file
-     *
-     * @throws Reader\Exception
-     *
-     * @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
-     *
-     * @throws Reader\Exception
-     *
-     * @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);
+        $reader = self::createReaderForFile($filename, $readers);
         $className = get_class($reader);
         $classType = explode('\\', $className);
         unset($reader);
@@ -113,35 +122,47 @@ abstract class IOFactory
     }
 
     /**
-     * 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
-     *
-     * @throws Reader\Exception
-     *
-     * @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,
+                function (string $readerType) use ($readers) {
+                    return 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
-            if (isset($reader) && $reader->canRead($filename)) {
+            if ($reader->canRead($filename)) {
                 return $reader;
             }
         }
 
         // 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;
                 }
@@ -153,12 +174,8 @@ abstract class IOFactory
 
     /**
      * 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'])) {
@@ -198,14 +215,11 @@ abstract class IOFactory
 
     /**
      * Register a writer with its type and class name.
-     *
-     * @param string $writerType
-     * @param string $writerClass
      */
-    public static function registerWriter($writerType, $writerClass)
+    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;
@@ -213,14 +227,11 @@ abstract class IOFactory
 
     /**
      * Register a reader with its type and class name.
-     *
-     * @param string $readerType
-     * @param string $readerClass
      */
-    public static function registerReader($readerType, $readerClass)
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php
new file mode 100644
index 000000000..500151f0b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedFormula extends DefinedName
+{
+    /**
+     * Create a new Named Formula.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $formula = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        // Validate data
+        if (!isset($formula)) {
+            throw new Exception('You must specify a Formula value for a Named Formula');
+        }
+        parent::__construct($name, $worksheet, $formula, $localOnly, $scope);
+    }
+
+    /**
+     * Get the formula value.
+     */
+    public function getFormula(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set the formula value.
+     */
+    public function setFormula(string $formula): self
+    {
+        if (!empty($formula)) {
+            $this->value = $formula;
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
index e539b7c53..db9c5f121 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
@@ -2,239 +2,54 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-class NamedRange
+class NamedRange extends DefinedName
 {
     /**
-     * Range name.
-     *
-     * @var string
+     * Create a new Named Range.
      */
-    private $name;
-
-    /**
-     * Worksheet on which the named range can be resolved.
-     *
-     * @var Worksheet
-     */
-    private $worksheet;
-
-    /**
-     * Range of the referenced cells.
-     *
-     * @var string
-     */
-    private $range;
-
-    /**
-     * Is the named range local? (i.e. can only be used on $this->worksheet).
-     *
-     * @var bool
-     */
-    private $localOnly;
-
-    /**
-     * Scope.
-     *
-     * @var Worksheet
-     */
-    private $scope;
-
-    /**
-     * Create a new NamedRange.
-     *
-     * @param string $pName
-     * @param Worksheet $pWorksheet
-     * @param string $pRange
-     * @param bool $pLocalOnly
-     * @param null|Worksheet $pScope Scope. Only applies when $pLocalOnly = true. Null for global scope.
-     *
-     * @throws Exception
-     */
-    public function __construct($pName, Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
-    {
-        // Validate data
-        if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) {
-            throw new Exception('Parameters can not be null.');
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        string $range = 'A1',
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null && $scope === null) {
+            throw new Exception('You must specify a worksheet or a scope for a Named Range');
         }
-
-        // Set local members
-        $this->name = $pName;
-        $this->worksheet = $pWorksheet;
-        $this->range = $pRange;
-        $this->localOnly = $pLocalOnly;
-        $this->scope = ($pLocalOnly == true) ? (($pScope == null) ? $pWorksheet : $pScope) : null;
+        parent::__construct($name, $worksheet, $range, $localOnly, $scope);
     }
 
     /**
-     * Get name.
-     *
-     * @return string
+     * Get the range value.
      */
-    public function getName()
+    public function getRange(): string
     {
-        return $this->name;
+        return $this->value;
     }
 
     /**
-     * Set name.
-     *
-     * @param string $value
-     *
-     * @return $this
+     * Set the range value.
      */
-    public function setName($value)
+    public function setRange(string $range): self
     {
-        if ($value !== null) {
-            // Old title
-            $oldTitle = $this->name;
-
-            // Re-attach
-            if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
-            }
-            $this->name = $value;
-
-            if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->addNamedRange($this);
-            }
-
-            // New title
-            $newTitle = $this->name;
-            ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
+        if (!empty($range)) {
+            $this->value = $range;
         }
 
         return $this;
     }
 
-    /**
-     * Get worksheet.
-     *
-     * @return Worksheet
-     */
-    public function getWorksheet()
+    public function getCellsInRange(): array
     {
-        return $this->worksheet;
-    }
-
-    /**
-     * Set worksheet.
-     *
-     * @param Worksheet $value
-     *
-     * @return $this
-     */
-    public function setWorksheet(Worksheet $value = null)
-    {
-        if ($value !== null) {
-            $this->worksheet = $value;
+        $range = $this->value;
+        if (substr($range, 0, 1) === '=') {
+            $range = substr($range, 1);
         }
 
-        return $this;
-    }
-
-    /**
-     * Get range.
-     *
-     * @return string
-     */
-    public function getRange()
-    {
-        return $this->range;
-    }
-
-    /**
-     * Set range.
-     *
-     * @param string $value
-     *
-     * @return $this
-     */
-    public function setRange($value)
-    {
-        if ($value !== null) {
-            $this->range = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get localOnly.
-     *
-     * @return bool
-     */
-    public function getLocalOnly()
-    {
-        return $this->localOnly;
-    }
-
-    /**
-     * Set localOnly.
-     *
-     * @param bool $value
-     *
-     * @return $this
-     */
-    public function setLocalOnly($value)
-    {
-        $this->localOnly = $value;
-        $this->scope = $value ? $this->worksheet : null;
-
-        return $this;
-    }
-
-    /**
-     * Get scope.
-     *
-     * @return null|Worksheet
-     */
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    /**
-     * Set scope.
-     *
-     * @param null|Worksheet $value
-     *
-     * @return $this
-     */
-    public function setScope(Worksheet $value = null)
-    {
-        $this->scope = $value;
-        $this->localOnly = $value != null;
-
-        return $this;
-    }
-
-    /**
-     * Resolve a named range to a regular cell range.
-     *
-     * @param string $pNamedRange Named range
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
-     *
-     * @return NamedRange
-     */
-    public static function resolveRange($pNamedRange, Worksheet $pSheet)
-    {
-        return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
-    }
-
-    /**
-     * 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;
-            }
-        }
+        return Coordinate::extractAllCellReferencesInRange($range);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
index f7af1557f..aa380aa95 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -2,8 +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
 {
@@ -37,7 +40,7 @@ abstract class BaseReader implements IReader
      * 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.
      *
-     * @var array of string
+     * @var null|string[]
      */
     protected $loadSheetsOnly;
 
@@ -48,10 +51,11 @@ abstract class BaseReader implements IReader
      */
     protected $readFilter;
 
+    /** @var resource */
     protected $fileHandle;
 
     /**
-     * @var XmlScanner
+     * @var ?XmlScanner
      */
     protected $securityScanner;
 
@@ -65,9 +69,9 @@ abstract class BaseReader implements IReader
         return $this->readDataOnly;
     }
 
-    public function setReadDataOnly($pValue)
+    public function setReadDataOnly($readCellValuesOnly)
     {
-        $this->readDataOnly = (bool) $pValue;
+        $this->readDataOnly = (bool) $readCellValuesOnly;
 
         return $this;
     }
@@ -77,9 +81,9 @@ abstract class BaseReader implements IReader
         return $this->readEmptyCells;
     }
 
-    public function setReadEmptyCells($pValue)
+    public function setReadEmptyCells($readEmptyCells)
     {
-        $this->readEmptyCells = (bool) $pValue;
+        $this->readEmptyCells = (bool) $readEmptyCells;
 
         return $this;
     }
@@ -89,9 +93,9 @@ abstract class BaseReader implements IReader
         return $this->includeCharts;
     }
 
-    public function setIncludeCharts($pValue)
+    public function setIncludeCharts($includeCharts)
     {
-        $this->includeCharts = (bool) $pValue;
+        $this->includeCharts = (bool) $includeCharts;
 
         return $this;
     }
@@ -101,13 +105,13 @@ abstract class BaseReader implements IReader
         return $this->loadSheetsOnly;
     }
 
-    public function setLoadSheetsOnly($value)
+    public function setLoadSheetsOnly($sheetList)
     {
-        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;
     }
@@ -124,37 +128,79 @@ abstract class BaseReader implements IReader
         return $this->readFilter;
     }
 
-    public function setReadFilter(IReadFilter $pValue)
+    public function setReadFilter(IReadFilter $readFilter)
     {
-        $this->readFilter = $pValue;
+        $this->readFilter = $readFilter;
 
         return $this;
     }
 
-    public function getSecurityScanner()
+    public function getSecurityScanner(): ?XmlScanner
     {
-        if (property_exists($this, 'securityScanner')) {
-            return $this->securityScanner;
+        return $this->securityScanner;
+    }
+
+    public function getSecurityScannerOrThrow(): XmlScanner
+    {
+        if ($this->securityScanner === null) {
+            throw new ReaderException('Security scanner is unexpectedly null');
         }
 
-        return 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);
+        }
+    }
+
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own loadSpreadsheetFromFile() method');
+    }
+
+    /**
+     * Loads Spreadsheet from 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
+     */
+    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.
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
      */
-    protected function openFile($pFilename)
+    protected function openFile(string $filename): void
     {
-        File::assertFile($pFilename);
+        $fileHandle = false;
+        if ($filename) {
+            File::assertFile($filename);
 
-        // Open file
-        $this->fileHandle = fopen($pFilename, 'r');
-        if ($this->fileHandle === false) {
-            throw new Exception('Could not open file ' . $pFilename . ' for reading.');
+            // Open file
+            $fileHandle = fopen($filename, 'rb');
         }
+        if ($fileHandle === false) {
+            throw new ReaderException('Could not open file ' . $filename . ' for reading.');
+        }
+
+        $this->fileHandle = $fileHandle;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
index 471340988..3feec8e88 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
@@ -2,12 +2,34 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+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\Style\NumberFormat;
 
 class Csv extends BaseReader
 {
+    const DEFAULT_FALLBACK_ENCODING = 'CP1252';
+    const GUESS_ENCODING = 'guess';
+    const UTF8_BOM = "\xEF\xBB\xBF";
+    const UTF8_BOM_LEN = 3;
+    const UTF16BE_BOM = "\xfe\xff";
+    const UTF16BE_BOM_LEN = 2;
+    const UTF16BE_LF = "\x00\x0a";
+    const UTF16LE_BOM = "\xff\xfe";
+    const UTF16LE_BOM_LEN = 2;
+    const UTF16LE_LF = "\x0a\x00";
+    const UTF32BE_BOM = "\x00\x00\xfe\xff";
+    const UTF32BE_BOM_LEN = 4;
+    const UTF32BE_LF = "\x00\x00\x00\x0a";
+    const UTF32LE_BOM = "\xff\xfe\x00\x00";
+    const UTF32LE_BOM_LEN = 4;
+    const UTF32LE_LF = "\x0a\x00\x00\x00";
+
     /**
      * Input encoding.
      *
@@ -16,10 +38,17 @@ class Csv extends BaseReader
     private $inputEncoding = 'UTF-8';
 
     /**
-     * Delimiter.
+     * Fallback encoding if guess strikes out.
      *
      * @var string
      */
+    private $fallbackEncoding = self::DEFAULT_FALLBACK_ENCODING;
+
+    /**
+     * Delimiter.
+     *
+     * @var ?string
+     */
     private $delimiter;
 
     /**
@@ -43,19 +72,47 @@ class Csv extends BaseReader
      */
     private $contiguous = false;
 
-    /**
-     * Row counter for loading rows contiguously.
-     *
-     * @var int
-     */
-    private $contiguousRow = -1;
-
     /**
      * The character that can escape the enclosure.
      *
-     * @var string
+     * @var ?string
      */
-    private $escapeCharacter = '\\';
+    private $escapeCharacter;
+
+    /**
+     * 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.
+     *
+     * @var ?callable
+     */
+    private static $constructorCallback;
+
+    /**
+     * Attempt autodetect line endings (deprecated after PHP8.1)?
+     *
+     * @var bool
+     */
+    private $testAutodetect = true;
+
+    /**
+     * @var bool
+     */
+    protected $castFormattedNumberToNumeric = false;
+
+    /**
+     * @var bool
+     */
+    protected $preserveNumericFormatting = false;
+
+    /** @var bool */
+    private $preserveNullString = false;
 
     /**
      * Create a new CSV Reader instance.
@@ -63,74 +120,68 @@ class Csv extends BaseReader
     public function __construct()
     {
         parent::__construct();
+        $callback = self::$constructorCallback;
+        if ($callback !== null) {
+            $callback($this);
+        }
     }
 
     /**
-     * Set input encoding.
+     * Set a callback to change the defaults.
      *
-     * @param string $pValue Input encoding, eg: 'UTF-8'
-     *
-     * @return $this
+     * The callback must accept the Csv Reader object as the first parameter,
+     * and it should return void.
      */
-    public function setInputEncoding($pValue)
+    public static function setConstructorCallback(?callable $callback): void
     {
-        $this->inputEncoding = $pValue;
+        self::$constructorCallback = $callback;
+    }
+
+    public static function getConstructorCallback(): ?callable
+    {
+        return self::$constructorCallback;
+    }
+
+    public function setInputEncoding(string $encoding): self
+    {
+        $this->inputEncoding = $encoding;
 
         return $this;
     }
 
-    /**
-     * Get input encoding.
-     *
-     * @return string
-     */
-    public function getInputEncoding()
+    public function getInputEncoding(): string
     {
         return $this->inputEncoding;
     }
 
+    public function setFallbackEncoding(string $fallbackEncoding): self
+    {
+        $this->fallbackEncoding = $fallbackEncoding;
+
+        return $this;
+    }
+
+    public function getFallbackEncoding(): string
+    {
+        return $this->fallbackEncoding;
+    }
+
     /**
      * Move filepointer past any BOM marker.
      */
-    protected function skipBOM()
+    protected function skipBOM(): void
     {
         rewind($this->fileHandle);
 
-        switch ($this->inputEncoding) {
-            case 'UTF-8':
-                fgets($this->fileHandle, 4) == "\xEF\xBB\xBF" ?
-                    fseek($this->fileHandle, 3) : fseek($this->fileHandle, 0);
-
-                break;
-            case 'UTF-16LE':
-                fgets($this->fileHandle, 3) == "\xFF\xFE" ?
-                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
-
-                break;
-            case 'UTF-16BE':
-                fgets($this->fileHandle, 3) == "\xFE\xFF" ?
-                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
-
-                break;
-            case 'UTF-32LE':
-                fgets($this->fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
-
-                break;
-            case 'UTF-32BE':
-                fgets($this->fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
-
-                break;
-            default:
-                break;
+        if (fgets($this->fileHandle, self::UTF8_BOM_LEN + 1) !== self::UTF8_BOM) {
+            rewind($this->fileHandle);
         }
     }
 
     /**
      * Identify any separator that is explicitly set in the file.
      */
-    protected function checkSeparator()
+    protected function checkSeparator(): void
     {
         $line = fgets($this->fileHandle);
         if ($line === false) {
@@ -149,140 +200,39 @@ class Csv extends BaseReader
     /**
      * Infer the separator if it isn't explicitly set in the file or specified by the user.
      */
-    protected function inferSeparator()
+    protected function inferSeparator(): void
     {
         if ($this->delimiter !== null) {
             return;
         }
 
-        $potentialDelimiters = [',', ';', "\t", '|', ':', ' ', '~'];
-        $counts = [];
-        foreach ($potentialDelimiters as $delimiter) {
-            $counts[$delimiter] = [];
-        }
-
-        // Count how many times each of the potential delimiters appears in each line
-        $numberLines = 0;
-        while (($line = $this->getNextLine()) !== false && (++$numberLines < 1000)) {
-            $countLine = [];
-            for ($i = strlen($line) - 1; $i >= 0; --$i) {
-                $char = $line[$i];
-                if (isset($counts[$char])) {
-                    if (!isset($countLine[$char])) {
-                        $countLine[$char] = 0;
-                    }
-                    ++$countLine[$char];
-                }
-            }
-            foreach ($potentialDelimiters as $delimiter) {
-                $counts[$delimiter][] = $countLine[$delimiter]
-                    ?? 0;
-            }
-        }
+        $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 ($numberLines === 0) {
-            $this->delimiter = reset($potentialDelimiters);
+        if ($inferenceEngine->linesCounted() === 0) {
+            $this->delimiter = $inferenceEngine->getDefaultDelimiter();
             $this->skipBOM();
 
             return;
         }
 
-        // Calculate the mean square deviations for each delimiter (ignoring delimiters that haven't been found consistently)
-        $meanSquareDeviations = [];
-        $middleIdx = floor(($numberLines - 1) / 2);
-
-        foreach ($potentialDelimiters as $delimiter) {
-            $series = $counts[$delimiter];
-            sort($series);
-
-            $median = ($numberLines % 2)
-                ? $series[$middleIdx]
-                : ($series[$middleIdx] + $series[$middleIdx + 1]) / 2;
-
-            if ($median === 0) {
-                continue;
-            }
-
-            $meanSquareDeviations[$delimiter] = array_reduce(
-                $series,
-                function ($sum, $value) use ($median) {
-                    return $sum + pow($value - $median, 2);
-                }
-            ) / count($series);
-        }
-
-        // ... and pick the delimiter with the smallest mean square deviation (in case of ties, the order in potentialDelimiters is respected)
-        $min = INF;
-        foreach ($potentialDelimiters as $delimiter) {
-            if (!isset($meanSquareDeviations[$delimiter])) {
-                continue;
-            }
-
-            if ($meanSquareDeviations[$delimiter] < $min) {
-                $min = $meanSquareDeviations[$delimiter];
-                $this->delimiter = $delimiter;
-            }
-        }
+        $this->delimiter = $inferenceEngine->infer();
 
         // If no delimiter could be detected, fall back to the default
         if ($this->delimiter === null) {
-            $this->delimiter = reset($potentialDelimiters);
+            $this->delimiter = $inferenceEngine->getDefaultDelimiter();
         }
 
         $this->skipBOM();
     }
 
-    /**
-     * Get the next full line from the file.
-     *
-     * @param string $line
-     *
-     * @return bool|string
-     */
-    private function getNextLine($line = '')
-    {
-        // Get the next line in the file
-        $newLine = fgets($this->fileHandle);
-
-        // Return false if there is no next line
-        if ($newLine === false) {
-            return false;
-        }
-
-        // Add the new line to the line passed in
-        $line = $line . $newLine;
-
-        // Drop everything that is enclosed to avoid counting false positives in enclosures
-        $enclosure = '(?<!' . preg_quote($this->escapeCharacter, '/') . ')'
-            . preg_quote($this->enclosure, '/');
-        $line = 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
-        if (preg_match('/(' . $enclosure . ')/', $line) > 0) {
-            $line = $this->getNextLine($line);
-        }
-
-        return $line;
-    }
-
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
         // Open file
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
-        }
-        $this->openFile($pFilename);
+        $this->openFileOrMemory($filename);
         $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
@@ -298,9 +248,11 @@ class Csv extends BaseReader
         $worksheetInfo[0]['totalColumns'] = 0;
 
         // Loop through each line of the file in turn
-        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure, $this->escapeCharacter)) !== false) {
+        $rowData = self::getCsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+        while (is_array($rowData)) {
             ++$worksheetInfo[0]['totalRows'];
             $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
+            $rowData = self::getCsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
         }
 
         $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
@@ -314,42 +266,117 @@ class Csv extends BaseReader
 
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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);
+    }
+
+    /**
+     * Loads Spreadsheet from string.
+     */
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadStringOrFile('data://text/plain,' . urlencode($contents), $spreadsheet, true);
+    }
+
+    private function openFileOrMemory(string $filename): void
+    {
+        // Open file
+        $fhandle = $this->canRead($filename);
+        if (!$fhandle) {
+            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        }
+        if ($this->inputEncoding === self::GUESS_ENCODING) {
+            $this->inputEncoding = self::guessEncoding($filename, $this->fallbackEncoding);
+        }
+        $this->openFile($filename);
+        if ($this->inputEncoding !== 'UTF-8') {
+            fclose($this->fileHandle);
+            $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();
+            }
+        }
+    }
+
+    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.
-     *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
-        $lineEnding = ini_get('auto_detect_line_endings');
-        ini_set('auto_detect_line_endings', true);
+        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
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+        if ($dataUri) {
+            $this->openDataUri($filename);
+        } else {
+            $this->openFileOrMemory($filename);
         }
-        $this->openFile($pFilename);
         $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
@@ -365,83 +392,118 @@ class Csv extends BaseReader
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;
-        if ($this->contiguous) {
-            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow() : $this->contiguousRow;
-        }
+        $outRow = 0;
 
         // Loop through each line of the file in turn
-        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure, $this->escapeCharacter)) !== false) {
+        $rowData = self::getCsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+        $valueBinder = Cell::getValueBinder();
+        $preserveBooleanString = method_exists($valueBinder, 'getBooleanConversion') && $valueBinder->getBooleanConversion();
+        while (is_array($rowData)) {
+            $noOutputYet = true;
             $columnLetter = 'A';
             foreach ($rowData as $rowDatum) {
-                if ($rowDatum != '' && $this->readFilter->readCell($columnLetter, $currentRow)) {
-                    // Convert encoding if necessary
-                    if ($this->inputEncoding !== 'UTF-8') {
-                        $rowDatum = StringHelper::convertEncoding($rowDatum, 'UTF-8', $this->inputEncoding);
+                $this->convertBoolean($rowDatum, $preserveBooleanString);
+                $numberFormatMask = $this->convertFormattedNumber($rowDatum);
+                if (($rowDatum !== '' || $this->preserveNullString) && $this->readFilter->readCell($columnLetter, $currentRow)) {
+                    if ($this->contiguous) {
+                        if ($noOutputYet) {
+                            $noOutputYet = false;
+                            ++$outRow;
+                        }
+                    } else {
+                        $outRow = $currentRow;
                     }
-
+                    // Set basic styling for the value (Note that this could be overloaded by styling in a value binder)
+                    $sheet->getCell($columnLetter . $outRow)->getStyle()
+                        ->getNumberFormat()
+                        ->setFormatCode($numberFormatMask);
                     // Set cell value
-                    $sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+                    $sheet->getCell($columnLetter . $outRow)->setValue($rowDatum);
                 }
                 ++$columnLetter;
             }
+            $rowData = self::getCsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
             ++$currentRow;
         }
 
         // Close file
         fclose($fileHandle);
 
-        if ($this->contiguous) {
-            $this->contiguousRow = $currentRow;
-        }
-
-        ini_set('auto_detect_line_endings', $lineEnding);
+        $this->setAutoDetect($iniset);
 
         // Return
         return $spreadsheet;
     }
 
     /**
-     * Get delimiter.
+     * Convert string true/false to boolean, and null to null-string.
      *
-     * @return string
+     * @param mixed $rowDatum
      */
-    public function getDelimiter()
+    private function convertBoolean(&$rowDatum, bool $preserveBooleanString): void
+    {
+        if (is_string($rowDatum) && !$preserveBooleanString) {
+            if (strcasecmp(Calculation::getTRUE(), $rowDatum) === 0 || strcasecmp('true', $rowDatum) === 0) {
+                $rowDatum = true;
+            } elseif (strcasecmp(Calculation::getFALSE(), $rowDatum) === 0 || strcasecmp('false', $rowDatum) === 0) {
+                $rowDatum = false;
+            }
+        } else {
+            $rowDatum = $rowDatum ?? '';
+        }
+    }
+
+    /**
+     * Convert numeric strings to int or float values.
+     *
+     * @param mixed $rowDatum
+     */
+    private function convertFormattedNumber(&$rowDatum): string
+    {
+        $numberFormatMask = NumberFormat::FORMAT_GENERAL;
+        if ($this->castFormattedNumberToNumeric === true && is_string($rowDatum)) {
+            $numeric = str_replace(
+                [StringHelper::getThousandsSeparator(), StringHelper::getDecimalSeparator()],
+                ['', '.'],
+                $rowDatum
+            );
+
+            if (is_numeric($numeric)) {
+                $decimalPos = strpos($rowDatum, StringHelper::getDecimalSeparator());
+                if ($this->preserveNumericFormatting === true) {
+                    $numberFormatMask = (strpos($rowDatum, StringHelper::getThousandsSeparator()) !== false)
+                        ? '#,##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;
     }
 
-    /**
-     * Set delimiter.
-     *
-     * @param string $delimiter Delimiter, eg: ','
-     *
-     * @return $this
-     */
-    public function setDelimiter($delimiter)
+    public function setDelimiter(?string $delimiter): self
     {
         $this->delimiter = $delimiter;
 
         return $this;
     }
 
-    /**
-     * Get enclosure.
-     *
-     * @return string
-     */
-    public function getEnclosure()
+    public function getEnclosure(): string
     {
         return $this->enclosure;
     }
 
-    /**
-     * Set enclosure.
-     *
-     * @param string $enclosure Enclosure, defaults to "
-     *
-     * @return $this
-     */
-    public function setEnclosure($enclosure)
+    public function setEnclosure(string $enclosure): self
     {
         if ($enclosure == '') {
             $enclosure = '"';
@@ -451,108 +513,71 @@ class Csv extends BaseReader
         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 $indexValue): self
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $indexValue;
 
         return $this;
     }
 
-    /**
-     * Set Contiguous.
-     *
-     * @param bool $contiguous
-     *
-     * @return $this
-     */
-    public function setContiguous($contiguous)
+    public function setContiguous(bool $contiguous): self
     {
-        $this->contiguous = (bool) $contiguous;
-        if (!$contiguous) {
-            $this->contiguousRow = -1;
-        }
+        $this->contiguous = $contiguous;
 
         return $this;
     }
 
-    /**
-     * Get Contiguous.
-     *
-     * @return bool
-     */
-    public function getContiguous()
+    public function getContiguous(): bool
     {
         return $this->contiguous;
     }
 
     /**
-     * Set escape backslashes.
-     *
-     * @param string $escapeCharacter
-     *
-     * @return $this
+     * 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($escapeCharacter)
+    public function setEscapeCharacter(string $escapeCharacter): self
     {
         $this->escapeCharacter = $escapeCharacter;
 
         return $this;
     }
 
-    /**
-     * Get escape backslashes.
-     *
-     * @return string
-     */
-    public function getEscapeCharacter()
+    public function getEscapeCharacter(): string
     {
-        return $this->escapeCharacter;
+        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 (Exception $e) {
+            $this->openFile($filename);
+        } catch (ReaderException $e) {
             return false;
         }
 
         fclose($this->fileHandle);
 
         // Trust file extension if any
-        $extension = strtolower(pathinfo($pFilename, PATHINFO_EXTENSION));
+        $extension = strtolower(/** @scrutinizer ignore-type */ 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',
@@ -560,4 +585,98 @@ class Csv extends BaseReader
 
         return in_array($type, $supportedTypes, true);
     }
+
+    private static function guessEncodingTestNoBom(string &$encoding, string &$contents, string $compare, string $setEncoding): void
+    {
+        if ($encoding === '') {
+            $pos = strpos($contents, $compare);
+            if ($pos !== false && $pos % strlen($compare) === 0) {
+                $encoding = $setEncoding;
+            }
+        }
+    }
+
+    private static function guessEncodingNoBom(string $filename): string
+    {
+        $encoding = '';
+        $contents = file_get_contents($filename);
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF32BE_LF, 'UTF-32BE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF32LE_LF, 'UTF-32LE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF16BE_LF, 'UTF-16BE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF16LE_LF, 'UTF-16LE');
+        if ($encoding === '' && preg_match('//u', $contents) === 1) {
+            $encoding = 'UTF-8';
+        }
+
+        return $encoding;
+    }
+
+    private static function guessEncodingTestBom(string &$encoding, string $first4, string $compare, string $setEncoding): void
+    {
+        if ($encoding === '') {
+            if ($compare === substr($first4, 0, strlen($compare))) {
+                $encoding = $setEncoding;
+            }
+        }
+    }
+
+    private static function guessEncodingBom(string $filename): string
+    {
+        $encoding = '';
+        $first4 = file_get_contents($filename, false, null, 0, 4);
+        if ($first4 !== false) {
+            self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF32BE_BOM, 'UTF-32BE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF32LE_BOM, 'UTF-32LE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF16LE_BOM, 'UTF-16LE');
+        }
+
+        return $encoding;
+    }
+
+    public static function guessEncoding(string $filename, string $dflt = self::DEFAULT_FALLBACK_ENCODING): string
+    {
+        $encoding = self::guessEncodingBom($filename);
+        if ($encoding === '') {
+            $encoding = self::guessEncodingNoBom($filename);
+        }
+
+        return ($encoding === '') ? $dflt : $encoding;
+    }
+
+    public function setPreserveNullString(bool $value): self
+    {
+        $this->preserveNullString = $value;
+
+        return $this;
+    }
+
+    public function getPreserveNullString(): bool
+    {
+        return $this->preserveNullString;
+    }
+
+    /**
+     * Php8.4 deprecates use of anything other than null string
+     * as escape Character.
+     *
+     * @param resource $stream
+     *
+     * @return array<int,?string>|false
+     */
+    private static function getCsv(
+        $stream,
+        ?int $length = null,
+        string $separator = ',',
+        string $enclosure = '"',
+        ?string $escape = null
+    ) {
+        $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
new file mode 100644
index 000000000..029d4a186
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Csv;
+
+class Delimiter
+{
+    protected const POTENTIAL_DELIMETERS = [',', ';', "\t", '|', ':', ' ', '~'];
+
+    /** @var resource */
+    protected $fileHandle;
+
+    /** @var string */
+    protected $escapeCharacter;
+
+    /** @var string */
+    protected $enclosure;
+
+    /** @var array */
+    protected $counts = [];
+
+    /** @var int */
+    protected $numberLines = 0;
+
+    /** @var ?string */
+    protected $delimiter;
+
+    /**
+     * @param resource $fileHandle
+     */
+    public function __construct($fileHandle, string $escapeCharacter, string $enclosure)
+    {
+        $this->fileHandle = $fileHandle;
+        $this->escapeCharacter = $escapeCharacter;
+        $this->enclosure = $enclosure;
+
+        $this->countPotentialDelimiters();
+    }
+
+    public function getDefaultDelimiter(): string
+    {
+        return self::POTENTIAL_DELIMETERS[0];
+    }
+
+    public function linesCounted(): int
+    {
+        return $this->numberLines;
+    }
+
+    protected function countPotentialDelimiters(): void
+    {
+        $this->counts = array_fill_keys(self::POTENTIAL_DELIMETERS, []);
+        $delimiterKeys = array_flip(self::POTENTIAL_DELIMETERS);
+
+        // Count how many times each of the potential delimiters appears in each line
+        $this->numberLines = 0;
+        while (($line = $this->getNextLine()) !== false && (++$this->numberLines < 1000)) {
+            $this->countDelimiterValues($line, $delimiterKeys);
+        }
+    }
+
+    protected function countDelimiterValues(string $line, array $delimiterKeys): void
+    {
+        $splitString = str_split($line, 1);
+        if (is_array($splitString)) {
+            $distribution = array_count_values($splitString);
+            $countLine = array_intersect_key($distribution, $delimiterKeys);
+
+            foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+                $this->counts[$delimiter][] = $countLine[$delimiter] ?? 0;
+            }
+        }
+    }
+
+    public function infer(): ?string
+    {
+        // Calculate the mean square deviations for each delimiter
+        //     (ignoring delimiters that haven't been found consistently)
+        $meanSquareDeviations = [];
+        $middleIdx = floor(($this->numberLines - 1) / 2);
+
+        foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+            $series = $this->counts[$delimiter];
+            sort($series);
+
+            $median = ($this->numberLines % 2)
+                ? $series[$middleIdx]
+                : ($series[$middleIdx] + $series[$middleIdx + 1]) / 2;
+
+            if ($median === 0) {
+                continue;
+            }
+
+            $meanSquareDeviations[$delimiter] = array_reduce(
+                $series,
+                function ($sum, $value) use ($median) {
+                    return $sum + ($value - $median) ** 2;
+                }
+            ) / count($series);
+        }
+
+        // ... and pick the delimiter with the smallest mean square deviation
+        //         (in case of ties, the order in potentialDelimiters is respected)
+        $min = INF;
+        foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+            if (!isset($meanSquareDeviations[$delimiter])) {
+                continue;
+            }
+
+            if ($meanSquareDeviations[$delimiter] < $min) {
+                $min = $meanSquareDeviations[$delimiter];
+                $this->delimiter = $delimiter;
+            }
+        }
+
+        return $this->delimiter;
+    }
+
+    /**
+     * Get the next full line from the file.
+     *
+     * @return false|string
+     */
+    public function getNextLine()
+    {
+        $line = '';
+        $enclosure = ($this->escapeCharacter === '' ? ''
+                : ('(?<!' . preg_quote($this->escapeCharacter, '/') . ')'))
+            . preg_quote($this->enclosure, '/');
+
+        do {
+            // Get the next line in the file
+            $newLine = fgets($this->fileHandle);
+
+            // Return false if there is no next line
+            if ($newLine === false) {
+                return false;
+            }
+
+            // Add the new line to the line passed in
+            $line = $line . $newLine;
+
+            // Drop everything that is enclosed to avoid counting false positives in enclosures
+            $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);
+
+        return ($line !== '') ? $line : false;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
index e104186ab..8fdb162b4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
@@ -7,13 +7,13 @@ 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($columnAddress, $row, $worksheetName = '')
     {
         return true;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
index 44ab701d1..99e4d6ad6 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -4,24 +4,36 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\PageSetup;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\Styles;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Settings;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-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\Worksheet\Worksheet;
+use SimpleXMLElement;
 use XMLReader;
 
 class Gnumeric extends BaseReader
 {
+    const NAMESPACE_GNM = 'http://www.gnumeric.org/v10.dtd'; // gmr in old sheets
+
+    const NAMESPACE_XSI = 'http://www.w3.org/2001/XMLSchema-instance';
+
+    const NAMESPACE_OFFICE = 'urn:oasis:names:tc:opendocument:xmlns:office:1.0';
+
+    const NAMESPACE_XLINK = 'http://www.w3.org/1999/xlink';
+
+    const NAMESPACE_DC = 'http://purl.org/dc/elements/1.1/';
+
+    const NAMESPACE_META = 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0';
+
+    const NAMESPACE_OOO = 'http://openoffice.org/2004/office';
+
     /**
      * Shared Expressions.
      *
@@ -29,8 +41,30 @@ class Gnumeric extends BaseReader
      */
     private $expressions = [];
 
+    /**
+     * Spreadsheet shared across all functions.
+     *
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    /** @var ReferenceHelper */
     private $referenceHelper;
 
+    /** @var array */
+    public static $mappings = [
+        'dataType' => [
+            '10' => DataType::TYPE_NULL,
+            '20' => DataType::TYPE_BOOL,
+            '30' => DataType::TYPE_NUMERIC, // Integer doesn't exist in Excel
+            '40' => DataType::TYPE_NUMERIC, // Float
+            '50' => DataType::TYPE_ERROR,
+            '60' => DataType::TYPE_STRING,
+            //'70':        //    Cell Range
+            //'80':        //    Array
+        ],
+    ];
+
     /**
      * Create a new Gnumeric.
      */
@@ -43,51 +77,52 @@ class Gnumeric extends BaseReader
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
-        File::assertFile($pFilename);
-
-        // Check if gzlib functions are available
-        if (!function_exists('gzread')) {
-            throw new Exception('gzlib library is not enabled');
+        $data = null;
+        if (File::testFileNoThrow($filename)) {
+            $data = $this->gzfileGetContents($filename);
+            if (strpos($data, self::NAMESPACE_GNM) === false) {
+                $data = '';
+            }
         }
 
-        // Read signature data (first 3 bytes)
-        $fh = fopen($pFilename, 'r');
-        $data = fread($fh, 2);
-        fclose($fh);
+        return !empty($data);
+    }
 
-        return $data == chr(0x1F) . chr(0x8B);
+    private static function matchXml(XMLReader $xml, string $expectedLocalName): bool
+    {
+        return $xml->namespaceURI === self::NAMESPACE_GNM
+            && $xml->localName === $expectedLocalName
+            && $xml->nodeType === XMLReader::ELEMENT;
     }
 
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
      *
-     * @param string $pFilename
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames($filename)
     {
-        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 = [];
         while ($xml->read()) {
-            if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
+            if (self::matchXml($xml, 'SheetName')) {
                 $xml->read(); //    Move onto the value node
                 $worksheetNames[] = (string) $xml->value;
-            } elseif ($xml->name == 'gnm:Sheets') {
+            } elseif (self::matchXml($xml, 'Sheets')) {
                 //    break out of the loop once we've got our sheet names rather than parse the entire file
                 break;
             }
@@ -99,21 +134,25 @@ class Gnumeric extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
-        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 = [];
         while ($xml->read()) {
-            if ($xml->name == 'gnm:Sheet' && $xml->nodeType == XMLReader::ELEMENT) {
+            if (self::matchXml($xml, 'Sheet')) {
                 $tmpInfo = [
                     'worksheetName' => '',
                     'lastColumnLetter' => 'A',
@@ -123,14 +162,14 @@ class Gnumeric extends BaseReader
                 ];
 
                 while ($xml->read()) {
-                    if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
+                    if (self::matchXml($xml, 'Name')) {
                         $xml->read(); //    Move onto the value node
                         $tmpInfo['worksheetName'] = (string) $xml->value;
-                    } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
+                    } elseif (self::matchXml($xml, 'MaxCol')) {
                         $xml->read(); //    Move onto the value node
                         $tmpInfo['lastColumnIndex'] = (int) $xml->value;
                         $tmpInfo['totalColumns'] = (int) $xml->value + 1;
-                    } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
+                    } elseif (self::matchXml($xml, 'MaxRow')) {
                         $xml->read(); //    Move onto the value node
                         $tmpInfo['totalRows'] = (int) $xml->value + 1;
 
@@ -152,248 +191,125 @@ class Gnumeric extends BaseReader
      */
     private function gzfileGetContents($filename)
     {
-        $file = @gzopen($filename, 'rb');
         $data = '';
-        if ($file !== false) {
-            while (!gzeof($file)) {
-                $data .= gzread($file, 1024);
+        $contents = @file_get_contents($filename);
+        if ($contents !== false) {
+            if (substr($contents, 0, 2) === "\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;
     }
 
+    public static function gnumericMappings(): array
+    {
+        return array_merge(self::$mappings, Styles::$mappings);
+    }
+
+    private function processComments(SimpleXMLElement $sheet): void
+    {
+        if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
+            foreach ($sheet->Objects->children(self::NAMESPACE_GNM) as $key => $comment) {
+                $commentAttributes = $comment->attributes();
+                //    Only comment objects are handled at the moment
+                if ($commentAttributes && $commentAttributes->Text) {
+                    $this->spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)
+                        ->setAuthor((string) $commentAttributes->Author)
+                        ->setText($this->parseRichText((string) $commentAttributes->Text));
+                }
+            }
+        }
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function testSimpleXml($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
-     *
-     * @throws Exception
-     *
-     * @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.
-     *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
-        File::assertFile($pFilename);
-
-        $gFileData = $this->gzfileGetContents($pFilename);
-
-        $xml = simplexml_load_string($this->securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
-        $namespacesMeta = $xml->getNamespaces(true);
-
-        $gnmXML = $xml->children($namespacesMeta['gnm']);
-
-        $docProps = $spreadsheet->getProperties();
-        //    Document Properties are held differently, depending on the version of Gnumeric
-        if (isset($namespacesMeta['office'])) {
-            $officeXML = $xml->children($namespacesMeta['office']);
-            $officeDocXML = $officeXML->{'document-meta'};
-            $officeDocMetaXML = $officeDocXML->meta;
-
-            foreach ($officeDocMetaXML as $officePropertyData) {
-                $officePropertyDC = [];
-                if (isset($namespacesMeta['dc'])) {
-                    $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-                }
-                foreach ($officePropertyDC as $propertyName => $propertyValue) {
-                    $propertyValue = (string) $propertyValue;
-                    switch ($propertyName) {
-                        case 'title':
-                            $docProps->setTitle(trim($propertyValue));
-
-                            break;
-                        case 'subject':
-                            $docProps->setSubject(trim($propertyValue));
-
-                            break;
-                        case 'creator':
-                            $docProps->setCreator(trim($propertyValue));
-                            $docProps->setLastModifiedBy(trim($propertyValue));
-
-                            break;
-                        case 'date':
-                            $creationDate = strtotime(trim($propertyValue));
-                            $docProps->setCreated($creationDate);
-                            $docProps->setModified($creationDate);
-
-                            break;
-                        case 'description':
-                            $docProps->setDescription(trim($propertyValue));
-
-                            break;
-                    }
-                }
-                $officePropertyMeta = [];
-                if (isset($namespacesMeta['meta'])) {
-                    $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-                }
-                foreach ($officePropertyMeta as $propertyName => $propertyValue) {
-                    $attributes = $propertyValue->attributes($namespacesMeta['meta']);
-                    $propertyValue = (string) $propertyValue;
-                    switch ($propertyName) {
-                        case 'keyword':
-                            $docProps->setKeywords(trim($propertyValue));
-
-                            break;
-                        case 'initial-creator':
-                            $docProps->setCreator(trim($propertyValue));
-                            $docProps->setLastModifiedBy(trim($propertyValue));
-
-                            break;
-                        case 'creation-date':
-                            $creationDate = strtotime(trim($propertyValue));
-                            $docProps->setCreated($creationDate);
-                            $docProps->setModified($creationDate);
-
-                            break;
-                        case 'user-defined':
-                            [, $attrName] = explode(':', $attributes['name']);
-                            switch ($attrName) {
-                                case 'publisher':
-                                    $docProps->setCompany(trim($propertyValue));
-
-                                    break;
-                                case 'category':
-                                    $docProps->setCategory(trim($propertyValue));
-
-                                    break;
-                                case 'manager':
-                                    $docProps->setManager(trim($propertyValue));
-
-                                    break;
-                            }
-
-                            break;
-                    }
-                }
-            }
-        } elseif (isset($gnmXML->Summary)) {
-            foreach ($gnmXML->Summary->Item as $summaryItem) {
-                $propertyName = $summaryItem->name;
-                $propertyValue = $summaryItem->{'val-string'};
-                switch ($propertyName) {
-                    case 'title':
-                        $docProps->setTitle(trim($propertyValue));
-
-                        break;
-                    case 'comments':
-                        $docProps->setDescription(trim($propertyValue));
-
-                        break;
-                    case 'keywords':
-                        $docProps->setKeywords(trim($propertyValue));
-
-                        break;
-                    case 'category':
-                        $docProps->setCategory(trim($propertyValue));
-
-                        break;
-                    case 'manager':
-                        $docProps->setManager(trim($propertyValue));
-
-                        break;
-                    case 'author':
-                        $docProps->setCreator(trim($propertyValue));
-                        $docProps->setLastModifiedBy(trim($propertyValue));
-
-                        break;
-                    case 'company':
-                        $docProps->setCompany(trim($propertyValue));
-
-                        break;
-                }
-            }
+        $this->spreadsheet = $spreadsheet;
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
         }
 
+        $gFileData = $this->gzfileGetContents($filename);
+
+        $xml2 = simplexml_load_string($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;
             }
 
             $maxRow = $maxCol = 0;
 
             // Create new Worksheet
-            $spreadsheet->createSheet();
-            $spreadsheet->setActiveSheetIndex($worksheetID);
+            $this->spreadsheet->createSheet();
+            $this->spreadsheet->setActiveSheetIndex($worksheetID);
             //    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
-            $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+            $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
 
-            if ((!$this->readDataOnly) && (isset($sheet->PrintInformation))) {
-                if (isset($sheet->PrintInformation->Margins)) {
-                    foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
-                        $marginAttributes = $margin->attributes();
-                        $marginSize = 72 / 100; //    Default
-                        switch ($marginAttributes['PrefUnit']) {
-                            case 'mm':
-                                $marginSize = (int) ($marginAttributes['Points']) / 100;
-
-                                break;
-                        }
-                        switch ($key) {
-                            case 'top':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
-
-                                break;
-                            case 'bottom':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
-
-                                break;
-                            case 'left':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
-
-                                break;
-                            case 'right':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
-
-                                break;
-                            case 'header':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
-
-                                break;
-                            case 'footer':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
-
-                                break;
-                        }
-                    }
-                }
+            $visibility = $sheet->attributes()['Visibility'] ?? 'GNM_SHEET_VISIBILITY_VISIBLE';
+            if ((string) $visibility !== 'GNM_SHEET_VISIBILITY_VISIBLE') {
+                $this->spreadsheet->getActiveSheet()->setSheetState(Worksheet::SHEETSTATE_HIDDEN);
             }
 
-            foreach ($sheet->Cells->Cell as $cell) {
-                $cellAttributes = $cell->attributes();
+            if (!$this->readDataOnly) {
+                (new PageSetup($this->spreadsheet))
+                    ->printInformation($sheet)
+                    ->sheetMargins($sheet);
+            }
+
+            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);
 
@@ -404,472 +320,235 @@ class Gnumeric extends BaseReader
                     }
                 }
 
-                $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 {
-                    switch ($ValueType) {
-                        case '10':        //    NULL
-                            $type = DataType::TYPE_NULL;
-
-                            break;
-                        case '20':        //    Boolean
-                            $type = DataType::TYPE_BOOL;
-                            $cell = $cell == 'TRUE';
-
-                            break;
-                        case '30':        //    Integer
-                            $cell = (int) $cell;
-                            // Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
-                            // no break
-                        case '40':        //    Float
-                            $type = DataType::TYPE_NUMERIC;
-
-                            break;
-                        case '50':        //    Error
-                            $type = DataType::TYPE_ERROR;
-
-                            break;
-                        case '60':        //    String
-                            $type = DataType::TYPE_STRING;
-
-                            break;
-                        case '70':        //    Cell Range
-                        case '80':        //    Array
-                    }
-                }
-                $spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit($cell, $type);
+                $this->loadCell($cell, $worksheetName, $cellAttributes, $column, $row);
             }
 
-            if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
-                foreach ($sheet->Objects->children('gnm', true) as $key => $comment) {
-                    $commentAttributes = $comment->attributes();
-                    //    Only comment objects are handled at the moment
-                    if ($commentAttributes->Text) {
-                        $spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)->setAuthor((string) $commentAttributes->Author)->setText($this->parseRichText((string) $commentAttributes->Text));
-                    }
-                }
-            }
-            foreach ($sheet->Styles->StyleRegion as $styleRegion) {
-                $styleAttributes = $styleRegion->attributes();
-                if (($styleAttributes['startRow'] <= $maxRow) &&
-                    ($styleAttributes['startCol'] <= $maxCol)) {
-                    $startColumn = Coordinate::stringFromColumnIndex((int) $styleAttributes['startCol'] + 1);
-                    $startRow = $styleAttributes['startRow'] + 1;
-
-                    $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
-                    $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
-                    $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
-                    $endRow += 1;
-                    $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
-
-                    $styleAttributes = $styleRegion->Style->attributes();
-
-                    //    We still set the number format mask for date/time values, even if readDataOnly is true
-                    if ((!$this->readDataOnly) ||
-                        (Date::isDateTimeFormatCode((string) $styleAttributes['Format']))) {
-                        $styleArray = [];
-                        $styleArray['numberFormat']['formatCode'] = (string) $styleAttributes['Format'];
-                        //    If readDataOnly is false, we set all formatting information
-                        if (!$this->readDataOnly) {
-                            switch ($styleAttributes['HAlign']) {
-                                case '1':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_GENERAL;
-
-                                    break;
-                                case '2':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_LEFT;
-
-                                    break;
-                                case '4':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_RIGHT;
-
-                                    break;
-                                case '8':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_CENTER;
-
-                                    break;
-                                case '16':
-                                case '64':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_CENTER_CONTINUOUS;
-
-                                    break;
-                                case '32':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_JUSTIFY;
-
-                                    break;
-                            }
-
-                            switch ($styleAttributes['VAlign']) {
-                                case '1':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_TOP;
-
-                                    break;
-                                case '2':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_BOTTOM;
-
-                                    break;
-                                case '4':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_CENTER;
-
-                                    break;
-                                case '8':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_JUSTIFY;
-
-                                    break;
-                            }
-
-                            $styleArray['alignment']['wrapText'] = $styleAttributes['WrapText'] == '1';
-                            $styleArray['alignment']['shrinkToFit'] = $styleAttributes['ShrinkToFit'] == '1';
-                            $styleArray['alignment']['indent'] = ((int) ($styleAttributes['Indent']) > 0) ? $styleAttributes['indent'] : 0;
-
-                            $RGB = self::parseGnumericColour($styleAttributes['Fore']);
-                            $styleArray['font']['color']['rgb'] = $RGB;
-                            $RGB = self::parseGnumericColour($styleAttributes['Back']);
-                            $shade = $styleAttributes['Shade'];
-                            if (($RGB != '000000') || ($shade != '0')) {
-                                $styleArray['fill']['color']['rgb'] = $styleArray['fill']['startColor']['rgb'] = $RGB;
-                                $RGB2 = self::parseGnumericColour($styleAttributes['PatternColor']);
-                                $styleArray['fill']['endColor']['rgb'] = $RGB2;
-                                switch ($shade) {
-                                    case '1':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_SOLID;
-
-                                        break;
-                                    case '2':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_GRADIENT_LINEAR;
-
-                                        break;
-                                    case '3':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_GRADIENT_PATH;
-
-                                        break;
-                                    case '4':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKDOWN;
-
-                                        break;
-                                    case '5':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKGRAY;
-
-                                        break;
-                                    case '6':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKGRID;
-
-                                        break;
-                                    case '7':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKHORIZONTAL;
-
-                                        break;
-                                    case '8':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKTRELLIS;
-
-                                        break;
-                                    case '9':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKUP;
-
-                                        break;
-                                    case '10':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKVERTICAL;
-
-                                        break;
-                                    case '11':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_GRAY0625;
-
-                                        break;
-                                    case '12':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_GRAY125;
-
-                                        break;
-                                    case '13':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTDOWN;
-
-                                        break;
-                                    case '14':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTGRAY;
-
-                                        break;
-                                    case '15':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTGRID;
-
-                                        break;
-                                    case '16':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-
-                                        break;
-                                    case '17':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTTRELLIS;
-
-                                        break;
-                                    case '18':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTUP;
-
-                                        break;
-                                    case '19':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTVERTICAL;
-
-                                        break;
-                                    case '20':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_MEDIUMGRAY;
-
-                                        break;
-                                }
-                            }
-
-                            $fontAttributes = $styleRegion->Style->Font->attributes();
-                            $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
-                            $styleArray['font']['size'] = (int) ($fontAttributes['Unit']);
-                            $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
-                            $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
-                            $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
-                            switch ($fontAttributes['Underline']) {
-                                case '1':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_SINGLE;
-
-                                    break;
-                                case '2':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_DOUBLE;
-
-                                    break;
-                                case '3':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_SINGLEACCOUNTING;
-
-                                    break;
-                                case '4':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_DOUBLEACCOUNTING;
-
-                                    break;
-                                default:
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_NONE;
-
-                                    break;
-                            }
-                            switch ($fontAttributes['Script']) {
-                                case '1':
-                                    $styleArray['font']['superscript'] = true;
-
-                                    break;
-                                case '-1':
-                                    $styleArray['font']['subscript'] = true;
-
-                                    break;
-                            }
-
-                            if (isset($styleRegion->Style->StyleBorder)) {
-                                if (isset($styleRegion->Style->StyleBorder->Top)) {
-                                    $styleArray['borders']['top'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-                                    $styleArray['borders']['bottom'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Left)) {
-                                    $styleArray['borders']['left'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Right)) {
-                                    $styleArray['borders']['right'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
-                                }
-                                if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
-                                } elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
-                                } elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
-                                }
-                            }
-                            if (isset($styleRegion->Style->HyperLink)) {
-                                //    TO DO
-                                $hyperlink = $styleRegion->Style->HyperLink->attributes();
-                            }
-                        }
-                        $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
-                    }
-                }
+            if ($sheet->Styles !== null) {
+                (new Styles($this->spreadsheet, $this->readDataOnly))->read($sheet, $maxRow, $maxCol);
             }
 
-            if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
-                //    Column Widths
-                $columnAttributes = $sheet->Cols->attributes();
-                $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
-                $c = 0;
-                foreach ($sheet->Cols->ColInfo as $columnOverride) {
-                    $columnAttributes = $columnOverride->attributes();
-                    $column = $columnAttributes['No'];
-                    $columnWidth = $columnAttributes['Unit'] / 5.4;
-                    $hidden = (isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1');
-                    $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
-                    while ($c < $column) {
-                        $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
-                        ++$c;
-                    }
-                    while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
-                        $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($columnWidth);
-                        if ($hidden) {
-                            $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setVisible(false);
-                        }
-                        ++$c;
-                    }
-                }
-                while ($c <= $maxCol) {
-                    $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
-                    ++$c;
-                }
-            }
-
-            if ((!$this->readDataOnly) && (isset($sheet->Rows))) {
-                //    Row Heights
-                $rowAttributes = $sheet->Rows->attributes();
-                $defaultHeight = $rowAttributes['DefaultSizePts'];
-                $r = 0;
-
-                foreach ($sheet->Rows->RowInfo as $rowOverride) {
-                    $rowAttributes = $rowOverride->attributes();
-                    $row = $rowAttributes['No'];
-                    $rowHeight = $rowAttributes['Unit'];
-                    $hidden = (isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1');
-                    $rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
-                    while ($r < $row) {
-                        ++$r;
-                        $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-                    }
-                    while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
-                        ++$r;
-                        $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
-                        if ($hidden) {
-                            $spreadsheet->getActiveSheet()->getRowDimension($r)->setVisible(false);
-                        }
-                    }
-                }
-                while ($r < $maxRow) {
-                    ++$r;
-                    $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-                }
-            }
-
-            //    Handle Merged Cells in this worksheet
-            if (isset($sheet->MergedRegions)) {
-                foreach ($sheet->MergedRegions->Merge as $mergeCells) {
-                    if (strpos($mergeCells, ':') !== false) {
-                        $spreadsheet->getActiveSheet()->mergeCells($mergeCells);
-                    }
-                }
-            }
+            $this->processComments($sheet);
+            $this->processColumnWidths($sheet, $maxCol);
+            $this->processRowHeights($sheet, $maxRow);
+            $this->processMergedCells($sheet);
+            $this->processAutofilter($sheet);
 
+            $this->setSelectedCells($sheet);
             ++$worksheetID;
         }
 
-        //    Loop through definedNames (global named ranges)
-        if (isset($gnmXML->Names)) {
-            foreach ($gnmXML->Names->Name as $namedRange) {
-                $name = (string) $namedRange->name;
-                $range = (string) $namedRange->value;
-                if (stripos($range, '#REF!') !== false) {
-                    continue;
-                }
+        $this->processDefinedNames($gnmXML);
 
-                $range = Worksheet::extractSheetTitle($range, true);
-                $range[0] = trim($range[0], "'");
-                if ($worksheet = $spreadsheet->getSheetByName($range[0])) {
-                    $extractedRange = str_replace('$', '', $range[1]);
-                    $spreadsheet->addNamedRange(new NamedRange($name, $worksheet, $extractedRange));
+        $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((string) $mergeCells, ':') !== false) {
+                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
-
-        // Return
-        return $spreadsheet;
     }
 
-    private static function parseBorderAttributes($borderAttributes)
+    private function processAutofilter(?SimpleXMLElement $sheet): void
     {
-        $styleArray = [];
-        if (isset($borderAttributes['Color'])) {
-            $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes['Color']);
+        if ($sheet !== null && isset($sheet->Filters)) {
+            foreach ($sheet->Filters->Filter as $autofilter) {
+                if ($autofilter !== null) {
+                    $attributes = $autofilter->attributes();
+                    if (isset($attributes['Area'])) {
+                        $this->spreadsheet->getActiveSheet()->setAutoFilter((string) $attributes['Area']);
+                    }
+                }
+            }
         }
-
-        switch ($borderAttributes['Style']) {
-            case '0':
-                $styleArray['borderStyle'] = Border::BORDER_NONE;
-
-                break;
-            case '1':
-                $styleArray['borderStyle'] = Border::BORDER_THIN;
-
-                break;
-            case '2':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUM;
-
-                break;
-            case '3':
-                $styleArray['borderStyle'] = Border::BORDER_SLANTDASHDOT;
-
-                break;
-            case '4':
-                $styleArray['borderStyle'] = Border::BORDER_DASHED;
-
-                break;
-            case '5':
-                $styleArray['borderStyle'] = Border::BORDER_THICK;
-
-                break;
-            case '6':
-                $styleArray['borderStyle'] = Border::BORDER_DOUBLE;
-
-                break;
-            case '7':
-                $styleArray['borderStyle'] = Border::BORDER_DOTTED;
-
-                break;
-            case '8':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHED;
-
-                break;
-            case '9':
-                $styleArray['borderStyle'] = Border::BORDER_DASHDOT;
-
-                break;
-            case '10':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOT;
-
-                break;
-            case '11':
-                $styleArray['borderStyle'] = Border::BORDER_DASHDOTDOT;
-
-                break;
-            case '12':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOTDOT;
-
-                break;
-            case '13':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOTDOT;
-
-                break;
-        }
-
-        return $styleArray;
     }
 
-    private function parseRichText($is)
+    private function setColumnWidth(int $whichColumn, float $defaultWidth): void
+    {
+        $columnDimension = $this->spreadsheet->getActiveSheet()
+            ->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
+        if ($columnDimension !== null) {
+            $columnDimension->setWidth($defaultWidth);
+        }
+    }
+
+    private function setColumnInvisible(int $whichColumn): void
+    {
+        $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
+    {
+        $columnOverride = self::testSimpleXml($columnOverride);
+        $columnAttributes = self::testSimpleXml($columnOverride->attributes());
+        $column = $columnAttributes['No'];
+        $columnWidth = ((float) $columnAttributes['Unit']) / 5.4;
+        $hidden = (isset($columnAttributes['Hidden'])) && ((string) $columnAttributes['Hidden'] == '1');
+        $columnCount = (int) ($columnAttributes['Count'] ?? 1);
+        while ($whichColumn < $column) {
+            $this->setColumnWidth($whichColumn, $defaultWidth);
+            ++$whichColumn;
+        }
+        while (($whichColumn < ($column + $columnCount)) && ($whichColumn <= $maxCol)) {
+            $this->setColumnWidth($whichColumn, $columnWidth);
+            if ($hidden) {
+                $this->setColumnInvisible($whichColumn);
+            }
+            ++$whichColumn;
+        }
+
+        return $whichColumn;
+    }
+
+    private function processColumnWidths(?SimpleXMLElement $sheet, int $maxCol): void
+    {
+        if ((!$this->readDataOnly) && $sheet !== null && (isset($sheet->Cols))) {
+            //    Column Widths
+            $defaultWidth = 0;
+            $columnAttributes = $sheet->Cols->attributes();
+            if ($columnAttributes !== null) {
+                $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
+            }
+            $whichColumn = 0;
+            foreach ($sheet->Cols->ColInfo as $columnOverride) {
+                $whichColumn = $this->processColumnLoop($whichColumn, $maxCol, $columnOverride, $defaultWidth);
+            }
+            while ($whichColumn <= $maxCol) {
+                $this->setColumnWidth($whichColumn, $defaultWidth);
+                ++$whichColumn;
+            }
+        }
+    }
+
+    private function setRowHeight(int $whichRow, float $defaultHeight): void
+    {
+        $rowDimension = $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow);
+        if ($rowDimension !== null) {
+            $rowDimension->setRowHeight($defaultHeight);
+        }
+    }
+
+    private function setRowInvisible(int $whichRow): void
+    {
+        $rowDimension = $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow);
+        if ($rowDimension !== null) {
+            $rowDimension->setVisible(false);
+        }
+    }
+
+    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'];
+        $hidden = (isset($rowAttributes['Hidden'])) && ((string) $rowAttributes['Hidden'] == '1');
+        $rowCount = (int) ($rowAttributes['Count'] ?? 1);
+        while ($whichRow < $row) {
+            ++$whichRow;
+            $this->setRowHeight($whichRow, $defaultHeight);
+        }
+        while (($whichRow < ($row + $rowCount)) && ($whichRow < $maxRow)) {
+            ++$whichRow;
+            $this->setRowHeight($whichRow, $rowHeight);
+            if ($hidden) {
+                $this->setRowInvisible($whichRow);
+            }
+        }
+
+        return $whichRow;
+    }
+
+    private function processRowHeights(?SimpleXMLElement $sheet, int $maxRow): void
+    {
+        if ((!$this->readDataOnly) && $sheet !== null && (isset($sheet->Rows))) {
+            //    Row Heights
+            $defaultHeight = 0;
+            $rowAttributes = $sheet->Rows->attributes();
+            if ($rowAttributes !== null) {
+                $defaultHeight = (float) $rowAttributes['DefaultSizePts'];
+            }
+            $whichRow = 0;
+
+            foreach ($sheet->Rows->RowInfo as $rowOverride) {
+                $whichRow = $this->processRowLoop($whichRow, $maxRow, $rowOverride, $defaultHeight);
+            }
+            // never executed, I can't figure out any circumstances
+            // under which it would be executed, and, even if
+            // such exist, I'm not convinced this is needed.
+            //while ($whichRow < $maxRow) {
+            //    ++$whichRow;
+            //    $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow)->setRowHeight($defaultHeight);
+            //}
+        }
+    }
+
+    private function processDefinedNames(?SimpleXMLElement $gnmXML): void
+    {
+        //    Loop through definedNames (global named ranges)
+        if ($gnmXML !== null && isset($gnmXML->Names)) {
+            foreach ($gnmXML->Names->Name as $definedName) {
+                $name = (string) $definedName->name;
+                $value = (string) $definedName->value;
+                if (stripos($value, '#REF!') !== false) {
+                    continue;
+                }
+
+                [$worksheetName] = Worksheet::extractSheetTitle($value, true);
+                $worksheetName = trim($worksheetName, "'");
+                $worksheet = $this->spreadsheet->getSheetByName($worksheetName);
+                // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+                if ($worksheet !== null) {
+                    $this->spreadsheet->addDefinedName(DefinedName::createInstance($name, $worksheet, $value));
+                }
+            }
+        }
+    }
+
+    private function parseRichText(string $is): RichText
     {
         $value = new RichText();
         $value->createText($is);
@@ -877,13 +556,50 @@ class Gnumeric extends BaseReader
         return $value;
     }
 
-    private static function parseGnumericColour($gnmColour)
-    {
-        [$gnmR, $gnmG, $gnmB] = explode(':', $gnmColour);
-        $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
-        $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
-        $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
+    private function loadCell(
+        SimpleXMLElement $cell,
+        string $worksheetName,
+        SimpleXMLElement $cellAttributes,
+        string $column,
+        int $row
+    ): void {
+        $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];
 
-        return $gnmR . $gnmG . $gnmB;
+                $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);
+        if (isset($cellAttributes->ValueFormat)) {
+            $this->spreadsheet->getActiveSheet()->getCell($column . $row)
+                ->getStyle()->getNumberFormat()
+                ->setFormatCode((string) $cellAttributes->ValueFormat);
+        }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
new file mode 100644
index 000000000..0257fc9a4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup as WorksheetPageSetup;
+use SimpleXMLElement;
+
+class PageSetup
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function printInformation(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation[0])) {
+            $printInformation = $sheet->PrintInformation[0];
+            $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;
+            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;
+    }
+
+    public function sheetMargins(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
+            $marginSet = [
+                // Default Settings
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ];
+
+            $marginSet = $this->buildMarginSet($sheet, $marginSet);
+            $this->adjustMargins($marginSet);
+        }
+
+        return $this;
+    }
+
+    private function buildMarginSet(SimpleXMLElement $sheet, array $marginSet): array
+    {
+        foreach ($sheet->PrintInformation->Margins->children(Gnumeric::NAMESPACE_GNM) as $key => $margin) {
+            $marginAttributes = $margin->attributes();
+            $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
+            // Convert value in points to inches
+            $marginSize = PageMargins::fromPoints((float) $marginSize);
+            $marginSet[$key] = $marginSize;
+        }
+
+        return $marginSet;
+    }
+
+    private function adjustMargins(array $marginSet): void
+    {
+        foreach ($marginSet as $key => $marginSize) {
+            // Gnumeric is quirky in the way it displays the header/footer values:
+            //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
+            //    then top is actually the header value, and bottom is actually the footer value
+            switch ($key) {
+                case 'left':
+                case 'right':
+                    $this->sheetMargin($key, $marginSize);
+
+                    break;
+                case 'top':
+                    $this->sheetMargin($key, $marginSet['header'] ?? 0);
+
+                    break;
+                case 'bottom':
+                    $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+
+                    break;
+                case 'header':
+                    $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+
+                    break;
+                case 'footer':
+                    $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+
+                    break;
+            }
+        }
+    }
+
+    private function sheetMargin(string $key, float $marginSize): void
+    {
+        switch ($key) {
+            case 'top':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
+
+                break;
+            case 'bottom':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+
+                break;
+            case 'left':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+
+                break;
+            case 'right':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
+
+                break;
+            case 'header':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+
+                break;
+            case 'footer':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+
+                break;
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
new file mode 100644
index 000000000..23d4067b9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class Properties
+{
+    /**
+     * @var Spreadsheet
+     */
+    protected $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    private function docPropertiesOld(SimpleXMLElement $gnmXML): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($gnmXML->Summary->Item as $summaryItem) {
+            $propertyName = $summaryItem->name;
+            $propertyValue = $summaryItem->{'val-string'};
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle(trim($propertyValue));
+
+                    break;
+                case 'comments':
+                    $docProps->setDescription(trim($propertyValue));
+
+                    break;
+                case 'keywords':
+                    $docProps->setKeywords(trim($propertyValue));
+
+                    break;
+                case 'category':
+                    $docProps->setCategory(trim($propertyValue));
+
+                    break;
+                case 'manager':
+                    $docProps->setManager(trim($propertyValue));
+
+                    break;
+                case 'author':
+                    $docProps->setCreator(trim($propertyValue));
+                    $docProps->setLastModifiedBy(trim($propertyValue));
+
+                    break;
+                case 'company':
+                    $docProps->setCompany(trim($propertyValue));
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesDC(SimpleXMLElement $officePropertyDC): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyDC as $propertyName => $propertyValue) {
+            $propertyValue = trim((string) $propertyValue);
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle($propertyValue);
+
+                    break;
+                case 'subject':
+                    $docProps->setSubject($propertyValue);
+
+                    break;
+                case 'creator':
+                    $docProps->setCreator($propertyValue);
+                    $docProps->setLastModifiedBy($propertyValue);
+
+                    break;
+                case 'date':
+                    $creationDate = $propertyValue;
+                    $docProps->setModified($creationDate);
+
+                    break;
+                case 'description':
+                    $docProps->setDescription($propertyValue);
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesMeta(SimpleXMLElement $officePropertyMeta): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+            if ($propertyValue !== null) {
+                $attributes = $propertyValue->attributes(Gnumeric::NAMESPACE_META);
+                $propertyValue = trim((string) $propertyValue);
+                switch ($propertyName) {
+                    case 'keyword':
+                        $docProps->setKeywords($propertyValue);
+
+                        break;
+                    case 'initial-creator':
+                        $docProps->setCreator($propertyValue);
+                        $docProps->setLastModifiedBy($propertyValue);
+
+                        break;
+                    case 'creation-date':
+                        $creationDate = $propertyValue;
+                        $docProps->setCreated($creationDate);
+
+                        break;
+                    case 'user-defined':
+                        if ($attributes) {
+                            [, $attrName] = explode(':', (string) $attributes['name']);
+                            $this->userDefinedProperties($attrName, $propertyValue);
+                        }
+
+                        break;
+                }
+            }
+        }
+    }
+
+    private function userDefinedProperties(string $attrName, string $propertyValue): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        switch ($attrName) {
+            case 'publisher':
+                $docProps->setCompany($propertyValue);
+
+                break;
+            case 'category':
+                $docProps->setCategory($propertyValue);
+
+                break;
+            case 'manager':
+                $docProps->setManager($propertyValue);
+
+                break;
+        }
+    }
+
+    public function readProperties(SimpleXMLElement $xml, SimpleXMLElement $gnmXML): void
+    {
+        $officeXML = $xml->children(Gnumeric::NAMESPACE_OFFICE);
+        if (!empty($officeXML)) {
+            $officeDocXML = $officeXML->{'document-meta'};
+            $officeDocMetaXML = $officeDocXML->meta;
+
+            foreach ($officeDocMetaXML as $officePropertyData) {
+                $officePropertyDC = $officePropertyData->children(Gnumeric::NAMESPACE_DC);
+                $this->docPropertiesDC($officePropertyDC);
+
+                $officePropertyMeta = $officePropertyData->children(Gnumeric::NAMESPACE_META);
+                $this->docPropertiesMeta($officePropertyMeta);
+            }
+        } elseif (isset($gnmXML->Summary)) {
+            $this->docPropertiesOld($gnmXML);
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
new file mode 100644
index 000000000..dc44dcc23
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
@@ -0,0 +1,281 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+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 SimpleXMLElement;
+
+class Styles
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    /**
+     * @var bool
+     */
+    protected $readDataOnly = false;
+
+    /** @var array */
+    public static $mappings = [
+        'borderStyle' => [
+            '0' => Border::BORDER_NONE,
+            '1' => Border::BORDER_THIN,
+            '2' => Border::BORDER_MEDIUM,
+            '3' => Border::BORDER_SLANTDASHDOT,
+            '4' => Border::BORDER_DASHED,
+            '5' => Border::BORDER_THICK,
+            '6' => Border::BORDER_DOUBLE,
+            '7' => Border::BORDER_DOTTED,
+            '8' => Border::BORDER_MEDIUMDASHED,
+            '9' => Border::BORDER_DASHDOT,
+            '10' => Border::BORDER_MEDIUMDASHDOT,
+            '11' => Border::BORDER_DASHDOTDOT,
+            '12' => Border::BORDER_MEDIUMDASHDOTDOT,
+            '13' => Border::BORDER_MEDIUMDASHDOTDOT,
+        ],
+        'fillType' => [
+            '1' => Fill::FILL_SOLID,
+            '2' => Fill::FILL_PATTERN_DARKGRAY,
+            '3' => Fill::FILL_PATTERN_MEDIUMGRAY,
+            '4' => Fill::FILL_PATTERN_LIGHTGRAY,
+            '5' => Fill::FILL_PATTERN_GRAY125,
+            '6' => Fill::FILL_PATTERN_GRAY0625,
+            '7' => Fill::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            '8' => Fill::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            '9' => Fill::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            '10' => Fill::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            '11' => Fill::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            '12' => Fill::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            '13' => Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+            '14' => Fill::FILL_PATTERN_LIGHTVERTICAL,
+            '15' => Fill::FILL_PATTERN_LIGHTUP,
+            '16' => Fill::FILL_PATTERN_LIGHTDOWN,
+            '17' => Fill::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            '18' => Fill::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+        'horizontal' => [
+            '1' => Alignment::HORIZONTAL_GENERAL,
+            '2' => Alignment::HORIZONTAL_LEFT,
+            '4' => Alignment::HORIZONTAL_RIGHT,
+            '8' => Alignment::HORIZONTAL_CENTER,
+            '16' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+            '32' => Alignment::HORIZONTAL_JUSTIFY,
+            '64' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+        ],
+        'underline' => [
+            '1' => Font::UNDERLINE_SINGLE,
+            '2' => Font::UNDERLINE_DOUBLE,
+            '3' => Font::UNDERLINE_SINGLEACCOUNTING,
+            '4' => Font::UNDERLINE_DOUBLEACCOUNTING,
+        ],
+        'vertical' => [
+            '1' => Alignment::VERTICAL_TOP,
+            '2' => Alignment::VERTICAL_BOTTOM,
+            '4' => Alignment::VERTICAL_CENTER,
+            '8' => Alignment::VERTICAL_JUSTIFY,
+        ],
+    ];
+
+    public function __construct(Spreadsheet $spreadsheet, bool $readDataOnly)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->readDataOnly = $readDataOnly;
+    }
+
+    public function read(SimpleXMLElement $sheet, int $maxRow, int $maxCol): void
+    {
+        if ($sheet->Styles->StyleRegion !== null) {
+            $this->readStyles($sheet->Styles->StyleRegion, $maxRow, $maxCol);
+        }
+    }
+
+    private function readStyles(SimpleXMLElement $styleRegion, int $maxRow, int $maxCol): void
+    {
+        foreach ($styleRegion as $style) {
+            /** @scrutinizer ignore-call */
+            $styleAttributes = $style->attributes();
+            if ($styleAttributes !== null && ($styleAttributes['startRow'] <= $maxRow) && ($styleAttributes['startCol'] <= $maxCol)) {
+                $cellRange = $this->readStyleRange($styleAttributes, $maxCol, $maxRow);
+
+                $styleAttributes = $style->Style->attributes();
+
+                $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 = $styleAttributes ? (string) $styleAttributes['Format'] : null;
+                if ($formatCode && Date::isDateTimeFormatCode($formatCode)) {
+                    $styleArray['numberFormat']['formatCode'] = $formatCode;
+                }
+                if ($this->readDataOnly === false && $styleAttributes !== null) {
+                    //    If readDataOnly is false, we set all formatting information
+                    $styleArray['numberFormat']['formatCode'] = $formatCode;
+                    $styleArray = $this->readStyle($styleArray, $styleAttributes, /** @scrutinizer ignore-type */ $style);
+                }
+                $this->spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
+            }
+        }
+    }
+
+    private function addBorderDiagonal(SimpleXMLElement $srssb, array &$styleArray): void
+    {
+        if (isset($srssb->Diagonal, $srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
+        } elseif (isset($srssb->Diagonal)) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
+        } elseif (isset($srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->{'Rev-Diagonal'}->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
+        }
+    }
+
+    private function addBorderStyle(SimpleXMLElement $srssb, array &$styleArray, string $direction): void
+    {
+        $ucDirection = ucfirst($direction);
+        if (isset($srssb->$ucDirection)) {
+            $styleArray['borders'][$direction] = self::parseBorderAttributes($srssb->$ucDirection->attributes());
+        }
+    }
+
+    private function calcRotation(SimpleXMLElement $styleAttributes): int
+    {
+        $rotation = (int) $styleAttributes->Rotation;
+        if ($rotation >= 270 && $rotation <= 360) {
+            $rotation -= 360;
+        }
+        $rotation = (abs($rotation) > 90) ? 0 : $rotation;
+
+        return $rotation;
+    }
+
+    private static function addStyle(array &$styleArray, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key] = self::$mappings[$key][$value];
+        }
+    }
+
+    private static function addStyle2(array &$styleArray, string $key1, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key1][$key] = self::$mappings[$key][$value];
+        }
+    }
+
+    private static function parseBorderAttributes(?SimpleXMLElement $borderAttributes): array
+    {
+        $styleArray = [];
+        if ($borderAttributes !== null) {
+            if (isset($borderAttributes['Color'])) {
+                $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes['Color']);
+            }
+
+            self::addStyle($styleArray, 'borderStyle', (string) $borderAttributes['Style']);
+        }
+
+        return $styleArray;
+    }
+
+    private static function parseGnumericColour(string $gnmColour): string
+    {
+        [$gnmR, $gnmG, $gnmB] = explode(':', $gnmColour);
+        $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
+
+        return $gnmR . $gnmG . $gnmB;
+    }
+
+    private function addColors(array &$styleArray, SimpleXMLElement $styleAttributes): void
+    {
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Fore']);
+        $styleArray['font']['color']['rgb'] = $RGB;
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Back']);
+        $shade = (string) $styleAttributes['Shade'];
+        if (($RGB !== '000000') || ($shade !== '0')) {
+            $RGB2 = self::parseGnumericColour((string) $styleAttributes['PatternColor']);
+            if ($shade === '1') {
+                $styleArray['fill']['startColor']['rgb'] = $RGB;
+                $styleArray['fill']['endColor']['rgb'] = $RGB2;
+            } else {
+                $styleArray['fill']['endColor']['rgb'] = $RGB;
+                $styleArray['fill']['startColor']['rgb'] = $RGB2;
+            }
+            self::addStyle2($styleArray, 'fill', 'fillType', $shade);
+        }
+    }
+
+    private function readStyleRange(SimpleXMLElement $styleAttributes, int $maxCol, int $maxRow): string
+    {
+        $startColumn = Coordinate::stringFromColumnIndex((int) $styleAttributes['startCol'] + 1);
+        $startRow = $styleAttributes['startRow'] + 1;
+
+        $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
+        $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
+
+        $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : (int) $styleAttributes['endRow']);
+        $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
+
+        return $cellRange;
+    }
+
+    private function readStyle(array $styleArray, SimpleXMLElement $styleAttributes, SimpleXMLElement $style): array
+    {
+        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';
+        $styleArray['alignment']['indent'] = ((int) ($styleAttributes['Indent']) > 0) ? $styleAttributes['indent'] : 0;
+
+        $this->addColors($styleArray, $styleAttributes);
+
+        $fontAttributes = $style->Style->Font->attributes();
+        if ($fontAttributes !== null) {
+            $styleArray['font']['name'] = (string) $style->Style->Font;
+            $styleArray['font']['size'] = (int) ($fontAttributes['Unit']);
+            $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
+            $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
+            $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
+            self::addStyle2($styleArray, 'font', 'underline', (string) $fontAttributes['Underline']);
+
+            switch ($fontAttributes['Script']) {
+                case '1':
+                    $styleArray['font']['superscript'] = true;
+
+                    break;
+                case '-1':
+                    $styleArray['font']['subscript'] = true;
+
+                    break;
+            }
+        }
+
+        if (isset($style->Style->StyleBorder)) {
+            $srssb = $style->Style->StyleBorder;
+            $this->addBorderStyle($srssb, $styleArray, 'top');
+            $this->addBorderStyle($srssb, $styleArray, 'bottom');
+            $this->addBorderStyle($srssb, $styleArray, 'left');
+            $this->addBorderStyle($srssb, $styleArray, 'right');
+            $this->addBorderDiagonal($srssb, $styleArray);
+        }
+        //    TO DO
+        /*
+        if (isset($style->Style->HyperLink)) {
+            $hyperlink = $style->Style->HyperLink->attributes();
+        }
+        */
+
+        return $styleArray;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
index a255cfd9e..19bf67b20 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
@@ -7,6 +7,9 @@ use DOMElement;
 use DOMNode;
 use DOMText;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
@@ -16,8 +19,8 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Throwable;
 
-/** PhpSpreadsheet root directory */
 class Html extends BaseReader
 {
     /**
@@ -121,6 +124,7 @@ class Html extends BaseReader
         ], //    Italic
     ];
 
+    /** @var array */
     protected $rowspan = [];
 
     /**
@@ -134,16 +138,12 @@ class Html extends BaseReader
 
     /**
      * 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);
+            $this->openFile($filename);
         } catch (Exception $e) {
             return false;
         }
@@ -158,19 +158,19 @@ class Html extends BaseReader
         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'];
+        $filename = $meta['uri']; // @phpstan-ignore-line
 
-        $size = filesize($filename);
+        $size = (int) filesize($filename);
         if ($size === 0) {
             return '';
         }
@@ -182,52 +182,50 @@ class Html extends BaseReader
 
         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);
     }
 
-    private static function endsWithTag($data)
+    private static function endsWithTag(string $data): bool
     {
         return '>' === substr(trim($data), -1, 1);
     }
 
-    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
-     *
-     * @throws Exception
-     *
-     * @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);
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
     /**
      * Set input encoding.
      *
-     * @param string $pValue Input encoding, eg: 'ANSI'
+     * @param string $inputEncoding Input encoding, eg: 'ANSI'
      *
      * @return $this
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated no use is made of this property
      */
-    public function setInputEncoding($pValue)
+    public function setInputEncoding($inputEncoding)
     {
-        $this->inputEncoding = $pValue;
+        $this->inputEncoding = $inputEncoding;
 
         return $this;
     }
@@ -236,6 +234,10 @@ class Html extends BaseReader
      * Get input encoding.
      *
      * @return string
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated no use is made of this property
      */
     public function getInputEncoding()
     {
@@ -243,13 +245,17 @@ class Html extends BaseReader
     }
 
     //    Data Array used for testing only, should write to Spreadsheet object on completion of tests
+
+    /** @var array */
     protected $dataArray = [];
 
+    /** @var int */
     protected $tableLevel = 0;
 
+    /** @var array */
     protected $nestedColumn = ['A'];
 
-    protected function setTableStartColumn($column)
+    protected function setTableStartColumn(string $column): string
     {
         if ($this->tableLevel == 0) {
             $column = 'A';
@@ -260,27 +266,54 @@ class Html extends BaseReader
         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)
+    /**
+     * Flush cell.
+     *
+     * @param string $column
+     * @param int|string $row
+     * @param mixed $cellContent
+     */
+    protected function flushCell(Worksheet $sheet, $column, $row, &$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 (substr($cellContent, 0, 1) === '=') {
+                            $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 (\PhpOffice\PhpSpreadsheet\Exception $exception) {
+                        $sheet->setCellValue($column . $row, $cellContent);
+                    }
+                } else {
+                    $sheet->setCellValue($column . $row, $cellContent);
+                }
                 $this->dataArray[$row][$column] = $cellContent;
             }
         } else {
@@ -291,18 +324,330 @@ class Html extends BaseReader
         $cellContent = (string) '';
     }
 
-    /**
-     * @param DOMNode $element
-     * @param Worksheet $sheet
-     * @param int $row
-     * @param string $column
-     * @param string $cellContent
-     */
-    protected function processDomElement(DOMNode $element, Worksheet $sheet, &$row, &$column, &$cellContent)
+    private function processDomElementBody(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
+    {
+        $attributeArray = [];
+        foreach ($child->attributes as $attribute) {
+            $attributeArray[$attribute->name] = $attribute->value;
+        }
+
+        if ($child->nodeName === 'body') {
+            $row = 1;
+            $column = 'A';
+            $cellContent = '';
+            $this->tableLevel = 0;
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementTitle($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTitle(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'title') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            $sheet->setTitle($cellContent, true, true);
+            $cellContent = '';
+        } else {
+            $this->processDomElementSpanEtc($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    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((string) $child->nodeName, self::SPAN_ETC, true)) {
+            if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
+                $sheet->getComment($column . $row)
+                    ->getText()
+                    ->createTextRun($child->textContent);
+            } else {
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            }
+
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+        } else {
+            $this->processDomElementHr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    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, $attributeArray);
+            ++$row;
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+            ++$row;
+        }
+        // fall through to br
+        $this->processDomElementBr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+    }
+
+    private function processDomElementBr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        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
+                $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, $attributeArray);
+                ++$row;
+            }
+        } else {
+            $this->processDomElementA($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementA(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'a') {
+            foreach ($attributeArray as $attributeName => $attributeValue) {
+                switch ($attributeName) {
+                    case 'href':
+                        $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
+                        if (isset($this->formats[$child->nodeName])) {
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                        }
+
+                        break;
+                    case 'class':
+                        if ($attributeValue === 'comment-indicator') {
+                            break; // Ignore - it's just a red square.
+                        }
+                }
+            }
+            // no idea why this should be needed
+            //$cellContent .= ' ';
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementH1Etc($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    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((string) $child->nodeName, self::H1_ETC, true)) {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a \n
+                $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, $attributeArray);
+                    ++$row;
+                }
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+
+                if (isset($this->formats[$child->nodeName])) {
+                    $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                }
+
+                ++$row;
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementLi($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementLi(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'li') {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a \n
+                $cellContent .= $cellContent ? "\n" : '';
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            } else {
+                if ($cellContent > '') {
+                    $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                }
+                ++$row;
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementImg($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementImg(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'img') {
+            $this->insertImage($sheet, $column, $row, $attributeArray);
+        } else {
+            $this->processDomElementTable($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    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->currentColumn = 'A';
+            $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+            $column = $this->setTableStartColumn($column);
+            if ($this->tableLevel > 1 && $row > 1) {
+                --$row;
+            }
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            $column = $this->releaseTableStartColumn();
+            if ($this->tableLevel > 1) {
+                ++$column;
+            } else {
+                ++$row;
+            }
+        } else {
+            $this->processDomElementTr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        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);
+
+            if (isset($attributeArray['height'])) {
+                $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
+            }
+
+            ++$row;
+        } else {
+            $this->processDomElementThTdOther($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementThTdOther(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName !== 'td' && $child->nodeName !== 'th') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementThTd($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementBgcolor(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['bgcolor'])) {
+            $sheet->getStyle("$column$row")->applyFromArray(
+                [
+                    'fill' => [
+                        'fillType' => Fill::FILL_SOLID,
+                        'color' => ['rgb' => $this->getStyleColor($attributeArray['bgcolor'])],
+                    ],
+                ]
+            );
+        }
+    }
+
+    private function processDomElementWidth(Worksheet $sheet, string $column, array $attributeArray): void
+    {
+        if (isset($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((new CssDimension($attributeArray['height']))->height());
+        }
+    }
+
+    private function processDomElementAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['align'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
+        }
+    }
+
+    private function processDomElementVAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['valign'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
+        }
+    }
+
+    private function processDomElementDataFormat(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['data-format'])) {
+            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
+        }
+    }
+
+    private function processDomElementThTd(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        while (isset($this->rowspan[$column . $row])) {
+            ++$column;
+        }
+        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+        // apply inline style
+        $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
+
+        $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+
+        $this->processDomElementBgcolor($sheet, $row, $column, $attributeArray);
+        $this->processDomElementWidth($sheet, $column, $attributeArray);
+        $this->processDomElementHeight($sheet, $row, $attributeArray);
+        $this->processDomElementAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementVAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementDataFormat($sheet, $row, $column, $attributeArray);
+
+        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+            //create merging rowspan and colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+            $column = $columnTo;
+        } elseif (isset($attributeArray['rowspan'])) {
+            //create merging rowspan
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            //create merging colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+            $column = $columnTo;
+        }
+
+        ++$column;
+    }
+
+    protected function processDomElement(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent): void
     {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
-                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
+                $domText = (string) preg_replace('/\s+/u', ' ', trim($child->nodeValue ?? ''));
                 if (is_string($cellContent)) {
                     //    simply append the text if the cell content is a plain text string
                     $cellContent .= $domText;
@@ -310,267 +655,7 @@ class Html extends BaseReader
                 //    but if we have a rich text run instead, we need to append it correctly
                     //    TODO
             } elseif ($child instanceof DOMElement) {
-                $attributeArray = [];
-                foreach ($child->attributes as $attribute) {
-                    $attributeArray[$attribute->name] = $attribute->value;
-                }
-
-                switch ($child->nodeName) {
-                    case 'meta':
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            // Extract character set, so we can convert to UTF-8 if required
-                            if ($attributeName === 'charset') {
-                                $this->setInputEncoding($attributeValue);
-                            }
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'title':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        $sheet->setTitle($cellContent, true, false);
-                        $cellContent = '';
-
-                        break;
-                    case 'span':
-                    case 'div':
-                    case 'font':
-                    case 'i':
-                    case 'em':
-                    case 'strong':
-                    case 'b':
-                        if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
-                            $sheet->getComment($column . $row)
-                                ->getText()
-                                ->createTextRun($child->textContent);
-
-                            break;
-                        }
-
-                        if ($cellContent > '') {
-                            $cellContent .= ' ';
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        if ($cellContent > '') {
-                            $cellContent .= ' ';
-                        }
-
-                        if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                        }
-
-                        break;
-                    case 'hr':
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-                        ++$row;
-                        if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                        } else {
-                            $cellContent = '----------';
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-                        }
-                        ++$row;
-                        // Add a break after a horizontal rule, simply by allowing the code to dropthru
-                        // no break
-                    case 'br':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n 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);
-                            ++$row;
-                        }
-
-                        break;
-                    case 'a':
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            switch ($attributeName) {
-                                case 'href':
-                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
-                                    if (isset($this->formats[$child->nodeName])) {
-                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                                    }
-
-                                    break;
-                                case 'class':
-                                    if ($attributeValue === 'comment-indicator') {
-                                        break; // Ignore - it's just a red square.
-                                    }
-                            }
-                        }
-                        $cellContent .= ' ';
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                    case 'h4':
-                    case 'h5':
-                    case 'h6':
-                    case 'ol':
-                    case 'ul':
-                    case 'p':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        } else {
-                            if ($cellContent > '') {
-                                $this->flushCell($sheet, $column, $row, $cellContent);
-                                ++$row;
-                            }
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-
-                            if (isset($this->formats[$child->nodeName])) {
-                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                            }
-
-                            ++$row;
-                            $column = 'A';
-                        }
-
-                        break;
-                    case 'li':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        } else {
-                            if ($cellContent > '') {
-                                $this->flushCell($sheet, $column, $row, $cellContent);
-                            }
-                            ++$row;
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-                            $column = 'A';
-                        }
-
-                        break;
-                    case 'img':
-                        $this->insertImage($sheet, $column, $row, $attributeArray);
-
-                        break;
-                    case 'table':
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-                        $column = $this->setTableStartColumn($column);
-                        if ($this->tableLevel > 1) {
-                            --$row;
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        $column = $this->releaseTableStartColumn();
-                        if ($this->tableLevel > 1) {
-                            ++$column;
-                        } else {
-                            ++$row;
-                        }
-
-                        break;
-                    case 'thead':
-                    case 'tbody':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'tr':
-                        $column = $this->getTableStartColumn();
-                        $cellContent = '';
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        if (isset($attributeArray['height'])) {
-                            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
-                        }
-
-                        ++$row;
-
-                        break;
-                    case 'th':
-                    case 'td':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        while (isset($this->rowspan[$column . $row])) {
-                            ++$column;
-                        }
-
-                        // apply inline style
-                        $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
-
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-
-                        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
-                            //create merging rowspan and colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
-                                ++$columnTo;
-                            }
-                            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
-                            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                            $column = $columnTo;
-                        } elseif (isset($attributeArray['rowspan'])) {
-                            //create merging rowspan
-                            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
-                            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                        } elseif (isset($attributeArray['colspan'])) {
-                            //create merging colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
-                                ++$columnTo;
-                            }
-                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
-                            $column = $columnTo;
-                        } elseif (isset($attributeArray['bgcolor'])) {
-                            $sheet->getStyle($column . $row)->applyFromArray(
-                                [
-                                    'fill' => [
-                                        'fillType' => Fill::FILL_SOLID,
-                                        'color' => ['rgb' => $attributeArray['bgcolor']],
-                                    ],
-                                ]
-                            );
-                        }
-
-                        if (isset($attributeArray['width'])) {
-                            $sheet->getColumnDimension($column)->setWidth($attributeArray['width']);
-                        }
-
-                        if (isset($attributeArray['height'])) {
-                            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
-                        }
-
-                        if (isset($attributeArray['align'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
-                        }
-
-                        if (isset($attributeArray['valign'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
-                        }
-
-                        if (isset($attributeArray['data-format'])) {
-                            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
-                        }
-
-                        ++$column;
-
-                        break;
-                    case 'body':
-                        $row = 1;
-                        $column = 'A';
-                        $cellContent = '';
-                        $this->tableLevel = 0;
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    default:
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                }
+                $this->processDomElementBody($sheet, $row, $column, $cellContent, $child);
             }
         }
     }
@@ -578,61 +663,161 @@ class Html extends BaseReader
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting($filename, 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
-        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
-        if ($loaded === false) {
-            throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document');
+        try {
+            $convert = $this->getSecurityScannerOrThrow()->scanFile($filename);
+            $lowend = "\u{80}";
+            $highend = "\u{10ffff}";
+            $regexp = "/[$lowend-$highend]/u";
+            /** @var callable */
+            $callback = [self::class, 'replaceNonAscii'];
+            $convert = preg_replace_callback($regexp, $callback, $convert);
+            $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
+        } catch (Throwable $e) {
+            $loaded = false;
         }
+        if ($loaded === false) {
+            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;
+                    default:
+                        if (preg_match('/^custom[.](bool|date|float|int|string)[.](.+)$/', $metaName, $matches) === 1) {
+                            switch ($matches[1]) {
+                                case 'bool':
+                                    $properties->setCustomProperty($matches[2], (bool) $metaContent, Properties::PROPERTY_TYPE_BOOLEAN);
+
+                                    break;
+                                case 'float':
+                                    $properties->setCustomProperty($matches[2], (float) $metaContent, Properties::PROPERTY_TYPE_FLOAT);
+
+                                    break;
+                                case 'int':
+                                    $properties->setCustomProperty($matches[2], (int) $metaContent, Properties::PROPERTY_TYPE_INTEGER);
+
+                                    break;
+                                case 'date':
+                                    $properties->setCustomProperty($matches[2], $metaContent, Properties::PROPERTY_TYPE_DATE);
+
+                                    break;
+                                default: // string
+                                    $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') . ';';
+    }
+
     /**
      * Spreadsheet from content.
      *
      * @param string $content
-     * @param null|Spreadsheet $spreadsheet
-     *
-     * @return Spreadsheet
      */
     public function loadFromString($content, ?Spreadsheet $spreadsheet = null): Spreadsheet
     {
         //    Create a new DOM object
         $dom = new DOMDocument();
         //    Reload the HTML file into the DOM object
-        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scan($content), 'HTML-ENTITIES', 'UTF-8'));
-        if ($loaded === false) {
-            throw new Exception('Failed to load content as a DOM Document');
+        try {
+            $convert = $this->getSecurityScannerOrThrow()->scan($content);
+            $lowend = "\u{80}";
+            $highend = "\u{10ffff}";
+            $regexp = "/[$lowend-$highend]/u";
+            /** @var callable */
+            $callback = [self::class, 'replaceNonAscii'];
+            $convert = preg_replace_callback($regexp, $callback, $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);
     }
 
     /**
      * Loads PhpSpreadsheet from DOMDocument into PhpSpreadsheet instance.
-     *
-     * @param DOMDocument $document
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
-     * @return Spreadsheet
      */
     private function loadDocument(DOMDocument $document, Spreadsheet $spreadsheet): Spreadsheet
     {
@@ -667,13 +852,13 @@ class Html extends BaseReader
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex($sheetIndex)
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
@@ -688,18 +873,38 @@ class Html extends BaseReader
      * 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)
+    private function applyInlineStyle(Worksheet &$sheet, $row, $column, $attributeArray): void
     {
         if (!isset($attributeArray['style'])) {
             return;
         }
 
-        $cellStyle = $sheet->getStyle($column . $row);
+        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;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['rowspan'])) {
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . $row;
+            $cellStyle = $sheet->getStyle($range);
+        } else {
+            $cellStyle = $sheet->getStyle($column . $row);
+        }
 
         // add color styles (background & text) from dom element,currently support : td & th, using ONLY inline css style with RGB color
         $styles = explode(';', $attributeArray['style']);
@@ -707,6 +912,7 @@ class Html extends BaseReader
             $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;
@@ -715,7 +921,7 @@ class Html extends BaseReader
             switch ($styleName) {
                 case 'background':
                 case 'background-color':
-                    $styleColor = $this->getStyleColor($styleValue);
+                    $styleColor = $this->getStyleColor($styleValueString);
 
                     if (!$styleColor) {
                         continue 2;
@@ -725,7 +931,7 @@ class Html extends BaseReader
 
                     break;
                 case 'color':
-                    $styleColor = $this->getStyleColor($styleValue);
+                    $styleColor = $this->getStyleColor($styleValueString);
 
                     if (!$styleColor) {
                         continue 2;
@@ -736,27 +942,27 @@ class Html extends BaseReader
                     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;
 
@@ -782,7 +988,7 @@ class Html extends BaseReader
                     break;
 
                 case 'font-family':
-                    $cellStyle->getFont()->setName(str_replace('\'', '', $styleValue));
+                    $cellStyle->getFont()->setName(str_replace('\'', '', $styleValueString));
 
                     break;
 
@@ -801,26 +1007,30 @@ class Html extends BaseReader
                     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(
-                        str_replace('px', '', $styleValue)
-                    );
+                    if ($column !== '') {
+                        $sheet->getColumnDimension($column)->setWidth(
+                            (new CssDimension($styleValue ?? ''))->width()
+                        );
+                    }
 
                     break;
 
                 case 'height':
-                    $sheet->getRowDimension($row)->setRowHeight(
-                        str_replace('px', '', $styleValue)
-                    );
+                    if ($row > 0) {
+                        $sheet->getRowDimension($row)->setRowHeight(
+                            (new CssDimension($styleValue ?? ''))->height()
+                        );
+                    }
 
                     break;
 
@@ -833,7 +1043,7 @@ class Html extends BaseReader
 
                 case 'text-indent':
                     $cellStyle->getAlignment()->setIndent(
-                        (int) str_replace(['px'], '', $styleValue)
+                        (int) str_replace(['px'], '', $styleValueString)
                     );
 
                     break;
@@ -844,28 +1054,25 @@ class Html extends BaseReader
     /**
      * Check if has #, so we can get clean hex.
      *
-     * @param $value
+     * @param mixed $value
      *
      * @return null|string
      */
     public function getStyleColor($value)
     {
+        $value = (string) $value;
         if (strpos($value, '#') === 0) {
             return substr($value, 1);
         }
 
-        return null;
+        return \PhpOffice\PhpSpreadsheet\Helper\Html::colourNameLookup($value);
     }
 
     /**
-     * @param Worksheet $sheet
      * @param string    $column
      * @param int       $row
-     * @param array     $attributes
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    private function insertImage(Worksheet $sheet, $column, $row, array $attributes)
+    private function insertImage(Worksheet $sheet, $column, $row, array $attributes): void
     {
         if (!isset($attributes['src'])) {
             return;
@@ -874,7 +1081,7 @@ class Html extends BaseReader
         $src = urldecode($attributes['src']);
         $width = isset($attributes['width']) ? (float) $attributes['width'] : null;
         $height = isset($attributes['height']) ? (float) $attributes['height'] : null;
-        $name = isset($attributes['alt']) ? (float) $attributes['alt'] : null;
+        $name = $attributes['alt'] ?? null;
 
         $drawing = new Drawing();
         $drawing->setPath($src);
@@ -905,6 +1112,28 @@ class Html extends BaseReader
         );
     }
 
+    private const BORDER_MAPPINGS = [
+        'dash-dot' => Border::BORDER_DASHDOT,
+        'dash-dot-dot' => Border::BORDER_DASHDOTDOT,
+        'dashed' => Border::BORDER_DASHED,
+        'dotted' => Border::BORDER_DOTTED,
+        'double' => Border::BORDER_DOUBLE,
+        'hair' => Border::BORDER_HAIR,
+        'medium' => Border::BORDER_MEDIUM,
+        'medium-dashed' => Border::BORDER_MEDIUMDASHED,
+        'medium-dash-dot' => Border::BORDER_MEDIUMDASHDOT,
+        'medium-dash-dot-dot' => Border::BORDER_MEDIUMDASHDOTDOT,
+        'none' => Border::BORDER_NONE,
+        'slant-dash-dot' => Border::BORDER_SLANTDASHDOT,
+        'solid' => Border::BORDER_THIN,
+        'thick' => Border::BORDER_THICK,
+    ];
+
+    public static function getBorderMappings(): array
+    {
+        return self::BORDER_MAPPINGS;
+    }
+
     /**
      * Map html border style to PhpSpreadsheet border style.
      *
@@ -914,48 +1143,29 @@ class Html extends BaseReader
      */
     public function getBorderStyle($style)
     {
-        switch ($style) {
-            case 'solid':
-                return Border::BORDER_THIN;
-            case 'dashed':
-                return Border::BORDER_DASHED;
-            case 'dotted':
-                return Border::BORDER_DOTTED;
-            case 'medium':
-                return Border::BORDER_MEDIUM;
-            case 'thick':
-                return Border::BORDER_THICK;
-            case 'none':
-                return Border::BORDER_NONE;
-            case 'dash-dot':
-                return Border::BORDER_DASHDOT;
-            case 'dash-dot-dot':
-                return Border::BORDER_DASHDOTDOT;
-            case 'double':
-                return Border::BORDER_DOUBLE;
-            case 'hair':
-                return Border::BORDER_HAIR;
-            case 'medium-dash-dot':
-                return Border::BORDER_MEDIUMDASHDOT;
-            case 'medium-dash-dot-dot':
-                return Border::BORDER_MEDIUMDASHDOTDOT;
-            case 'medium-dashed':
-                return Border::BORDER_MEDIUMDASHED;
-            case 'slant-dash-dot':
-                return Border::BORDER_SLANTDASHDOT;
-        }
-
-        return null;
+        return self::BORDER_MAPPINGS[$style] ?? null;
     }
 
     /**
-     * @param Style  $cellStyle
      * @param string $styleValue
      * @param string $type
      */
-    private function setBorderStyle(Style $cellStyle, $styleValue, $type)
+    private function setBorderStyle(Style $cellStyle, $styleValue, $type): void
     {
-        [, $borderStyle, $color] = explode(' ', $styleValue);
+        if (trim($styleValue) === Border::BORDER_NONE) {
+            $borderStyle = Border::BORDER_NONE;
+            $color = null;
+        } else {
+            $borderArray = explode(' ', $styleValue);
+            $borderCount = count($borderArray);
+            if ($borderCount >= 3) {
+                $borderStyle = $borderArray[1];
+                $color = $borderArray[2];
+            } else {
+                $borderStyle = $borderArray[0];
+                $color = $borderArray[1] ?? null;
+            }
+        }
 
         $cellStyle->applyFromArray([
             'borders' => [
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
index ccfe05ada..9f68a7f36 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
@@ -7,11 +7,11 @@ 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($columnAddress, $row, $worksheetName = '');
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
index 70a7a200d..97afe3cb2 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
@@ -4,6 +4,13 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 interface IReader
 {
+    public const LOAD_WITH_CHARTS = 1;
+
+    public const READ_DATA_ONLY = 2;
+
+    public const SKIP_EMPTY_CELLS = 4;
+    public const IGNORE_EMPTY_CELLS = 4;
+
     /**
      * IReader constructor.
      */
@@ -11,16 +18,13 @@ interface IReader
 
     /**
      * 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
@@ -29,14 +33,15 @@ interface IReader
 
     /**
      * 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
+     * @param bool $readDataOnly
      *
      * @return IReader
      */
-    public function setReadDataOnly($pValue);
+    public function setReadDataOnly($readDataOnly);
 
     /**
      * Read empty cells?
@@ -52,17 +57,17 @@ interface IReader
      *        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
+     * @param bool $readEmptyCells
      *
      * @return IReader
      */
-    public function setReadEmptyCells($pValue);
+    public function setReadEmptyCells($readEmptyCells);
 
     /**
      * 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.
+     *      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
      */
@@ -70,15 +75,15 @@ interface IReader
 
     /**
      * 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
+     * @param bool $includeCharts
      *
      * @return IReader
      */
-    public function setIncludeCharts($pValue);
+    public function setIncludeCharts($includeCharts);
 
     /**
      * Get which sheets to load
@@ -118,20 +123,21 @@ interface IReader
     /**
      * Set read filter.
      *
-     * @param IReadFilter $pValue
-     *
      * @return IReader
      */
-    public function setReadFilter(IReadFilter $pValue);
+    public function setReadFilter(IReadFilter $readFilter);
 
     /**
      * Loads PhpSpreadsheet from file.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @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)
      *
      * @return \PhpOffice\PhpSpreadsheet\Spreadsheet
      */
-    public function load($pFilename);
+    public function load(string $filename, int $flags = 0);
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
index 5fff07aa3..9913f3325 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
@@ -2,11 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use DateTime;
-use DateTimeZone;
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use DOMAttr;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+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;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -15,11 +21,15 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 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.
      */
@@ -31,78 +41,66 @@ class Ods extends BaseReader
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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'};
+        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) {
+                                /** @scrutinizer ignore-call */
+                                $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
+                                if ($manifestAttributes && $manifestAttributes->{'full-path'} == '/') {
+                                    $mimeType = (string) $manifestAttributes->{'media-type'};
 
-                            break;
+                                    break;
+                                }
+                            }
                         }
                     }
                 }
+
+                $zip->close();
             }
-
-            $zip->close();
-
-            return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
         }
 
-        return false;
+        return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
     }
 
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return string[]
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames($filename)
     {
-        File::assertFile($pFilename);
-
-        $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
-            throw new Exception('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()
         );
@@ -112,7 +110,7 @@ class Ods extends BaseReader
         $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 {
@@ -121,12 +119,16 @@ class Ods extends BaseReader
             }
             // 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);
                 }
             }
         }
@@ -137,26 +139,19 @@ class Ods extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $worksheetInfo = [];
 
-        $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
-            throw new Exception('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 +161,7 @@ class Ods extends BaseReader
         $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 +170,7 @@ class Ods extends BaseReader
             }
             // 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 +185,7 @@ class Ods extends BaseReader
                     $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;
@@ -199,23 +194,23 @@ class Ods extends BaseReader
                             // Step into the row
                             $xml->read();
                             do {
-                                if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                $doread = true;
+                                if (self::getXmlName($xml) == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
                                     if (!$xml->isEmptyElement) {
                                         ++$currCells;
                                         $xml->next();
-                                    } else {
-                                        $xml->read();
+                                        $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;
-                                    $xml->read();
-                                } else {
+                                }
+                                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,49 +224,45 @@ class Ods extends BaseReader
     }
 
     /**
-     * Loads PhpSpreadsheet from file.
+     * Counteract Phpstan caching.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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();
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
     {
-        File::assertFile($pFilename);
-
-        $timezoneObj = new DateTimeZone('Europe/London');
-        $GMT = new \DateTimeZone('UTC');
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
-            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')),
+        $xml = @simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('meta.xml')),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
         );
@@ -283,11 +274,21 @@ class Ods extends BaseReader
 
         (new DocumentProperties($spreadsheet))->load($xml, $namespacesMeta);
 
-        // Content
+        // Styles
 
-        $dom = new \DOMDocument('1.01', 'UTF-8');
+        $dom = new DOMDocument('1.01', 'UTF-8');
         $dom->loadXML(
-            $this->securityScanner->scan($zip->getFromName('content.xml')),
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('styles.xml')),
+            Settings::getLibXmlLoaderOptions()
+        );
+
+        $pageSettings = new PageSettings($dom);
+
+        // Main Content
+
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName(self::INITIAL_FILE)),
             Settings::getLibXmlLoaderOptions()
         );
 
@@ -295,44 +296,72 @@ class Ods extends BaseReader
         $tableNs = $dom->lookupNamespaceUri('table');
         $textNs = $dom->lookupNamespaceUri('text');
         $xlinkNs = $dom->lookupNamespaceUri('xlink');
+        $styleNs = $dom->lookupNamespaceUri('style');
 
-        $spreadsheets = $dom->getElementsByTagNameNS($officeNs, 'body')
-            ->item(0)
-            ->getElementsByTagNameNS($officeNs, 'spreadsheet');
+        $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
+        $item0 = $dom->getElementsByTagNameNS($officeNs, 'body')->item(0);
+        $spreadsheets = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($officeNs, 'spreadsheet');
 
         foreach ($spreadsheets as $workbookData) {
-            /** @var \DOMElement $workbookData */
+            /** @var DOMElement $workbookData */
             $tables = $workbookData->getElementsByTagNameNS($tableNs, 'table');
 
             $worksheetID = 0;
             foreach ($tables as $worksheetDataSet) {
-                /** @var \DOMElement $worksheetDataSet */
+                /** @var DOMElement $worksheetDataSet */
                 $worksheetName = $worksheetDataSet->getAttributeNS($tableNs, 'name');
 
                 // Check loadSheetsOnly
-                if (isset($this->loadSheetsOnly)
+                if (
+                    $this->loadSheetsOnly !== null
                     && $worksheetName
-                    && !in_array($worksheetName, $this->loadSheetsOnly)) {
+                    && !in_array($worksheetName, $this->loadSheetsOnly)
+                ) {
                     continue;
                 }
 
+                $worksheetStyleName = $worksheetDataSet->getAttributeNS($tableNs, 'style-name');
+
                 // Create sheet
                 if ($worksheetID > 0) {
                     $spreadsheet->createSheet(); // First sheet is added by default
                 }
                 $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
-                    $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+                    $spreadsheet->getActiveSheet()->setTitle((string) $worksheetName, false, false);
                 }
 
                 // Go through every child of table element
                 $rowID = 1;
+                $tableColumnIndex = 1;
                 foreach ($worksheetDataSet->childNodes as $childNode) {
-                    /** @var \DOMElement $childNode */
+                    /** @var DOMElement $childNode */
 
                     // Filter elements which are not under the "table" ns
                     if ($childNode->namespaceURI != $tableNs) {
@@ -357,21 +386,48 @@ class Ods extends BaseReader
 //                                $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';
-                            foreach ($childNode->childNodes as $key => $cellData) {
-                                // @var \DOMElement $cellData
-
+                            /** @var DOMElement $cellData */
+                            foreach ($childNode->childNodes as $cellData) {
                                 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;
                                     }
@@ -390,10 +446,10 @@ class Ods extends BaseReader
                                 // 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');
 
-                                    if ($textNode->length > 0) {
+                                    if ($textNode->length > 0 && $textNode->item(0) !== null) {
                                         $text = $this->scanElementForText($textNode->item(0));
 
                                         $spreadsheet->getActiveSheet()
@@ -405,11 +461,11 @@ class Ods extends BaseReader
 
                                 // Content
 
-                                /** @var \DOMElement[] $paragraphs */
+                                /** @var DOMElement[] $paragraphs */
                                 $paragraphs = [];
 
                                 foreach ($cellData->childNodes as $item) {
-                                    /** @var \DOMElement $item */
+                                    /** @var DOMElement $item */
 
                                     // Filter text:p elements
                                     if ($item->nodeName == 'text:p') {
@@ -440,7 +496,7 @@ class Ods extends BaseReader
 
                                             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');
                                                 }
                                             }
@@ -455,9 +511,10 @@ class Ods extends BaseReader
                                             $type = DataType::TYPE_NUMERIC;
                                             $dataValue = (float) $cellData->getAttributeNS($officeNs, 'value');
 
-                                            if (floor($dataValue) == $dataValue) {
-                                                $dataValue = (int) $dataValue;
-                                            }
+                                            // percentage should always be float
+                                            //if (floor($dataValue) == $dataValue) {
+                                            //    $dataValue = (int) $dataValue;
+                                            //}
                                             $formatting = NumberFormat::FORMAT_PERCENTAGE_00;
 
                                             break;
@@ -468,7 +525,7 @@ class Ods extends BaseReader
                                             if (floor($dataValue) == $dataValue) {
                                                 $dataValue = (int) $dataValue;
                                             }
-                                            $formatting = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
+                                            $formatting = NumberFormat::FORMAT_CURRENCY_USD_INTEGER;
 
                                             break;
                                         case 'float':
@@ -478,8 +535,6 @@ class Ods extends BaseReader
                                             if (floor($dataValue) == $dataValue) {
                                                 if ($dataValue == (int) $dataValue) {
                                                     $dataValue = (int) $dataValue;
-                                                } else {
-                                                    $dataValue = (float) $dataValue;
                                                 }
                                             }
 
@@ -487,22 +542,7 @@ class Ods extends BaseReader
                                         case 'date':
                                             $type = DataType::TYPE_NUMERIC;
                                             $value = $cellData->getAttributeNS($officeNs, 'date-value');
-
-                                            $dateObj = new DateTime($value, $GMT);
-                                            $dateObj->setTimeZone($timezoneObj);
-                                            [$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
@@ -520,7 +560,7 @@ class Ods extends BaseReader
 
                                             $dataValue = Date::PHPToExcel(
                                                 strtotime(
-                                                    '01-01-1970 ' . implode(':', sscanf($timeValue, 'PT%dH%dM%dS'))
+                                                    '01-01-1970 ' . implode(':', /** @scrutinizer ignore-type */ sscanf($timeValue, 'PT%dH%dM%dS') ?? [])
                                                 )
                                             );
                                             $formatting = NumberFormat::FORMAT_DATE_TIME4;
@@ -537,30 +577,7 @@ class Ods extends BaseReader
                                 if ($hasCalculatedValue) {
                                     $type = DataType::TYPE_FORMULA;
                                     $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
-                                    $temp = explode('"', $cellDataFormula);
-                                    $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('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/U', '$1!$2:$3', $value);
-
-                                            // Cell reference in another sheet
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/U', '$1!$2', $value);
-
-                                            // Cell range reference
-                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/U', '$1:$2', $value);
-
-                                            // Simple cell reference
-                                            $value = preg_replace('/\[\.([^\.]+)\]/U', '$1', $value);
-
-                                            $value = Calculation::translateSeparator(';', ',', $value, $inBraces);
-                                        }
-                                    }
-                                    unset($value);
-
-                                    // Then rebuild the formula string
-                                    $cellDataFormula = implode('"', $temp);
+                                    $cellDataFormula = FormulaTranslator::convertToExcelFormulaValue($cellDataFormula);
                                 }
 
                                 if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
@@ -616,30 +633,7 @@ class Ods extends BaseReader
                                 }
 
                                 // 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;
                             }
@@ -648,40 +642,114 @@ class Ods extends BaseReader
                             break;
                     }
                 }
+                $pageSettings->setVisibilityForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
+                $pageSettings->setPrintSettingsForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 ++$worksheetID;
             }
+
+            $autoFilterReader->read($workbookData);
+            $definedNameReader->read($workbookData);
+        }
+        $spreadsheet->setActiveSheetIndex(0);
+
+        if ($zip->locateName('settings.xml') !== false) {
+            $this->processSettings($zip, $spreadsheet);
         }
 
         // Return
         return $spreadsheet;
     }
 
+    private function processSettings(ZipArchive $zip, Spreadsheet $spreadsheet): void
+    {
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('settings.xml')),
+            Settings::getLibXmlLoaderOptions()
+        );
+        //$xlinkNs = $dom->lookupNamespaceUri('xlink');
+        $configNs = $dom->lookupNamespaceUri('config');
+        //$oooNs = $dom->lookupNamespaceUri('ooo');
+        $officeNs = $dom->lookupNamespaceUri('office');
+        $settings = $dom->getElementsByTagNameNS($officeNs, 'settings')
+            ->item(0);
+        if ($settings !== null) {
+            $this->lookForActiveSheet($settings, $spreadsheet, $configNs);
+            $this->lookForSelectedCells($settings, $spreadsheet, $configNs);
+        }
+    }
+
+    private function lookForActiveSheet(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
+    {
+        /** @var DOMElement $t */
+        foreach ($settings->getElementsByTagNameNS($configNs, 'config-item') as $t) {
+            if ($t->getAttributeNs($configNs, 'name') === 'ActiveTable') {
+                try {
+                    $spreadsheet->setActiveSheetIndexByName($t->nodeValue ?? '');
+                } catch (Throwable $e) {
+                    // do nothing
+                }
+
+                break;
+            }
+        }
+    }
+
+    private function lookForSelectedCells(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
+    {
+        /** @var DOMElement $t */
+        foreach ($settings->getElementsByTagNameNS($configNs, 'config-item-map-named') as $t) {
+            if ($t->getAttributeNs($configNs, 'name') === 'Tables') {
+                foreach ($t->getElementsByTagNameNS($configNs, 'config-item-map-entry') as $ws) {
+                    $setRow = $setCol = '';
+                    $wsname = $ws->getAttributeNs($configNs, 'name');
+                    foreach ($ws->getElementsByTagNameNS($configNs, 'config-item') as $configItem) {
+                        $attrName = $configItem->getAttributeNs($configNs, 'name');
+                        if ($attrName === 'CursorPositionX') {
+                            $setCol = $configItem->nodeValue;
+                        }
+                        if ($attrName === 'CursorPositionY') {
+                            $setRow = $configItem->nodeValue;
+                        }
+                    }
+                    $this->setSelected($spreadsheet, $wsname, "$setCol", "$setRow");
+                }
+
+                break;
+            }
+        }
+    }
+
+    private function setSelected(Spreadsheet $spreadsheet, string $wsname, string $setCol, string $setRow): void
+    {
+        if (is_numeric($setCol) && is_numeric($setRow)) {
+            $sheet = $spreadsheet->getSheetByName($wsname);
+            if ($sheet !== null) {
+                $sheet->setSelectedCells([(int) $setCol + 1, (int) $setRow + 1]);
+            }
+        }
+    }
+
     /**
      * Recursively scan element.
      *
-     * @param \DOMNode $element
-     *
      * @return string
      */
-    protected function scanElementForText(\DOMNode $element)
+    protected function scanElementForText(DOMNode $element)
     {
         $str = '';
         foreach ($element->childNodes as $child) {
-            /** @var \DOMNode $child */
+            /** @var DOMNode $child */
             if ($child->nodeType == XML_TEXT_NODE) {
                 $str .= $child->nodeValue;
             } 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);
             }
 
@@ -693,6 +761,17 @@ class Ods extends BaseReader
         return $str;
     }
 
+    private static function getMultiplier(?DOMAttr $cAttr): int
+    {
+        if ($cAttr) {
+            $multiplier = (int) $cAttr->nodeValue;
+        } else {
+            $multiplier = 1;
+        }
+
+        return $multiplier;
+    }
+
     /**
      * @param string $is
      *
@@ -705,4 +784,39 @@ class Ods extends BaseReader
 
         return $value;
     }
+
+    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;
+
+                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, Worksheet::MERGE_CELL_CONTENT_HIDE);
+            }
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
new file mode 100644
index 000000000..1f5f975de
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use DOMNode;
+
+class AutoFilter extends BaseLoader
+{
+    public function read(DOMElement $workbookData): void
+    {
+        $this->readAutoFilters($workbookData);
+    }
+
+    protected function readAutoFilters(DOMElement $workbookData): void
+    {
+        $databases = $workbookData->getElementsByTagNameNS($this->tableNs, 'database-ranges');
+
+        foreach ($databases as $autofilters) {
+            foreach ($autofilters->childNodes as $autofilter) {
+                $autofilterRange = $this->getAttributeValue($autofilter, 'target-range-address');
+                if ($autofilterRange !== null) {
+                    $baseAddress = FormulaTranslator::convertToExcelAddressValue($autofilterRange);
+                    $this->spreadsheet->getActiveSheet()->setAutoFilter($baseAddress);
+                }
+            }
+        }
+    }
+
+    protected function getAttributeValue(?DOMNode $node, string $attributeName): ?string
+    {
+        if ($node !== null && $node->attributes !== null) {
+            $attribute = $node->attributes->getNamedItemNS(
+                $this->tableNs,
+                $attributeName
+            );
+
+            if ($attribute !== null) {
+                return $attribute->nodeValue;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
new file mode 100644
index 000000000..b06691f42
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+abstract class BaseLoader
+{
+    /**
+     * @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;
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
new file mode 100644
index 000000000..e0ab8900a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class DefinedNames extends BaseLoader
+{
+    public function read(DOMElement $workbookData): void
+    {
+        $this->readDefinedRanges($workbookData);
+        $this->readDefinedExpressions($workbookData);
+    }
+
+    /**
+     * Read any Named Ranges that are defined in this spreadsheet.
+     */
+    protected function readDefinedRanges(DOMElement $workbookData): void
+    {
+        $namedRanges = $workbookData->getElementsByTagNameNS($this->tableNs, 'named-range');
+        foreach ($namedRanges as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($this->tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
+            $range = $definedNameElement->getAttributeNS($this->tableNs, 'cell-range-address');
+
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
+            $range = FormulaTranslator::convertToExcelAddressValue($range);
+
+            $this->addDefinedName($baseAddress, $definedName, $range);
+        }
+    }
+
+    /**
+     * Read any Named Formulae that are defined in this spreadsheet.
+     */
+    protected function readDefinedExpressions(DOMElement $workbookData): void
+    {
+        $namedExpressions = $workbookData->getElementsByTagNameNS($this->tableNs, 'named-expression');
+        foreach ($namedExpressions as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($this->tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
+            $expression = $definedNameElement->getAttributeNS($this->tableNs, 'expression');
+
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
+            $expression = substr($expression, strpos($expression, ':=') + 1);
+            $expression = FormulaTranslator::convertToExcelFormulaValue($expression);
+
+            $this->addDefinedName($baseAddress, $definedName, $expression);
+        }
+    }
+
+    /**
+     * Assess scope and store the Defined Name.
+     */
+    private function addDefinedName(string $baseAddress, string $definedName, string $value): void
+    {
+        [$sheetReference] = Worksheet::extractSheetTitle($baseAddress, true);
+        $worksheet = $this->spreadsheet->getSheetByName($sheetReference);
+        // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+        if ($worksheet !== null) {
+            $this->spreadsheet->addDefinedName(DefinedName::createInstance((string) $definedName, $worksheet, $value));
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
new file mode 100644
index 000000000..27862d7a5
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
new file mode 100644
index 000000000..0e18af5d2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMDocument;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class PageSettings
+{
+    /**
+     * @var string
+     */
+    private $officeNs;
+
+    /**
+     * @var string
+     */
+    private $stylesNs;
+
+    /**
+     * @var string
+     */
+    private $stylesFo;
+
+    /**
+     * @var string
+     */
+    private $tableNs;
+
+    /**
+     * @var string[]
+     */
+    private $tableStylesCrossReference = [];
+
+    /** @var array */
+    private $pageLayoutStyles = [];
+
+    /**
+     * @var string[]
+     */
+    private $masterStylesCrossReference = [];
+
+    /**
+     * @var string[]
+     */
+    private $masterPrintStylesCrossReference = [];
+
+    public function __construct(DOMDocument $styleDom)
+    {
+        $this->setDomNameSpaces($styleDom);
+        $this->readPageSettingStyles($styleDom);
+        $this->readStyleMasterLookup($styleDom);
+    }
+
+    private function setDomNameSpaces(DOMDocument $styleDom): void
+    {
+        $this->officeNs = $styleDom->lookupNamespaceUri('office');
+        $this->stylesNs = $styleDom->lookupNamespaceUri('style');
+        $this->stylesFo = $styleDom->lookupNamespaceUri('fo');
+        $this->tableNs = $styleDom->lookupNamespaceUri('table');
+    }
+
+    private function readPageSettingStyles(DOMDocument $styleDom): void
+    {
+        $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;
+
+            $this->pageLayoutStyles[$styleName] = (object) [
+                'orientation' => $styleOrientation ?: PageSetup::ORIENTATION_DEFAULT,
+                'scale' => $styleScale ?: 100,
+                'printOrder' => $stylePrintOrder,
+                '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),
+            ];
+        }
+    }
+
+    private function readStyleMasterLookup(DOMDocument $styleDom): void
+    {
+        $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');
+            $pageLayoutName = $styleMasterSet->getAttributeNS($this->stylesNs, 'page-layout-name');
+            $this->masterPrintStylesCrossReference[$styleMasterName] = $pageLayoutName;
+        }
+    }
+
+    public function readStyleCrossReferences(DOMDocument $contentDom): void
+    {
+        $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)) {
+            return;
+        }
+        $masterStyleName = $this->masterStylesCrossReference[$styleName];
+
+        if (!array_key_exists($masterStyleName, $this->masterPrintStylesCrossReference)) {
+            return;
+        }
+        $printSettingsIndex = $this->masterPrintStylesCrossReference[$masterStyleName];
+
+        if (!array_key_exists($printSettingsIndex, $this->pageLayoutStyles)) {
+            return;
+        }
+        $printSettings = $this->pageLayoutStyles[$printSettingsIndex];
+
+        $worksheet->getPageSetup()
+            ->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT)
+            ->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
+            ->setScale((int) trim($printSettings->scale, '%'))
+            ->setHorizontalCentered($printSettings->horizontalCentered)
+            ->setVerticalCentered($printSettings->verticalCentered);
+
+        $worksheet->getPageMargins()
+            ->setLeft($printSettings->marginLeft)
+            ->setRight($printSettings->marginRight)
+            ->setTop($printSettings->marginTop)
+            ->setBottom($printSettings->marginBottom)
+            ->setHeader($printSettings->marginHeader)
+            ->setFooter($printSettings->marginFooter);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
index c5c7caf84..8c4ccc303 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
@@ -4,9 +4,11 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
 
 use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
 
 class Properties
 {
+    /** @var Spreadsheet */
     private $spreadsheet;
 
     public function __construct(Spreadsheet $spreadsheet)
@@ -14,28 +16,30 @@ class Properties
         $this->spreadsheet = $spreadsheet;
     }
 
-    public function load(\SimpleXMLElement $xml, $namespacesMeta)
+    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'])) {
+                /** @scrutinizer ignore-call */
                 $officePropertiesDC = $officePropertyData->children($namespacesMeta['dc']);
                 $this->setCoreProperties($docProps, $officePropertiesDC);
             }
 
-            $officePropertyMeta = (object) [];
+            $officePropertyMeta = null;
             if (isset($namespacesMeta['dc'])) {
+                /** @scrutinizer ignore-call */
                 $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
             }
+            $officePropertyMeta = $officePropertyMeta ?? [];
             foreach ($officePropertyMeta as $propertyName => $propertyValue) {
                 $this->setMetaProperties($namespacesMeta, $propertyValue, $propertyName, $docProps);
             }
         }
     }
 
-    private function setCoreProperties(DocumentProperties $docProps, \SimpleXMLElement $officePropertyDC)
+    private function setCoreProperties(DocumentProperties $docProps, SimpleXMLElement $officePropertyDC): void
     {
         foreach ($officePropertyDC as $propertyName => $propertyValue) {
             $propertyValue = (string) $propertyValue;
@@ -53,14 +57,8 @@ class Properties
                     $docProps->setLastModifiedBy($propertyValue);
 
                     break;
-                case 'creation-date':
-                    $creationDate = strtotime($propertyValue);
-                    $docProps->setCreated($creationDate);
-                    $docProps->setModified($creationDate);
-
-                    break;
-                case 'keyword':
-                    $docProps->setKeywords($propertyValue);
+                case 'date':
+                    $docProps->setModified($propertyValue);
 
                     break;
                 case 'description':
@@ -72,11 +70,11 @@ class Properties
     }
 
     private function setMetaProperties(
-        $namespacesMeta,
-        \SimpleXMLElement $propertyValue,
-        $propertyName,
+        array $namespacesMeta,
+        SimpleXMLElement $propertyValue,
+        string $propertyName,
         DocumentProperties $docProps
-    ) {
+    ): void {
         $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
         $propertyValue = (string) $propertyValue;
         switch ($propertyName) {
@@ -89,8 +87,7 @@ class Properties
 
                 break;
             case 'creation-date':
-                $creationDate = strtotime($propertyValue);
-                $docProps->setCreated($creationDate);
+                $docProps->setCreated($propertyValue);
 
                 break;
             case 'user-defined':
@@ -100,7 +97,11 @@ class Properties
         }
     }
 
-    private function setUserDefinedProperty($propertyValueAttributes, $propertyValue, DocumentProperties $docProps)
+    /**
+     * @param mixed $propertyValueAttributes
+     * @param mixed $propertyValue
+     */
+    private function setUserDefinedProperty($propertyValueAttributes, $propertyValue, DocumentProperties $docProps): void
     {
         $propertyValueName = '';
         $propertyValueType = DocumentProperties::PROPERTY_TYPE_STRING;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
index 732f0bf61..9ac5e955d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -3,7 +3,6 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Security;
 
 use PhpOffice\PhpSpreadsheet\Reader;
-use PhpOffice\PhpSpreadsheet\Settings;
 
 class XmlScanner
 {
@@ -14,38 +13,43 @@ class XmlScanner
      */
     private $pattern;
 
+    /** @var ?callable */
     private $callback;
 
+    /** @var ?bool */
     private static $libxmlDisableEntityLoaderValue;
 
-    public function __construct($pattern = '<!DOCTYPE')
+    /**
+     * @var bool
+     */
+    private static $shutdownRegistered = false;
+
+    public function __construct(string $pattern = '<!DOCTYPE')
     {
         $this->pattern = $pattern;
 
         $this->disableEntityLoaderCheck();
 
         // A fatal error will bypass the destructor, so we register a shutdown here
-        register_shutdown_function([__CLASS__, 'shutdown']);
-    }
-
-    public static function getInstance(Reader\IReader $reader)
-    {
-        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');
+        if (!self::$shutdownRegistered) {
+            self::$shutdownRegistered = true;
+            register_shutdown_function([__CLASS__, 'shutdown']);
         }
     }
 
-    public static function threadSafeLibxmlDisableEntityLoaderAvailability()
+    public static function getInstance(Reader\IReader $reader): self
     {
-        if (PHP_MAJOR_VERSION == 7) {
+        $pattern = ($reader instanceof Reader\Html) ? '<!ENTITY' : '<!DOCTYPE';
+
+        return new self($pattern);
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function threadSafeLibxmlDisableEntityLoaderAvailability(): bool
+    {
+        if (PHP_MAJOR_VERSION === 7) {
             switch (PHP_MINOR_VERSION) {
                 case 2:
                     return PHP_RELEASE_VERSION >= 1;
@@ -61,9 +65,12 @@ class XmlScanner
         return false;
     }
 
-    private function disableEntityLoaderCheck()
+    /**
+     * @codeCoverageIgnore
+     */
+    private function disableEntityLoaderCheck(): void
     {
-        if (Settings::getLibXmlDisableEntityLoader()) {
+        if (\PHP_VERSION_ID < 80000) {
             $libxmlDisableEntityLoaderValue = libxml_disable_entity_loader(true);
 
             if (self::$libxmlDisableEntityLoaderValue === null) {
@@ -72,9 +79,12 @@ class XmlScanner
         }
     }
 
-    public static function shutdown()
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function shutdown(): void
     {
-        if (self::$libxmlDisableEntityLoaderValue !== null) {
+        if (self::$libxmlDisableEntityLoaderValue !== null && \PHP_VERSION_ID < 80000) {
             libxml_disable_entity_loader(self::$libxmlDisableEntityLoaderValue);
             self::$libxmlDisableEntityLoaderValue = null;
         }
@@ -85,22 +95,29 @@ class XmlScanner
         self::shutdown();
     }
 
-    public function setAdditionalCallback(callable $callback)
+    public function setAdditionalCallback(callable $callback): void
     {
         $this->callback = $callback;
     }
 
+    /** @param mixed $arg */
+    private static function forceString($arg): string
+    {
+        return is_string($arg) ? $arg : '';
+    }
+
+    /**
+     * @param string $xml
+     *
+     * @return string
+     */
     private function toUtf8($xml)
     {
-        $pattern = '/encoding="(.*?)"/';
-        $result = preg_match($pattern, $xml, $matches);
-        $charset = strtoupper($result ? $matches[1] : 'UTF-8');
-
+        $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');
             }
@@ -109,29 +126,44 @@ class XmlScanner
         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
-     *
-     * @throws Reader\Exception
+     * @param false|string $xml
      *
      * @return string
      */
     public function scan($xml)
     {
+        $xml = "$xml";
         $this->disableEntityLoaderCheck();
 
         $xml = $this->toUtf8($xml);
 
         // Don't rely purely on libxml_disable_entity_loader()
-        $pattern = '/\\0?' . implode('\\0?', str_split($this->pattern)) . '\\0?/';
+        $pattern = '/\\0?' . implode('\\0?', /** @scrutinizer ignore-type */ str_split($this->pattern)) . '\\0?/';
 
         if (preg_match($pattern, $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);
         }
 
@@ -143,8 +175,6 @@ class XmlScanner
      *
      * @param string $filestream
      *
-     * @throws Reader\Exception
-     *
      * @return string
      */
     public function scanFile($filestream)
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
index 9912e9376..38eddbcb8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
@@ -4,9 +4,11 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Slk extends BaseReader
 {
@@ -38,6 +40,20 @@ class Slk extends BaseReader
      */
     private $format = 0;
 
+    /**
+     * Fonts.
+     *
+     * @var array
+     */
+    private $fonts = [];
+
+    /**
+     * Font Count.
+     *
+     * @var int
+     */
+    private $fontcount = 0;
+
     /**
      * Create a new SYLK Reader instance.
      */
@@ -48,22 +64,17 @@ class Slk extends BaseReader
 
     /**
      * Validate that the current file is a SYLK 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 (ReaderException $e) {
             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, ';');
@@ -78,16 +89,28 @@ class Slk extends BaseReader
         return $hasDelimiter && $hasId;
     }
 
+    private function canReadOrBust(string $filename): void
+    {
+        if (!$this->canRead($filename)) {
+            throw new ReaderException($filename . ' is an Invalid SYLK file.');
+        }
+        $this->openFile($filename);
+    }
+
     /**
      * Set input encoding.
      *
-     * @param string $pValue Input encoding, eg: 'ANSI'
+     * @deprecated no use is made of this property
+     *
+     * @param string $inputEncoding Input encoding, eg: 'ANSI'
      *
      * @return $this
+     *
+     * @codeCoverageIgnore
      */
-    public function setInputEncoding($pValue)
+    public function setInputEncoding($inputEncoding)
     {
-        $this->inputEncoding = $pValue;
+        $this->inputEncoding = $inputEncoding;
 
         return $this;
     }
@@ -95,7 +118,11 @@ class Slk extends BaseReader
     /**
      * Get input encoding.
      *
+     * @deprecated no use is made of this property
+     *
      * @return string
+     *
+     * @codeCoverageIgnore
      */
     public function getInputEncoding()
     {
@@ -105,31 +132,23 @@ class Slk extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
         // Open file
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
-        }
-        $this->openFile($pFilename);
+        $this->canReadOrBust($filename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
         $worksheetInfo = [];
-        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
-        $worksheetInfo[0]['lastColumnLetter'] = 'A';
-        $worksheetInfo[0]['lastColumnIndex'] = 0;
-        $worksheetInfo[0]['totalRows'] = 0;
-        $worksheetInfo[0]['totalColumns'] = 0;
+        $worksheetInfo[0]['worksheetName'] = basename($filename, '.slk');
 
         // loop through one row (line) at a time in the file
         $rowIndex = 0;
+        $columnIndex = 0;
         while (($rowData = fgets($fileHandle)) !== false) {
             $columnIndex = 0;
 
@@ -141,28 +160,26 @@ class Slk extends BaseReader
             $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
 
             $dataType = array_shift($rowData);
-            if ($dataType == 'C') {
-                //  Read cell value data
+            if ($dataType == 'B') {
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum[0]) {
-                        case 'C':
                         case 'X':
-                            $columnIndex = substr($rowDatum, 1) - 1;
+                            $columnIndex = (int) substr($rowDatum, 1) - 1;
 
                             break;
-                        case 'R':
                         case 'Y':
                             $rowIndex = substr($rowDatum, 1);
 
                             break;
                     }
-
-                    $worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
-                    $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
                 }
+
+                break;
             }
         }
 
+        $worksheetInfo[0]['lastColumnIndex'] = $columnIndex;
+        $worksheetInfo[0]['totalRows'] = $rowIndex;
         $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
         $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
 
@@ -174,39 +191,325 @@ class Slk extends BaseReader
 
     /**
      * Loads PhpSpreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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 const COLOR_ARRAY = [
+        'FF00FFFF', // 0 - cyan
+        'FF000000', // 1 - black
+        'FFFFFFFF', // 2 - white
+        'FFFF0000', // 3 - red
+        'FF00FF00', // 4 - green
+        'FF0000FF', // 5 - blue
+        'FFFFFF00', // 6 - yellow
+        'FFFF00FF', // 7 - magenta
+    ];
+
+    private const FONT_STYLE_MAPPINGS = [
+        'B' => 'bold',
+        'I' => 'italic',
+        'U' => 'underline',
+    ];
+
+    private function processFormula(string $rowDatum, bool &$hasCalculatedValue, string &$cellDataFormula, string $row, string $column): void
+    {
+        $cellDataFormula = '=' . substr($rowDatum, 1);
+        //    Convert R1C1 style references to A1 style references (but only when not quoted)
+        $temp = explode('"', $cellDataFormula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only count/replace in alternate array entries
+            $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
+                //        the formula
+                $cellReferences = array_reverse($cellReferences);
+                //    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) {
+                    $rowReference = $cellReference[2][0];
+                    //    Empty R reference is the current row
+                    if ($rowReference == '') {
+                        $rowReference = $row;
+                    }
+                    //    Bracketed R references are relative to the current row
+                    if ($rowReference[0] == '[') {
+                        $rowReference = (int) $row + (int) trim($rowReference, '[]');
+                    }
+                    $columnReference = $cellReference[4][0];
+                    //    Empty C reference is the current column
+                    if ($columnReference == '') {
+                        $columnReference = $column;
+                    }
+                    //    Bracketed C references are relative to the current column
+                    if ($columnReference[0] == '[') {
+                        $columnReference = (int) $column + (int) trim($columnReference, '[]');
+                    }
+                    $A1CellReference = Coordinate::stringFromColumnIndex((int) $columnReference) . $rowReference;
+
+                    $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                }
+            }
+        }
+        unset($value);
+        //    Then rebuild the formula string
+        $cellDataFormula = implode('"', $temp);
+        $hasCalculatedValue = true;
+    }
+
+    private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell value data
+        $hasCalculatedValue = false;
+        $cellDataFormula = $cellData = '';
+        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);
+
+                    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;
+            }
+        }
+        $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+        $cellData = Calculation::unwrapResult($cellData);
+
+        // Set cell value
+        $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row");
+    }
+
+    private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate): void
+    {
+        // Set cell value
+        $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+        if ($hasCalculatedValue) {
+            $cellData = Calculation::unwrapResult($cellData);
+            $spreadsheet->getActiveSheet()->getCell($coordinate)->setCalculatedValue($cellData);
+        }
+    }
+
+    private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell formatting
+        $formatStyle = $columnWidth = '';
+        $startCol = $endCol = '';
+        $fontStyle = '';
+        $styleData = [];
+        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 'P':
+                    $formatStyle = $rowDatum;
+
+                    break;
+                case 'W':
+                    [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1));
+
+                    break;
+                case 'S':
+                    $this->styleSettings($rowDatum, $styleData, $fontStyle);
+
+                    break;
+            }
+        }
+        $this->addFormats($spreadsheet, $formatStyle, $row, $column);
+        $this->addFonts($spreadsheet, $fontStyle, $row, $column);
+        $this->addStyle($spreadsheet, $styleData, $row, $column);
+        $this->addWidth($spreadsheet, $columnWidth, $startCol, $endCol);
+    }
+
+    private const STYLE_SETTINGS_FONT = ['D' => 'bold', 'I' => 'italic'];
+
+    private const STYLE_SETTINGS_BORDER = [
+        'B' => 'bottom',
+        'L' => 'left',
+        'R' => 'right',
+        'T' => 'top',
+    ];
+
+    private function styleSettings(string $rowDatum, array &$styleData, string &$fontStyle): void
+    {
+        $styleSettings = substr($rowDatum, 1);
+        $iMax = strlen($styleSettings);
+        for ($i = 0; $i < $iMax; ++$i) {
+            $char = $styleSettings[$i];
+            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;
+            } elseif ($char == 'M') {
+                if (preg_match('/M([1-9]\\d*)/', $styleSettings, $matches)) {
+                    $fontStyle = $matches[1];
+                }
+            }
+        }
+    }
+
+    private function addFormats(Spreadsheet &$spreadsheet, string $formatStyle, string $row, string $column): void
+    {
+        if ($formatStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->formats[$formatStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
+            }
+        }
+    }
+
+    private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $row, string $column): void
+    {
+        if ($fontStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->fonts[$fontStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->fonts[$fontStyle]);
+            }
+        }
+    }
+
+    private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void
+    {
+        if ((!empty($styleData)) && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
+        }
+    }
+
+    private function addWidth(Spreadsheet $spreadsheet, string $columnWidth, string $startCol, string $endCol): void
+    {
+        if ($columnWidth > '') {
+            if ($startCol == $endCol) {
+                $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
+                $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
+            } else {
+                $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);
+                } while ($startCol !== $endCol);
+            }
+        }
+    }
+
+    private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void
+    {
+        //    Read shared styles
+        $formatArray = [];
+        $fromFormats = ['\-', '\ '];
+        $toFormats = ['-', ' '];
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'P':
+                    $formatArray['numberFormat']['formatCode'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
+
+                    break;
+                case 'E':
+                case 'F':
+                    $formatArray['font']['name'] = substr($rowDatum, 1);
+
+                    break;
+                case 'M':
+                    $formatArray['font']['size'] = ((float) substr($rowDatum, 1)) / 20;
+
+                    break;
+                case 'L':
+                    $this->processPColors($rowDatum, $formatArray);
+
+                    break;
+                case 'S':
+                    $this->processPFontStyles($rowDatum, $formatArray);
+
+                    break;
+            }
+        }
+        $this->processPFinal($spreadsheet, $formatArray);
+    }
+
+    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'] = self::COLOR_ARRAY[$fontColor];
+        }
+    }
+
+    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], self::FONT_STYLE_MAPPINGS)) {
+                $formatArray['font'][self::FONT_STYLE_MAPPINGS[$styleSettings[$i]]] = true;
+            }
+        }
+    }
+
+    private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): void
+    {
+        if (array_key_exists('numberFormat', $formatArray)) {
+            $this->formats['P' . $this->format] = $formatArray;
+            ++$this->format;
+        } elseif (array_key_exists('font', $formatArray)) {
+            ++$this->fontcount;
+            $this->fonts[$this->fontcount] = $formatArray;
+            if ($this->fontcount === 1) {
+                $spreadsheet->getDefaultStyle()->applyFromArray($formatArray);
+            }
+        }
     }
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
     {
         // Open file
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
-        }
-        $this->openFile($pFilename);
+        $this->canReadOrBust($filename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
@@ -215,251 +518,32 @@ class Slk extends BaseReader
             $spreadsheet->createSheet();
         }
         $spreadsheet->setActiveSheetIndex($this->sheetIndex);
-
-        $fromFormats = ['\-', '\ '];
-        $toFormats = ['-', ' '];
+        $spreadsheet->getActiveSheet()->setTitle(substr(basename($filename, '.slk'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
 
         // Loop through file
         $column = $row = '';
 
         // loop through one row (line) at a time in the file
-        while (($rowData = fgets($fileHandle)) !== false) {
+        while (($rowDataTxt = fgets($fileHandle)) !== false) {
             // convert SYLK encoded $rowData to UTF-8
-            $rowData = StringHelper::SYLKtoUTF8($rowData);
+            $rowDataTxt = StringHelper::SYLKtoUTF8($rowDataTxt);
 
             // explode each row at semicolons while taking into account that literal semicolon (;)
             // is escaped like this (;;)
-            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowDataTxt)))));
 
             $dataType = array_shift($rowData);
-            //    Read shared styles
             if ($dataType == 'P') {
-                $formatArray = [];
-                foreach ($rowData as $rowDatum) {
-                    switch ($rowDatum[0]) {
-                        case 'P':
-                            $formatArray['numberFormat']['formatCode'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
-
-                            break;
-                        case 'E':
-                        case 'F':
-                            $formatArray['font']['name'] = substr($rowDatum, 1);
-
-                            break;
-                        case 'L':
-                            $formatArray['font']['size'] = substr($rowDatum, 1);
-
-                            break;
-                        case 'S':
-                            $styleSettings = substr($rowDatum, 1);
-                            $iMax = strlen($styleSettings);
-                            for ($i = 0; $i < $iMax; ++$i) {
-                                switch ($styleSettings[$i]) {
-                                    case 'I':
-                                        $formatArray['font']['italic'] = true;
-
-                                        break;
-                                    case 'D':
-                                        $formatArray['font']['bold'] = true;
-
-                                        break;
-                                    case 'T':
-                                        $formatArray['borders']['top']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'B':
-                                        $formatArray['borders']['bottom']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'L':
-                                        $formatArray['borders']['left']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'R':
-                                        $formatArray['borders']['right']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                }
-                            }
-
-                            break;
-                    }
-                }
-                $this->formats['P' . $this->format++] = $formatArray;
-            //    Read cell value data
+                //    Read shared styles
+                $this->processPRecord($rowData, $spreadsheet);
             } elseif ($dataType == 'C') {
-                $hasCalculatedValue = false;
-                $cellData = $cellDataFormula = '';
-                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);
-
-                            break;
-                        case 'E':
-                            $cellDataFormula = '=' . substr($rowDatum, 1);
-                            //    Convert R1C1 style references to A1 style references (but only when not quoted)
-                            $temp = explode('"', $cellDataFormula);
-                            $key = false;
-                            foreach ($temp as &$value) {
-                                //    Only count/replace in alternate array entries
-                                if ($key = !$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
-                                    //        the formula
-                                    $cellReferences = array_reverse($cellReferences);
-                                    //    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) {
-                                        $rowReference = $cellReference[2][0];
-                                        //    Empty R reference is the current row
-                                        if ($rowReference == '') {
-                                            $rowReference = $row;
-                                        }
-                                        //    Bracketed R references are relative to the current row
-                                        if ($rowReference[0] == '[') {
-                                            $rowReference = $row + trim($rowReference, '[]');
-                                        }
-                                        $columnReference = $cellReference[4][0];
-                                        //    Empty C reference is the current column
-                                        if ($columnReference == '') {
-                                            $columnReference = $column;
-                                        }
-                                        //    Bracketed C references are relative to the current column
-                                        if ($columnReference[0] == '[') {
-                                            $columnReference = $column + trim($columnReference, '[]');
-                                        }
-                                        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
-
-                                        $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
-                                    }
-                                }
-                            }
-                            unset($value);
-                            //    Then rebuild the formula string
-                            $cellDataFormula = implode('"', $temp);
-                            $hasCalculatedValue = true;
-
-                            break;
-                    }
-                }
-                $columnLetter = Coordinate::stringFromColumnIndex($column);
-                $cellData = Calculation::unwrapResult($cellData);
-
-                // Set cell value
-                $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
-                if ($hasCalculatedValue) {
-                    $cellData = Calculation::unwrapResult($cellData);
-                    $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setCalculatedValue($cellData);
-                }
-                //    Read cell formatting
+                //    Read cell value data
+                $this->processCRecord($rowData, $spreadsheet, $row, $column);
             } elseif ($dataType == 'F') {
-                $formatStyle = $columnWidth = $styleSettings = '';
-                $styleData = [];
-                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 'P':
-                            $formatStyle = $rowDatum;
-
-                            break;
-                        case 'W':
-                            [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1));
-
-                            break;
-                        case 'S':
-                            $styleSettings = substr($rowDatum, 1);
-                            $iMax = strlen($styleSettings);
-                            for ($i = 0; $i < $iMax; ++$i) {
-                                switch ($styleSettings[$i]) {
-                                    case 'I':
-                                        $styleData['font']['italic'] = true;
-
-                                        break;
-                                    case 'D':
-                                        $styleData['font']['bold'] = true;
-
-                                        break;
-                                    case 'T':
-                                        $styleData['borders']['top']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'B':
-                                        $styleData['borders']['bottom']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'L':
-                                        $styleData['borders']['left']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'R':
-                                        $styleData['borders']['right']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                }
-                            }
-
-                            break;
-                    }
-                }
-                if (($formatStyle > '') && ($column > '') && ($row > '')) {
-                    $columnLetter = Coordinate::stringFromColumnIndex($column);
-                    if (isset($this->formats[$formatStyle])) {
-                        $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
-                    }
-                }
-                if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-                    $columnLetter = Coordinate::stringFromColumnIndex($column);
-                    $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
-                }
-                if ($columnWidth > '') {
-                    if ($startCol == $endCol) {
-                        $startCol = Coordinate::stringFromColumnIndex($startCol);
-                        $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-                    } else {
-                        $startCol = Coordinate::stringFromColumnIndex($startCol);
-                        $endCol = Coordinate::stringFromColumnIndex($endCol);
-                        $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-                        do {
-                            $spreadsheet->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
-                        } while ($startCol != $endCol);
-                    }
-                }
+                //    Read cell formatting
+                $this->processFRecord($rowData, $spreadsheet, $row, $column);
             } else {
-                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;
-                    }
-                }
+                $this->columnRowFromRowData($rowData, $column, $row);
             }
         }
 
@@ -470,6 +554,18 @@ class Slk extends BaseReader
         return $spreadsheet;
     }
 
+    private function columnRowFromRowData(array $rowData, string &$column, string &$row): void
+    {
+        foreach ($rowData as $rowDatum) {
+            $char0 = $rowDatum[0];
+            if ($char0 === 'X' || $char0 == 'C') {
+                $column = substr($rowDatum, 1);
+            } elseif ($char0 === 'Y' || $char0 == 'R') {
+                $row = substr($rowDatum, 1);
+            }
+        }
+    }
+
     /**
      * Get sheet index.
      *
@@ -483,13 +579,13 @@ class Slk extends BaseReader
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex($sheetIndex)
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
index 313d7216b..816e7698d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
@@ -7,18 +7,25 @@ use PhpOffice\PhpSpreadsheet\Cell\DataType;
 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\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;
@@ -140,6 +147,8 @@ class Xls extends BaseReader
     const XLS_TYPE_SHEETLAYOUT = 0x0862;
     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
@@ -153,14 +162,14 @@ class Xls extends BaseReader
     /**
      * Summary Information stream data.
      *
-     * @var string
+     * @var ?string
      */
     private $summaryInformation;
 
     /**
      * Extended Summary Information stream data.
      *
-     * @var string
+     * @var ?string
      */
     private $documentSummaryInformation;
 
@@ -224,7 +233,7 @@ class Xls extends BaseReader
     /**
      * Shared fonts.
      *
-     * @var array
+     * @var Font[]
      */
     private $objFonts;
 
@@ -374,12 +383,12 @@ class Xls extends BaseReader
      *
      * @var int
      */
-    private $encryptionStartPos = false;
+    private $encryptionStartPos = 0;
 
     /**
      * The current RC4 decryption object.
      *
-     * @var Xls\RC4
+     * @var ?Xls\RC4
      */
     private $rc4Key;
 
@@ -392,10 +401,11 @@ class Xls extends BaseReader
 
     /**
      * The current MD5 context state.
+     * It is never set in the program, so code which uses it is suspect.
      *
      * @var string
      */
-    private $md5Ctxt;
+    private $md5Ctxt; // @phpstan-ignore-line
 
     /**
      * @var int
@@ -417,21 +427,22 @@ class Xls extends BaseReader
 
     /**
      * 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) {
@@ -439,23 +450,30 @@ class Xls extends BaseReader
         }
     }
 
+    public function setCodepage(string $codepage): void
+    {
+        if (CodePage::validate($codepage) === false) {
+            throw new PhpSpreadsheetException('Unknown codepage: ' . $codepage);
+        }
+
+        $this->codepage = $codepage;
+    }
+
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames($filename)
     {
-        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);
@@ -502,20 +520,18 @@ class Xls extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
-        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);
@@ -615,17 +631,11 @@ class Xls extends BaseReader
 
     /**
      * Loads PhpSpreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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();
@@ -646,7 +656,7 @@ class Xls extends BaseReader
 
         // initialize
         $this->pos = 0;
-        $this->codepage = 'CP1252';
+        $this->codepage = $this->codepage ?: CodePage::DEFAULT_CODE_PAGE;
         $this->formats = [];
         $this->objFonts = [];
         $this->palette = [];
@@ -656,7 +666,7 @@ class Xls extends BaseReader
         $this->definedname = [];
         $this->sst = [];
         $this->drawingGroupData = '';
-        $this->xfIndex = '';
+        $this->xfIndex = 0;
         $this->mapCellXfIndex = [];
         $this->mapCellStyleXfIndex = [];
 
@@ -798,9 +808,10 @@ class Xls extends BaseReader
         }
 
         // treat MSODRAWINGGROUP records, workbook-level Escher
+        $escherWorkbook = null;
         if (!$this->readDataOnly && $this->drawingGroupData) {
-            $escherWorkbook = new Escher();
-            $reader = new Xls\Escher($escherWorkbook);
+            $escher = new Escher();
+            $reader = new Xls\Escher($escher);
             $escherWorkbook = $reader->load($this->drawingGroupData);
         }
 
@@ -1031,6 +1042,14 @@ class Xls extends BaseReader
                     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();
@@ -1074,13 +1093,14 @@ class Xls extends BaseReader
                 $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 = 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
@@ -1089,7 +1109,9 @@ class Xls extends BaseReader
                     }
 
                     // 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();
@@ -1097,12 +1119,12 @@ class Xls extends BaseReader
                     $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:
@@ -1130,38 +1152,44 @@ class Xls extends BaseReader
                                 continue 2;
                             }
 
-                            $BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-                            $BSE = $BSECollection[$BSEindex - 1];
-                            $blipType = $BSE->getBlipType();
+                            if ($escherWorkbook) {
+                                $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);
+                                // need check because some blip types are not supported by Escher reader such as EMF
+                                if ($blip = $BSE->getBlip()) {
+                                    $ih = imagecreatefromstring($blip->getData());
+                                    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);
+                                        // 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);
+                                        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;
+                                            case BSE::BLIPTYPE_PNG:
+                                                imagealphablending($ih, false);
+                                                imagesavealpha($ih, true);
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
 
-                                        break;
+                                                break;
+                                        }
+
+                                        $drawing->setWorksheet($this->phpSheet);
+                                        $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                    }
                                 }
-
-                                $drawing->setWorksheet($this->phpSheet);
-                                $drawing->setCoordinates($spContainer->getStartCoordinates());
                             }
 
                             break;
@@ -1175,6 +1203,7 @@ class Xls extends BaseReader
             // 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);
@@ -1254,10 +1283,10 @@ class Xls extends BaseReader
                                         [$firstColumn, $firstRow] = Coordinate::coordinateFromString($coordinateStrings[0]);
                                         [$lastColumn, $lastRow] = Coordinate::coordinateFromString($coordinateStrings[1]);
 
-                                        if ($firstColumn == 'A' and $lastColumn == 'IV') {
+                                        if ($firstColumn == 'A' && $lastColumn == 'IV') {
                                             // then we have repeating rows
                                             $docSheet->getPageSetup()->setRowsToRepeatAtTop([$firstRow, $lastRow]);
-                                        } elseif ($firstRow == 1 and $lastRow == 65536) {
+                                        } elseif ($firstRow == 1 && $lastRow == 65536) {
                                             // then we have repeating columns
                                             $docSheet->getPageSetup()->setColumnsToRepeatAtLeft([$firstColumn, $lastColumn]);
                                         }
@@ -1272,14 +1301,15 @@ class Xls extends BaseReader
                 // Extract range
                 if (strpos($definedName['formula'], '!') !== false) {
                     $explodes = Worksheet::extractSheetTitle($definedName['formula'], true);
-                    if (($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) ||
-                        ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))) {
+                    if (
+                        ($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));
                     }
@@ -1288,7 +1318,7 @@ class Xls extends BaseReader
                     //    TODO Provide support for named values
             }
         }
-        $this->data = null;
+        $this->data = '';
 
         return $this->spreadsheet;
     }
@@ -1314,8 +1344,8 @@ class Xls extends BaseReader
         $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.
@@ -1352,16 +1382,16 @@ class Xls extends BaseReader
     /**
      * Use OLE reader to extract the relevant data streams from the OLE file.
      *
-     * @param string $pFilename
+     * @param string $filename
      */
-    private function loadOLE($pFilename)
+    private function loadOLE($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
@@ -1371,7 +1401,7 @@ class Xls extends BaseReader
     /**
      * Read summary information.
      */
-    private function readSummaryInformation()
+    private function readSummaryInformation(): void
     {
         if (!isset($this->summaryInformation)) {
             return;
@@ -1446,34 +1476,34 @@ class Xls extends BaseReader
 
             switch ($id) {
                 case 0x01:    //    Code Page
-                    $codePage = CodePage::numberToName($value);
+                    $codePage = CodePage::numberToName((int) $value);
 
                     break;
                 case 0x02:    //    Title
-                    $this->spreadsheet->getProperties()->setTitle($value);
+                    $this->spreadsheet->getProperties()->setTitle("$value");
 
                     break;
                 case 0x03:    //    Subject
-                    $this->spreadsheet->getProperties()->setSubject($value);
+                    $this->spreadsheet->getProperties()->setSubject("$value");
 
                     break;
                 case 0x04:    //    Author (Creator)
-                    $this->spreadsheet->getProperties()->setCreator($value);
+                    $this->spreadsheet->getProperties()->setCreator("$value");
 
                     break;
                 case 0x05:    //    Keywords
-                    $this->spreadsheet->getProperties()->setKeywords($value);
+                    $this->spreadsheet->getProperties()->setKeywords("$value");
 
                     break;
                 case 0x06:    //    Comments (Description)
-                    $this->spreadsheet->getProperties()->setDescription($value);
+                    $this->spreadsheet->getProperties()->setDescription("$value");
 
                     break;
                 case 0x07:    //    Template
                     //    Not supported by PhpSpreadsheet
                     break;
                 case 0x08:    //    Last Saved By (LastModifiedBy)
-                    $this->spreadsheet->getProperties()->setLastModifiedBy($value);
+                    $this->spreadsheet->getProperties()->setLastModifiedBy("$value");
 
                     break;
                 case 0x09:    //    Revision
@@ -1518,7 +1548,7 @@ class Xls extends BaseReader
     /**
      * Read additional document summary information.
      */
-    private function readDocumentSummaryInformation()
+    private function readDocumentSummaryInformation(): void
     {
         if (!isset($this->documentSummaryInformation)) {
             return;
@@ -1598,11 +1628,11 @@ class Xls extends BaseReader
 
             switch ($id) {
                 case 0x01:    //    Code Page
-                    $codePage = CodePage::numberToName($value);
+                    $codePage = CodePage::numberToName((int) $value);
 
                     break;
                 case 0x02:    //    Category
-                    $this->spreadsheet->getProperties()->setCategory($value);
+                    $this->spreadsheet->getProperties()->setCategory("$value");
 
                     break;
                 case 0x03:    //    Presentation Target
@@ -1639,11 +1669,11 @@ class Xls extends BaseReader
                     //    Not supported by PhpSpreadsheet
                     break;
                 case 0x0E:    //    Manager
-                    $this->spreadsheet->getProperties()->setManager($value);
+                    $this->spreadsheet->getProperties()->setManager("$value");
 
                     break;
                 case 0x0F:    //    Company
-                    $this->spreadsheet->getProperties()->setCompany($value);
+                    $this->spreadsheet->getProperties()->setCompany("$value");
 
                     break;
                 case 0x10:    //    Links up-to-date
@@ -1656,7 +1686,7 @@ class Xls extends BaseReader
     /**
      * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
      */
-    private function readDefault()
+    private function readDefault(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
 
@@ -1668,7 +1698,7 @@ class Xls extends BaseReader
      *    The NOTE record specifies a comment associated with a particular cell. In Excel 95 (BIFF7) and earlier versions,
      *        this record stores a note (cell note). This feature was significantly enhanced in Excel 97.
      */
-    private function readNote()
+    private function readNote(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -1698,10 +1728,11 @@ class Xls extends BaseReader
                 //        max 2048 bytes will probably throw a wobbly.
                 $row = self::getUInt2d($recordData, 0);
                 $extension = true;
-                $cellAddress = array_pop(array_keys($this->phpSheet->getComments()));
+                $arrayKeys = array_keys($this->phpSheet->getComments());
+                $cellAddress = array_pop($arrayKeys);
             }
 
-            $cellAddress = str_replace('$', '', $cellAddress);
+            $cellAddress = str_replace('$', '', (string) $cellAddress);
             $noteLength = self::getUInt2d($recordData, 4);
             $noteText = trim(substr($recordData, 6));
 
@@ -1721,7 +1752,7 @@ class Xls extends BaseReader
     /**
      * The TEXT Object record contains the text associated with a cell annotation.
      */
-    private function readTextObject()
+    private function readTextObject(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -1768,7 +1799,7 @@ class Xls extends BaseReader
     /**
      * Read BOF.
      */
-    private function readBof()
+    private function readBof(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = substr($this->data, $this->pos + 4, $length);
@@ -1819,7 +1850,7 @@ class Xls extends BaseReader
      * are based on the source of Spreadsheet-ParseExcel:
      * https://metacpan.org/release/Spreadsheet-ParseExcel
      */
-    private function readFilepass()
+    private function readFilepass(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
 
@@ -1969,7 +2000,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readCodepage()
+    private function readCodepage(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -1995,7 +2026,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readDateMode()
+    private function readDateMode(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2013,7 +2044,7 @@ class Xls extends BaseReader
     /**
      * Read a FONT record.
      */
-    private function readFont()
+    private function readFont(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2058,39 +2089,11 @@ class Xls extends BaseReader
 
             // offset: 8; size: 2; escapement type
             $escapement = self::getUInt2d($recordData, 8);
-            switch ($escapement) {
-                case 0x0001:
-                    $objFont->setSuperscript(true);
-
-                    break;
-                case 0x0002:
-                    $objFont->setSubscript(true);
-
-                    break;
-            }
+            CellFont::escapement($objFont, $escapement);
 
             // offset: 10; size: 1; underline type
             $underlineType = ord($recordData[10]);
-            switch ($underlineType) {
-                case 0x00:
-                    break; // no underline
-                case 0x01:
-                    $objFont->setUnderline(Font::UNDERLINE_SINGLE);
-
-                    break;
-                case 0x02:
-                    $objFont->setUnderline(Font::UNDERLINE_DOUBLE);
-
-                    break;
-                case 0x21:
-                    $objFont->setUnderline(Font::UNDERLINE_SINGLEACCOUNTING);
-
-                    break;
-                case 0x22:
-                    $objFont->setUnderline(Font::UNDERLINE_DOUBLEACCOUNTING);
-
-                    break;
-            }
+            CellFont::underline($objFont, $underlineType);
 
             // offset: 11; size: 1; font family
             // offset: 12; size: 1; character set
@@ -2121,7 +2124,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readFormat()
+    private function readFormat(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2140,6 +2143,10 @@ class Xls extends BaseReader
             }
 
             $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;
         }
     }
@@ -2158,7 +2165,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readXf()
+    private function readXf(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2189,7 +2196,7 @@ class Xls extends BaseReader
                 $numberFormat = ['formatCode' => $code];
             } else {
                 // we set the general format code
-                $numberFormat = ['formatCode' => 'General'];
+                $numberFormat = ['formatCode' => NumberFormat::FORMAT_GENERAL];
             }
             $objStyle->getNumberFormat()->setFormatCode($numberFormat['formatCode']);
 
@@ -2210,68 +2217,15 @@ class Xls extends BaseReader
             // offset:  6; size: 1; Alignment and text break
             // bit 2-0, mask 0x07; horizontal alignment
             $horAlign = (0x07 & ord($recordData[6])) >> 0;
-            switch ($horAlign) {
-                case 0:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_GENERAL);
+            Xls\Style\CellAlignment::horizontal($objStyle->getAlignment(), $horAlign);
 
-                    break;
-                case 1:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT);
-
-                    break;
-                case 2:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
-
-                    break;
-                case 3:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT);
-
-                    break;
-                case 4:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_FILL);
-
-                    break;
-                case 5:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_JUSTIFY);
-
-                    break;
-                case 6:
-                    $objStyle->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER_CONTINUOUS);
-
-                    break;
-            }
             // bit 3, mask 0x08; wrap text
             $wrapText = (0x08 & ord($recordData[6])) >> 3;
-            switch ($wrapText) {
-                case 0:
-                    $objStyle->getAlignment()->setWrapText(false);
+            Xls\Style\CellAlignment::wrap($objStyle->getAlignment(), $wrapText);
 
-                    break;
-                case 1:
-                    $objStyle->getAlignment()->setWrapText(true);
-
-                    break;
-            }
             // bit 6-4, mask 0x70; vertical alignment
             $vertAlign = (0x70 & ord($recordData[6])) >> 4;
-            switch ($vertAlign) {
-                case 0:
-                    $objStyle->getAlignment()->setVertical(Alignment::VERTICAL_TOP);
-
-                    break;
-                case 1:
-                    $objStyle->getAlignment()->setVertical(Alignment::VERTICAL_CENTER);
-
-                    break;
-                case 2:
-                    $objStyle->getAlignment()->setVertical(Alignment::VERTICAL_BOTTOM);
-
-                    break;
-                case 3:
-                    $objStyle->getAlignment()->setVertical(Alignment::VERTICAL_JUSTIFY);
-
-                    break;
-            }
+            Xls\Style\CellAlignment::vertical($objStyle->getAlignment(), $vertAlign);
 
             if ($this->version == self::XLS_BIFF8) {
                 // offset:  7; size: 1; XF_ROTATION: Text rotation angle
@@ -2281,8 +2235,8 @@ class Xls extends BaseReader
                     $rotation = $angle;
                 } elseif ($angle <= 180) {
                     $rotation = 90 - $angle;
-                } elseif ($angle == 255) {
-                    $rotation = -165;
+                } elseif ($angle == Alignment::TEXTROTATION_STACK_EXCEL) {
+                    $rotation = Alignment::TEXTROTATION_STACK_PHPSPREADSHEET;
                 }
                 $objStyle->getAlignment()->setTextRotation($rotation);
 
@@ -2333,15 +2287,17 @@ class Xls extends BaseReader
                 $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;
+                $diagonalUp = ((int) 0x80000000 & 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);
                 }
 
@@ -2361,7 +2317,7 @@ class Xls extends BaseReader
                 }
 
                 // bit: 31-26; mask: 0xFC000000 fill pattern
-                if ($fillType = Xls\Style\FillPattern::lookup((0xFC000000 & self::getInt4d($recordData, 14)) >> 26)) {
+                if ($fillType = Xls\Style\FillPattern::lookup(((int) 0xFC000000 & self::getInt4d($recordData, 14)) >> 26)) {
                     $objStyle->getFill()->setFillType($fillType);
                 }
                 // offset: 18; size: 2; pattern and background colour
@@ -2384,7 +2340,7 @@ class Xls extends BaseReader
 
                         break;
                     case 1:
-                        $objStyle->getAlignment()->setTextRotation(-165);
+                        $objStyle->getAlignment()->setTextRotation(Alignment::TEXTROTATION_STACK_PHPSPREADSHEET);
 
                         break;
                     case 2:
@@ -2413,7 +2369,7 @@ class Xls extends BaseReader
                 $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 = ((int) 0xFE000000 & $borderAndBackground) >> 25;
 
                 // offset: 12; size: 4; cell border lines
                 $borderLines = self::getInt4d($recordData, 12);
@@ -2455,7 +2411,7 @@ class Xls extends BaseReader
         }
     }
 
-    private function readXfExt()
+    private function readXfExt(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2504,7 +2460,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $fill = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
                                 $fill->getStartColor()->setRGB($rgb);
-                                unset($fill->startcolorIndex); // normal color index does not apply, discard
+                                $fill->startcolorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2520,7 +2476,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $fill = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
                                 $fill->getEndColor()->setRGB($rgb);
-                                unset($fill->endcolorIndex); // normal color index does not apply, discard
+                                $fill->endcolorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2536,7 +2492,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $top = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getTop();
                                 $top->getColor()->setRGB($rgb);
-                                unset($top->colorIndex); // normal color index does not apply, discard
+                                $top->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2552,7 +2508,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $bottom = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getBottom();
                                 $bottom->getColor()->setRGB($rgb);
-                                unset($bottom->colorIndex); // normal color index does not apply, discard
+                                $bottom->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2568,7 +2524,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $left = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getLeft();
                                 $left->getColor()->setRGB($rgb);
-                                unset($left->colorIndex); // normal color index does not apply, discard
+                                $left->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2584,7 +2540,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $right = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getRight();
                                 $right->getColor()->setRGB($rgb);
-                                unset($right->colorIndex); // normal color index does not apply, discard
+                                $right->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2600,7 +2556,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $diagonal = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
                                 $diagonal->getColor()->setRGB($rgb);
-                                unset($diagonal->colorIndex); // normal color index does not apply, discard
+                                $diagonal->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2616,7 +2572,7 @@ class Xls extends BaseReader
                             if (isset($this->mapCellXfIndex[$ixfe])) {
                                 $font = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFont();
                                 $font->getColor()->setRGB($rgb);
-                                unset($font->colorIndex); // normal color index does not apply, discard
+                                $font->colorIndex = null; // normal color index does not apply, discard
                             }
                         }
 
@@ -2631,7 +2587,7 @@ class Xls extends BaseReader
     /**
      * Read STYLE record.
      */
-    private function readStyle()
+    private function readStyle(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2668,7 +2624,7 @@ class Xls extends BaseReader
     /**
      * Read PALETTE record.
      */
-    private function readPalette()
+    private function readPalette(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2700,7 +2656,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readSheet()
+    private function readSheet(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2736,6 +2692,7 @@ class Xls extends BaseReader
         $sheetType = ord($recordData[5]);
 
         // offset: 6; size: var; sheet name
+        $rec_name = null;
         if ($this->version == self::XLS_BIFF8) {
             $string = self::readUnicodeStringShort(substr($recordData, 6));
             $rec_name = $string['value'];
@@ -2755,7 +2712,7 @@ class Xls extends BaseReader
     /**
      * Read EXTERNALBOOK record.
      */
-    private function readExternalBook()
+    private function readExternalBook(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2817,7 +2774,7 @@ class Xls extends BaseReader
     /**
      * Read EXTERNNAME record.
      */
-    private function readExternName()
+    private function readExternName(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2851,7 +2808,7 @@ class Xls extends BaseReader
     /**
      * Read EXTERNSHEET record.
      */
-    private function readExternSheet()
+    private function readExternSheet(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2887,7 +2844,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readDefinedName()
+    private function readDefinedName(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -2941,7 +2898,7 @@ class Xls extends BaseReader
     /**
      * Read MSODRAWINGGROUP record.
      */
-    private function readMsoDrawingGroup()
+    private function readMsoDrawingGroup(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
 
@@ -2963,11 +2920,14 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readSst()
+    private function readSst(): void
     {
         // offset within (spliced) record data
         $pos = 0;
 
+        // Limit global SST position, further control for bad SST Length in BIFF8 data
+        $limitposSST = 0;
+
         // get spliced record data
         $splicedRecordData = $this->getSplicedRecordData();
 
@@ -2981,8 +2941,17 @@ class Xls extends BaseReader
         $nm = self::getInt4d($recordData, 4);
         $pos += 4;
 
+        // look up limit position
+        foreach ($spliceOffsets as $spliceOffset) {
+            // it can happen that the string is empty, therefore we need
+            // <= and not just <
+            if ($pos <= $spliceOffset) {
+                $limitposSST = $spliceOffset;
+            }
+        }
+
         // loop through the Unicode strings (16-bit length)
-        for ($i = 0; $i < $nm; ++$i) {
+        for ($i = 0; $i < $nm && $pos < $limitposSST; ++$i) {
             // number of characters in the Unicode string
             $numChars = self::getUInt2d($recordData, $pos);
             $pos += 2;
@@ -3000,12 +2969,14 @@ class Xls extends BaseReader
             // bit: 3; mask: 0x03; 0 = ordinary; 1 = Rich-Text
             $hasRichText = (($optionFlags & 0x08) != 0);
 
+            $formattingRuns = 0;
             if ($hasRichText) {
                 // number of Rich-Text formatting runs
                 $formattingRuns = self::getUInt2d($recordData, $pos);
                 $pos += 2;
             }
 
+            $extendedRunLength = 0;
             if ($hasAsian) {
                 // size of Asian phonetic setting
                 $extendedRunLength = self::getInt4d($recordData, $pos);
@@ -3015,7 +2986,8 @@ class Xls extends BaseReader
             // expected byte length of character array if not split
             $len = ($isCompressed) ? $numChars : $numChars * 2;
 
-            // look up limit position
+            // look up limit position - Check it again to be sure that no error occurs when parsing SST structure
+            $limitpos = null;
             foreach ($spliceOffsets as $spliceOffset) {
                 // it can happen that the string is empty, therefore we need
                 // <= and not just <
@@ -3144,7 +3116,7 @@ class Xls extends BaseReader
     /**
      * Read PRINTGRIDLINES record.
      */
-    private function readPrintGridlines()
+    private function readPrintGridlines(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3162,7 +3134,7 @@ class Xls extends BaseReader
     /**
      * Read DEFAULTROWHEIGHT record.
      */
-    private function readDefaultRowHeight()
+    private function readDefaultRowHeight(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3179,7 +3151,7 @@ class Xls extends BaseReader
     /**
      * Read SHEETPR record.
      */
-    private function readSheetPr()
+    private function readSheetPr(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3191,11 +3163,11 @@ class Xls extends BaseReader
 
         // 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
@@ -3205,7 +3177,7 @@ class Xls extends BaseReader
     /**
      * Read HORIZONTALPAGEBREAKS record.
      */
-    private function readHorizontalPageBreaks()
+    private function readHorizontalPageBreaks(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3224,7 +3196,7 @@ class Xls extends BaseReader
                 $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);
             }
         }
     }
@@ -3232,7 +3204,7 @@ class Xls extends BaseReader
     /**
      * Read VERTICALPAGEBREAKS record.
      */
-    private function readVerticalPageBreaks()
+    private function readVerticalPageBreaks(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3248,10 +3220,10 @@ class Xls extends BaseReader
             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);
             }
         }
     }
@@ -3259,7 +3231,7 @@ class Xls extends BaseReader
     /**
      * Read HEADER record.
      */
-    private function readHeader()
+    private function readHeader(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3286,7 +3258,7 @@ class Xls extends BaseReader
     /**
      * Read FOOTER record.
      */
-    private function readFooter()
+    private function readFooter(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3312,7 +3284,7 @@ class Xls extends BaseReader
     /**
      * Read HCENTER record.
      */
-    private function readHcenter()
+    private function readHcenter(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3331,7 +3303,7 @@ class Xls extends BaseReader
     /**
      * Read VCENTER record.
      */
-    private function readVcenter()
+    private function readVcenter(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3350,7 +3322,7 @@ class Xls extends BaseReader
     /**
      * Read LEFTMARGIN record.
      */
-    private function readLeftMargin()
+    private function readLeftMargin(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3367,7 +3339,7 @@ class Xls extends BaseReader
     /**
      * Read RIGHTMARGIN record.
      */
-    private function readRightMargin()
+    private function readRightMargin(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3384,7 +3356,7 @@ class Xls extends BaseReader
     /**
      * Read TOPMARGIN record.
      */
-    private function readTopMargin()
+    private function readTopMargin(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3401,7 +3373,7 @@ class Xls extends BaseReader
     /**
      * Read BOTTOMMARGIN record.
      */
-    private function readBottomMargin()
+    private function readBottomMargin(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3418,7 +3390,7 @@ class Xls extends BaseReader
     /**
      * Read PAGESETUP record.
      */
-    private function readPageSetup()
+    private function readPageSetup(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3441,6 +3413,9 @@ class Xls extends BaseReader
 
             // offset: 10; size: 2; option flags
 
+            // bit: 0; mask: 0x0001; 0=down then over, 1=over then down
+            $isOverThenDown = (0x0001 & self::getUInt2d($recordData, 10));
+
             // bit: 1; mask: 0x0002; 0=landscape, 1=portrait
             $isPortrait = (0x0002 & self::getUInt2d($recordData, 10)) >> 1;
 
@@ -3450,16 +3425,8 @@ class Xls extends BaseReader
 
             if (!$isNotInit) {
                 $this->phpSheet->getPageSetup()->setPaperSize($paperSize);
-                switch ($isPortrait) {
-                    case 0:
-                        $this->phpSheet->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
-
-                        break;
-                    case 1:
-                        $this->phpSheet->getPageSetup()->setOrientation(PageSetup::ORIENTATION_PORTRAIT);
-
-                        break;
-                }
+                $this->phpSheet->getPageSetup()->setPageOrder(((bool) $isOverThenDown) ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER);
+                $this->phpSheet->getPageSetup()->setOrientation(((bool) $isPortrait) ? PageSetup::ORIENTATION_PORTRAIT : PageSetup::ORIENTATION_LANDSCAPE);
 
                 $this->phpSheet->getPageSetup()->setScale($scale, false);
                 $this->phpSheet->getPageSetup()->setFitToPage((bool) $this->isFitToPages);
@@ -3481,7 +3448,7 @@ class Xls extends BaseReader
      * PROTECT - Sheet protection (BIFF2 through BIFF8)
      *   if this record is omitted, then it also means no sheet protection.
      */
-    private function readProtect()
+    private function readProtect(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3503,7 +3470,7 @@ class Xls extends BaseReader
     /**
      * SCENPROTECT.
      */
-    private function readScenProtect()
+    private function readScenProtect(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3526,7 +3493,7 @@ class Xls extends BaseReader
     /**
      * OBJECTPROTECT.
      */
-    private function readObjectProtect()
+    private function readObjectProtect(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3549,7 +3516,7 @@ class Xls extends BaseReader
     /**
      * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8).
      */
-    private function readPassword()
+    private function readPassword(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3567,7 +3534,7 @@ class Xls extends BaseReader
     /**
      * Read DEFCOLWIDTH record.
      */
-    private function readDefColWidth()
+    private function readDefColWidth(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3585,7 +3552,7 @@ class Xls extends BaseReader
     /**
      * Read COLINFO record.
      */
-    private function readColInfo()
+    private function readColInfo(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3614,7 +3581,7 @@ class Xls extends BaseReader
             $level = (0x0700 & self::getUInt2d($recordData, 8)) >> 8;
 
             // bit: 12; mask: 0x1000; 1 = collapsed
-            $isCollapsed = (0x1000 & self::getUInt2d($recordData, 8)) >> 12;
+            $isCollapsed = (bool) ((0x1000 & self::getUInt2d($recordData, 8)) >> 12);
 
             // offset: 10; size: 2; not used
 
@@ -3628,7 +3595,9 @@ class Xls extends BaseReader
                 $this->phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
                 $this->phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
                 $this->phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
-                $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                if (isset($this->mapCellXfIndex[$xfIndex])) {
+                    $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
             }
         }
     }
@@ -3643,7 +3612,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readRow()
+    private function readRow(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3682,7 +3651,7 @@ class Xls extends BaseReader
             $this->phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
 
             // bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
-            $isCollapsed = (0x00000010 & self::getInt4d($recordData, 12)) >> 4;
+            $isCollapsed = (bool) ((0x00000010 & self::getInt4d($recordData, 12)) >> 4);
             $this->phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
 
             // bit: 5; mask: 0x00000020; 1 = row is hidden
@@ -3712,7 +3681,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readRk()
+    private function readRk(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3737,7 +3706,7 @@ class Xls extends BaseReader
             $numValue = self::getIEEE754($rknum);
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add style information
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -3756,7 +3725,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readLabelSst()
+    private function readLabelSst(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3803,10 +3772,13 @@ class Xls extends BaseReader
                                 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]);
                             }
                         }
@@ -3840,7 +3812,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readMulRk()
+    private function readMulRk(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3872,7 +3844,7 @@ class Xls extends BaseReader
                 // offset: var; size: 4; RK value
                 $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
                 $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-                if (!$this->readDataOnly) {
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                     // add style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
@@ -3893,7 +3865,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readNumber()
+    private function readNumber(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3916,7 +3888,7 @@ class Xls extends BaseReader
             $numValue = self::extractNumber(substr($recordData, 6, 8));
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -3934,7 +3906,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readFormula()
+    private function readFormula(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -3999,21 +3971,27 @@ class Xls extends BaseReader
 
                 // read STRING record
                 $value = $this->readString();
-            } elseif ((ord($recordData[6]) == 1)
+            } elseif (
+                (ord($recordData[6]) == 1)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Boolean formula. Result is in +2; 0=false, 1=true
                 $dataType = DataType::TYPE_BOOL;
                 $value = (bool) ord($recordData[8]);
-            } elseif ((ord($recordData[6]) == 2)
+            } elseif (
+                (ord($recordData[6]) == 2)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Error formula. Error code is in +2
                 $dataType = DataType::TYPE_ERROR;
                 $value = Xls\ErrorCode::lookup(ord($recordData[8]));
-            } elseif ((ord($recordData[6]) == 3)
+            } elseif (
+                (ord($recordData[6]) == 3)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Formula result is a null string
                 $dataType = DataType::TYPE_NULL;
                 $value = '';
@@ -4024,7 +4002,7 @@ class Xls extends BaseReader
             }
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -4060,7 +4038,7 @@ class Xls extends BaseReader
      * which usually contains relative references.
      * These will be used to construct the formula in each shared formula part after the sheet is read.
      */
-    private function readSharedFmla()
+    private function readSharedFmla(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4118,7 +4096,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readBoolErr()
+    private function readBoolErr(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4162,7 +4140,7 @@ class Xls extends BaseReader
                     break;
             }
 
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -4177,7 +4155,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readMulBlank()
+    private function readMulBlank(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4200,7 +4178,9 @@ class Xls extends BaseReader
                 // Read cell?
                 if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
                     $xfIndex = self::getUInt2d($recordData, 4 + 2 * $i);
-                    $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    if (isset($this->mapCellXfIndex[$xfIndex])) {
+                        $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    }
                 }
             }
         }
@@ -4218,7 +4198,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readLabel()
+    private function readLabel(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4251,7 +4231,7 @@ class Xls extends BaseReader
                 $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                 $cell->setValueExplicit($value, DataType::TYPE_STRING);
 
-                if (!$this->readDataOnly) {
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                     // add cell style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
@@ -4262,7 +4242,7 @@ class Xls extends BaseReader
     /**
      * Read BLANK record.
      */
-    private function readBlank()
+    private function readBlank(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4283,7 +4263,7 @@ class Xls extends BaseReader
             $xfIndex = self::getUInt2d($recordData, 4);
 
             // add style information
-            if (!$this->readDataOnly && $this->readEmptyCells) {
+            if (!$this->readDataOnly && $this->readEmptyCells && isset($this->mapCellXfIndex[$xfIndex])) {
                 $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
         }
@@ -4292,7 +4272,7 @@ class Xls extends BaseReader
     /**
      * Read MSODRAWING record.
      */
-    private function readMsoDrawing()
+    private function readMsoDrawing(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
 
@@ -4306,7 +4286,7 @@ class Xls extends BaseReader
     /**
      * Read OBJ record.
      */
-    private function readObj()
+    private function readObj(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4346,7 +4326,7 @@ class Xls extends BaseReader
     /**
      * Read WINDOW2 record.
      */
-    private function readWindow2()
+    private function readWindow2(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4362,16 +4342,29 @@ class Xls extends BaseReader
 
         // offset: 4; size: 2; index to first visible colum
         $firstVisibleColumn = self::getUInt2d($recordData, 4);
+        $zoomscaleInPageBreakPreview = 0;
+        $zoomscaleInNormalView = 0;
         if ($this->version === self::XLS_BIFF8) {
             // offset:  8; size: 2; not used
             // offset: 10; size: 2; cached magnification factor in page break preview (in percent); 0 = Default (60%)
             // offset: 12; size: 2; cached magnification factor in normal view (in percent); 0 = Default (100%)
             // offset: 14; size: 4; not used
-            $zoomscaleInPageBreakPreview = self::getUInt2d($recordData, 10);
+            if (!isset($recordData[10])) {
+                $zoomscaleInPageBreakPreview = 0;
+            } else {
+                $zoomscaleInPageBreakPreview = self::getUInt2d($recordData, 10);
+            }
+
             if ($zoomscaleInPageBreakPreview === 0) {
                 $zoomscaleInPageBreakPreview = 60;
             }
-            $zoomscaleInNormalView = self::getUInt2d($recordData, 12);
+
+            if (!isset($recordData[12])) {
+                $zoomscaleInNormalView = 0;
+            } else {
+                $zoomscaleInNormalView = self::getUInt2d($recordData, 12);
+            }
+
             if ($zoomscaleInNormalView === 0) {
                 $zoomscaleInNormalView = 100;
             }
@@ -4417,7 +4410,7 @@ class Xls extends BaseReader
     /**
      * Read PLV Record(Created by Excel2007 or upper).
      */
-    private function readPageLayoutView()
+    private function readPageLayoutView(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4454,7 +4447,7 @@ class Xls extends BaseReader
     /**
      * Read SCL record.
      */
-    private function readScl()
+    private function readScl(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4475,7 +4468,7 @@ class Xls extends BaseReader
     /**
      * Read PANE record.
      */
-    private function readPane()
+    private function readPane(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4509,7 +4502,7 @@ class Xls extends BaseReader
     /**
      * Read SELECTION record. There is one such record for each pane in the sheet.
      */
-    private function readSelection()
+    private function readSelection(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4539,24 +4532,24 @@ class Xls extends BaseReader
 
             // 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);
         }
     }
 
-    private function includeCellRangeFiltered($cellRangeAddress)
+    private function includeCellRangeFiltered(string $cellRangeAddress): bool
     {
         $includeCellRange = true;
         if ($this->getReadFilter() !== null) {
@@ -4586,7 +4579,7 @@ class Xls extends BaseReader
      * --    "OpenOffice.org's Documentation of the Microsoft
      *         Excel File Format"
      */
-    private function readMergedCells()
+    private function readMergedCells(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4597,9 +4590,11 @@ class Xls extends BaseReader
         if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
             $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($recordData);
             foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
-                if ((strpos($cellRangeAddress, ':') !== false) &&
-                    ($this->includeCellRangeFiltered($cellRangeAddress))) {
-                    $this->phpSheet->mergeCells($cellRangeAddress);
+                if (
+                    (strpos($cellRangeAddress, ':') !== false) &&
+                    ($this->includeCellRangeFiltered($cellRangeAddress))
+                ) {
+                    $this->phpSheet->mergeCells($cellRangeAddress, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
@@ -4608,7 +4603,7 @@ class Xls extends BaseReader
     /**
      * Read HYPERLINK record.
      */
-    private function readHyperLink()
+    private function readHyperLink(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4781,7 +4776,7 @@ class Xls extends BaseReader
     /**
      * Read DATAVALIDATIONS record.
      */
-    private function readDataValidations()
+    private function readDataValidations(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4793,7 +4788,7 @@ class Xls extends BaseReader
     /**
      * Read DATAVALIDATION record.
      */
-    private function readDataValidation()
+    private function readDataValidation(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4810,57 +4805,11 @@ class Xls extends BaseReader
 
         // 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
@@ -4880,39 +4829,10 @@ class Xls extends BaseReader
 
         // bit: 20-23; mask: 0x00F00000; condition operator
         $operator = (0x00F00000 & $options) >> 20;
-        switch ($operator) {
-            case 0x00:
-                $operator = DataValidation::OPERATOR_BETWEEN;
+        $operator = Xls\DataValidationHelper::operator($operator);
 
-                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;
-
-                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
@@ -4946,6 +4866,7 @@ class Xls extends BaseReader
         // offset: var; size: $sz1; formula data for first condition (without size field)
         $formula1 = substr($recordData, $offset, $sz1);
         $formula1 = pack('v', $sz1) . $formula1; // prepend the length
+
         try {
             $formula1 = $this->getFormulaFromStructure($formula1);
 
@@ -4968,6 +4889,7 @@ class Xls extends BaseReader
         // offset: var; size: $sz2; formula data for second condition (without size field)
         $formula2 = substr($recordData, $offset, $sz2);
         $formula2 = pack('v', $sz2) . $formula2; // prepend the length
+
         try {
             $formula2 = $this->getFormulaFromStructure($formula2);
         } catch (PhpSpreadsheetException $e) {
@@ -5003,7 +4925,7 @@ class Xls extends BaseReader
     /**
      * Read SHEETLAYOUT record. Stores sheet tab color information.
      */
-    private function readSheetLayout()
+    private function readSheetLayout(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -5034,8 +4956,6 @@ class Xls extends BaseReader
                 case 0x28:
                     // TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
                     return;
-
-                    break;
             }
         }
     }
@@ -5043,7 +4963,7 @@ class Xls extends BaseReader
     /**
      * Read SHEETPROTECTION record (FEATHEADR).
      */
-    private function readSheetProtection()
+    private function readSheetProtection(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -5076,12 +4996,14 @@ class Xls extends BaseReader
         $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;
@@ -5116,8 +5038,9 @@ class Xls extends BaseReader
         $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;
@@ -5132,8 +5055,9 @@ class Xls extends BaseReader
         $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
     }
@@ -5143,7 +5067,7 @@ class Xls extends BaseReader
      * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
      * where it is referred to as FEAT record.
      */
-    private function readRangeProtection()
+    private function readRangeProtection(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -5205,7 +5129,7 @@ class Xls extends BaseReader
      * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
      * In this case, we must treat the CONTINUE record as a MSODRAWING record.
      */
-    private function readContinue()
+    private function readContinue(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -5325,7 +5249,7 @@ class Xls extends BaseReader
         // start parsing the formula data
         $tokens = [];
 
-        while (strlen($formulaData) > 0 and $token = $this->getNextToken($formulaData, $baseCell)) {
+        while (strlen($formulaData) > 0 && $token = $this->getNextToken($formulaData, $baseCell)) {
             $tokens[] = $token;
             $formulaData = substr($formulaData, $token['size']);
         }
@@ -5516,8 +5440,6 @@ class Xls extends BaseReader
      * @param string $formulaData Formula data
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
      *
-     * @throws Exception
-     *
      * @return array
      */
     private function getNextToken($formulaData, $baseCell = 'A1')
@@ -5724,8 +5646,6 @@ class Xls extends BaseReader
                                 break;
                             default:
                                 throw new Exception('Unrecognized space type in tAttrSpace token');
-
-                                break;
                         }
                         // offset: 3; size: 1; number of inserted spaces/carriage returns
                         $spacecount = ord($formulaData[3]);
@@ -5735,8 +5655,6 @@ class Xls extends BaseReader
                         break;
                     default:
                         throw new Exception('Unrecognized attribute flag in tAttr token');
-
-                        break;
                 }
 
                 break;
@@ -5767,6 +5685,7 @@ class Xls extends BaseReader
                 $size = 9;
                 $data = self::extractNumber(substr($formulaData, 1));
                 $data = str_replace(',', '.', (string) $data); // in case non-English locale
+
                 break;
             case 0x20:    //    array constant
             case 0x40:
@@ -6586,8 +6505,6 @@ class Xls extends BaseReader
                         break;
                     default:
                         throw new Exception('Unrecognized function in formula');
-
-                        break;
                 }
                 $data = ['function' => $function, 'args' => $args];
 
@@ -6956,8 +6873,6 @@ class Xls extends BaseReader
                         break;
                     default:
                         throw new Exception('Unrecognized function in formula');
-
-                        break;
                 }
                 $data = ['function' => $function, 'args' => $args];
 
@@ -6970,7 +6885,7 @@ class Xls extends BaseReader
                 // 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'];
+                $data = $this->definedname[$definedNameIndex]['name'] ?? '';
 
                 break;
             case 0x24:    //    single cell reference e.g. A5
@@ -7046,7 +6961,7 @@ class Xls extends BaseReader
                 // 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
@@ -7087,11 +7002,9 @@ class Xls extends BaseReader
                 }
 
                 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 [
@@ -7145,6 +7058,7 @@ class Xls extends BaseReader
     {
         [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell);
         $baseCol = Coordinate::columnIndexFromString($baseCol) - 1;
+        $baseRow = (int) $baseRow;
 
         // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
         $rowIndex = self::getUInt2d($cellAddressStructure, 0);
@@ -7186,8 +7100,6 @@ class Xls extends BaseReader
      *
      * @param string $subData
      *
-     * @throws Exception
-     *
      * @return string
      */
     private function readBIFF5CellRangeAddressFixed($subData)
@@ -7213,7 +7125,7 @@ class Xls extends BaseReader
         $fc = Coordinate::stringFromColumnIndex($fc + 1);
         $lc = Coordinate::stringFromColumnIndex($lc + 1);
 
-        if ($fr == $lr and $fc == $lc) {
+        if ($fr == $lr && $fc == $lc) {
             return "$fc$fr";
         }
 
@@ -7227,8 +7139,6 @@ class Xls extends BaseReader
      *
      * @param string $subData
      *
-     * @throws Exception
-     *
      * @return string
      */
     private function readBIFF8CellRangeAddressFixed($subData)
@@ -7254,7 +7164,7 @@ class Xls extends BaseReader
         $fc = Coordinate::stringFromColumnIndex($fc + 1);
         $lc = Coordinate::stringFromColumnIndex($lc + 1);
 
-        if ($fr == $lr and $fc == $lc) {
+        if ($fr == $lr && $fc == $lc) {
             return "$fc$fr";
         }
 
@@ -7326,8 +7236,8 @@ class Xls extends BaseReader
      */
     private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
     {
-        [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell);
-        $baseCol = Coordinate::columnIndexFromString($baseCol) - 1;
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($baseCell);
+        $baseCol = $baseCol - 1;
 
         // TODO: if cell range is just a single cell, should this funciton
         // not just return e.g. 'A1' and not 'A1:A1' ?
@@ -7465,8 +7375,6 @@ class Xls extends BaseReader
      *
      * @param int $index
      *
-     * @throws Exception
-     *
      * @return false|string
      */
     private function readSheetRangeByRefIndex($index)
@@ -7477,7 +7385,7 @@ class Xls extends BaseReader
             switch ($type) {
                 case 'internal':
                     // check if we have a deleted 3d reference
-                    if ($this->ref[$index]['firstSheetIndex'] == 0xFFFF or $this->ref[$index]['lastSheetIndex'] == 0xFFFF) {
+                    if ($this->ref[$index]['firstSheetIndex'] == 0xFFFF || $this->ref[$index]['lastSheetIndex'] == 0xFFFF) {
                         throw new Exception('Deleted sheet reference');
                     }
 
@@ -7504,13 +7412,9 @@ class Xls extends BaseReader
                     }
 
                     return $sheetRange;
-
-                    break;
                 default:
                     // TODO: external sheet support
                     throw new Exception('Xls reader only supports internal sheets in formulas');
-
-                    break;
             }
         }
 
@@ -7605,6 +7509,8 @@ class Xls extends BaseReader
                 $size = 9;
 
                 break;
+            default:
+                throw new PhpSpreadsheetException('Unsupported BIFF8 constant');
         }
 
         return [
@@ -7702,7 +7608,7 @@ class Xls extends BaseReader
         $string = self::readUnicodeString(substr($subData, 1), $characterCount);
 
         // add 1 for the string length
-        $string['size'] += 1;
+        ++$string['size'];
 
         return $string;
     }
@@ -7790,18 +7696,18 @@ class Xls extends BaseReader
     {
         $rknumhigh = self::getInt4d($data, 4);
         $rknumlow = self::getInt4d($data, 0);
-        $sign = ($rknumhigh & 0x80000000) >> 31;
+        $sign = ($rknumhigh & (int) 0x80000000) >> 31;
         $exp = (($rknumhigh & 0x7ff00000) >> 20) - 1023;
         $mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
-        $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
+        $mantissalow1 = ($rknumlow & (int) 0x80000000) >> 31;
         $mantissalow2 = ($rknumlow & 0x7fffffff);
-        $value = $mantissa / pow(2, (20 - $exp));
+        $value = $mantissa / 2 ** (20 - $exp);
 
         if ($mantissalow1 != 0) {
-            $value += 1 / pow(2, (21 - $exp));
+            $value += 1 / 2 ** (21 - $exp);
         }
 
-        $value += $mantissalow2 / pow(2, (52 - $exp));
+        $value += $mantissalow2 / 2 ** (52 - $exp);
         if ($sign) {
             $value *= -1;
         }
@@ -7824,10 +7730,10 @@ class Xls extends BaseReader
             // 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;
+            $sign = ($rknum & (int) 0x80000000) >> 31;
             $exp = ($rknum & 0x7ff00000) >> 20;
             $mantissa = (0x100000 | ($rknum & 0x000ffffc));
-            $value = $mantissa / pow(2, (20 - ($exp - 1023)));
+            $value = $mantissa / 2 ** (20 - ($exp - 1023));
             if ($sign) {
                 $value = -1 * $value;
             }
@@ -7910,7 +7816,7 @@ class Xls extends BaseReader
      */
     public static function getInt2d($data, $pos)
     {
-        return unpack('s', $data[$pos] . $data[$pos + 1])[1];
+        return unpack('s', $data[$pos] . $data[$pos + 1])[1]; // @phpstan-ignore-line
     }
 
     /**
@@ -7937,11 +7843,249 @@ class Xls extends BaseReader
         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;
+    }
+
+    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
+        $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);
+
+        $offset = 12;
+
+        if ($hasFontRecord === true) {
+            $fontStyle = substr($recordData, $offset, 118);
+            $this->getCFFontStyle($fontStyle, $style);
+            $offset += 118;
+        }
+
+        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);
+            $offset += 8;
+        }
+
+        if ($hasFillRecord === true) {
+            $fillStyle = substr($recordData, $offset, 4);
+            $this->getCFFillStyle($fillStyle, $style);
+            $offset += 4;
+        }
+
+        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);
+    }
+
+    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
+        }
+
+        $bold = self::getUInt2d($options, 72) === 700; // 400 = normal, 700 = bold
+        $style->getFont()->setBold($bold);
+
+        $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): void
+    {
+    }
+
+    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;
+            $style->getFill()->getStartColor()->setRGB(Xls\Color::map($color1, $this->palette, $this->version)['rgb']);
+
+            // bit: 7-13; mask: 0x3F80; type
+            $color2 = (0x3F80 & $fillColors) >> 7;
+            $style->getFill()->getEndColor()->setRGB(Xls\Color::map($color2, $this->palette, $this->version)['rgb']);
+        }
+    }
+
+    private function getCFProtectionStyle(string $options, Style $style): void
+    {
+    }
+
+    /**
+     * @return null|float|int|string
+     */
+    private function readCFFormula(string $recordData, int $offset, int $size)
+    {
+        try {
+            $formula = substr($recordData, $offset, $size);
+            $formula = pack('v', $size) . $formula; // prepend the length
+
+            $formula = $this->getFormulaFromStructure($formula);
+            if (is_numeric($formula)) {
+                return (strpos($formula, '.') !== false) ? (float) $formula : (int) $formula;
+            }
+
+            return $formula;
+        } catch (PhpSpreadsheetException $e) {
+        }
+
+        return null;
+    }
+
+    /**
+     * @param null|float|int|string $formula1
+     * @param null|float|int|string $formula2
+     */
+    private function setCFRules(array $cellRanges, string $type, string $operator, $formula1, $formula2, Style $style): void
+    {
+        foreach ($cellRanges as $cellRange) {
+            $conditional = new Conditional();
+            $conditional->setConditionType($type);
+            $conditional->setOperatorType($operator);
+            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);
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
index c45f88c72..06c2d0b90 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
@@ -20,7 +20,7 @@ class Color
         if ($color <= 0x07 || $color >= 0x40) {
             // special built-in color
             return Color\BuiltIn::lookup($color);
-        } elseif (isset($palette, $palette[$color - 8])) {
+        } elseif (isset($palette[$color - 8])) {
             // palette color, color index 0x08 maps to pallete index 0
             return $palette[$color - 8];
         }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
index 743d93877..15d0b7331 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
 
 class BIFF5
 {
-    protected static $map = [
+    private const BIFF5_COLOR_MAP = [
         0x08 => '000000',
         0x09 => 'FFFFFF',
         0x0A => 'FF0000',
@@ -72,10 +72,6 @@ class BIFF5
      */
     public static function lookup($color)
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BIFF5_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
index 5c109fb07..019ec79e8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
 
 class BIFF8
 {
-    protected static $map = [
+    private const BIFF8_COLOR_MAP = [
         0x08 => '000000',
         0x09 => 'FFFFFF',
         0x0A => 'FF0000',
@@ -72,10 +72,6 @@ class BIFF8
      */
     public static function lookup($color)
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BIFF8_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
index 90d50e336..b6a96af83 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
 
 class BuiltIn
 {
-    protected static $map = [
+    private const BUILTIN_COLOR_MAP = [
         0x00 => '000000',
         0x01 => 'FFFFFF',
         0x02 => 'FF0000',
@@ -26,10 +26,6 @@ class BuiltIn
      */
     public static function lookup($color)
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BUILTIN_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php
new file mode 100644
index 000000000..8400efb94
--- /dev/null
+++ b/libraries/phpspreadsheet/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 $types = [
+        0x01 => Conditional::CONDITION_CELLIS,
+        0x02 => Conditional::CONDITION_EXPRESSION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php
new file mode 100644
index 000000000..02f844e31
--- /dev/null
+++ b/libraries/phpspreadsheet/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 $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 $errorStyles = [
+        0x00 => DataValidation::STYLE_STOP,
+        0x01 => DataValidation::STYLE_WARNING,
+        0x02 => DataValidation::STYLE_INFORMATION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
index 7daf7230f..0b79366b9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
 
 class ErrorCode
 {
-    protected static $map = [
+    private const ERROR_CODE_MAP = [
         0x00 => '#NULL!',
         0x07 => '#DIV/0!',
         0x0F => '#VALUE!',
@@ -23,10 +23,6 @@ class ErrorCode
      */
     public static function lookup($code)
     {
-        if (isset(self::$map[$code])) {
-            return self::$map[$code];
-        }
-
-        return false;
+        return self::ERROR_CODE_MAP[$code] ?? false;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
index 858d6bbba..e9c95c884 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
@@ -71,6 +71,27 @@ class Escher
         $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.
      *
@@ -91,84 +112,9 @@ class Escher
         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();
             }
         }
 
@@ -178,19 +124,19 @@ class Escher
     /**
      * Read a generic record.
      */
-    private function readDefault()
+    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;
@@ -199,7 +145,7 @@ class Escher
     /**
      * Read DggContainer record (Drawing Group Container).
      */
-    private function readDggContainer()
+    private function readDggContainer(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
         $recordData = substr($this->data, $this->pos + 8, $length);
@@ -209,7 +155,7 @@ class Escher
 
         // record is a container, read contents
         $dggContainer = new DggContainer();
-        $this->object->setDggContainer($dggContainer);
+        $this->applyAttribute('setDggContainer', $dggContainer);
         $reader = new self($dggContainer);
         $reader->load($recordData);
     }
@@ -217,10 +163,10 @@ class Escher
     /**
      * Read Dgg record (Drawing Group).
      */
-    private function readDgg()
+    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;
@@ -229,7 +175,7 @@ class Escher
     /**
      * Read BstoreContainer record (Blip Store Container).
      */
-    private function readBstoreContainer()
+    private function readBstoreContainer(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
         $recordData = substr($this->data, $this->pos + 8, $length);
@@ -239,7 +185,7 @@ class Escher
 
         // record is a container, read contents
         $bstoreContainer = new BstoreContainer();
-        $this->object->setBstoreContainer($bstoreContainer);
+        $this->applyAttribute('setBstoreContainer', $bstoreContainer);
         $reader = new self($bstoreContainer);
         $reader->load($recordData);
     }
@@ -247,7 +193,7 @@ class Escher
     /**
      * Read BSE record.
      */
-    private function readBSE()
+    private function readBSE(): void
     {
         // offset: 0; size: 2; recVer and recInstance
 
@@ -262,45 +208,45 @@ class Escher
 
         // 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);
@@ -313,7 +259,7 @@ class Escher
     /**
      * Read BlipJPEG record. Holds raw JPEG image data.
      */
-    private function readBlipJPEG()
+    private function readBlipJPEG(): void
     {
         // offset: 0; size: 2; recVer and recInstance
 
@@ -329,18 +275,18 @@ class Escher
         $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]);
-        $pos += 1;
+        //$tag = ord($recordData[$pos]);
+        ++$pos;
 
         // offset: var; size: var; the raw image data
         $data = substr($recordData, $pos);
@@ -348,13 +294,13 @@ class Escher
         $blip = new Blip();
         $blip->setData($data);
 
-        $this->object->setBlip($blip);
+        $this->applyAttribute('setBlip', $blip);
     }
 
     /**
      * Read BlipPNG record. Holds raw PNG image data.
      */
-    private function readBlipPNG()
+    private function readBlipPNG(): void
     {
         // offset: 0; size: 2; recVer and recInstance
 
@@ -370,18 +316,18 @@ class Escher
         $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]);
-        $pos += 1;
+        //$tag = ord($recordData[$pos]);
+        ++$pos;
 
         // offset: var; size: var; the raw image data
         $data = substr($recordData, $pos);
@@ -389,13 +335,13 @@ class Escher
         $blip = new Blip();
         $blip->setData($data);
 
-        $this->object->setBlip($blip);
+        $this->applyAttribute('setBlip', $blip);
     }
 
     /**
      * Read OPT record. This record may occur within DggContainer record or SpContainer.
      */
-    private function readOPT()
+    private function readOPT(): void
     {
         // offset: 0; size: 2; recVer and recInstance
 
@@ -414,15 +360,15 @@ class Escher
     /**
      * Read TertiaryOPT record.
      */
-    private function readTertiaryOPT()
+    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;
@@ -431,10 +377,10 @@ class Escher
     /**
      * Read SplitMenuColors record.
      */
-    private function readSplitMenuColors()
+    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;
@@ -443,7 +389,7 @@ class Escher
     /**
      * Read DgContainer record (Drawing Container).
      */
-    private function readDgContainer()
+    private function readDgContainer(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
         $recordData = substr($this->data, $this->pos + 8, $length);
@@ -453,18 +399,18 @@ class Escher
 
         // 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);
     }
 
     /**
      * Read Dg record (Drawing).
      */
-    private function readDg()
+    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;
@@ -473,7 +419,7 @@ class Escher
     /**
      * Read SpgrContainer record (Shape Group Container).
      */
-    private function readSpgrContainer()
+    private function readSpgrContainer(): void
     {
         // context is either context DgContainer or SpgrContainer
 
@@ -489,42 +435,42 @@ class Escher
         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);
     }
 
     /**
      * Read SpContainer record (Shape Container).
      */
-    private function readSpContainer()
+    private function readSpContainer(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
         $recordData = substr($this->data, $this->pos + 8, $length);
 
         // 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);
     }
 
     /**
      * Read Spgr record (Shape Group).
      */
-    private function readSpgr()
+    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;
@@ -533,15 +479,15 @@ class Escher
     /**
      * Read Sp record (Shape).
      */
-    private function readSp()
+    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;
@@ -550,15 +496,15 @@ class Escher
     /**
      * Read ClientTextbox record.
      */
-    private function readClientTextbox()
+    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;
@@ -567,7 +513,7 @@ class Escher
     /**
      * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet.
      */
-    private function readClientAnchor()
+    private function readClientAnchor(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
         $recordData = substr($this->data, $this->pos + 8, $length);
@@ -599,32 +545,31 @@ class Escher
         // 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));
+        $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 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);
-
-        // set the end offsetY
-        $this->object->setEndOffsetY($endOffsetY);
+    /**
+     * @param mixed $value
+     */
+    private function applyAttribute(string $name, $value): void
+    {
+        if (method_exists($this->object, $name)) {
+            $this->object->$name($value);
+        }
     }
 
     /**
      * Read ClientData record.
      */
-    private function readClientData()
+    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 +581,7 @@ class Escher
      * @param string $data Binary data
      * @param int $n Number of properties
      */
-    private function readOfficeArtRGFOPTE($data, $n)
+    private function readOfficeArtRGFOPTE($data, $n): void
     {
         $splicedComplexData = substr($data, 6 * $n);
 
@@ -652,7 +597,7 @@ class Escher
             $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 +616,9 @@ class Escher
                 $value = $op;
             }
 
-            $this->object->setOPT($opidOpid, $value);
+            if (method_exists($this->object, 'setOPT')) {
+                $this->object->setOPT($opidOpid, $value);
+            }
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
index 6a10e591e..d376c456f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
@@ -4,31 +4,48 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
 
 class MD5
 {
-    // Context
+    /**
+     * @var int
+     */
     private $a;
 
+    /**
+     * @var int
+     */
     private $b;
 
+    /**
+     * @var int
+     */
     private $c;
 
+    /**
+     * @var int
+     */
     private $d;
 
+    /**
+     * @var int
+     */
+    private static $allOneBits;
+
     /**
      * MD5 stream constructor.
      */
     public function __construct()
     {
+        self::$allOneBits = self::signedInt(0xffffffff);
         $this->reset();
     }
 
     /**
      * Reset the MD5 stream context.
      */
-    public function reset()
+    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;
     }
 
@@ -56,8 +73,9 @@ class MD5
      *
      * @param string $data Data to add
      */
-    public function add($data)
+    public function add(string $data): void
     {
+        // @phpstan-ignore-next-line
         $words = array_values(unpack('V16', $data));
 
         $A = $this->a;
@@ -65,10 +83,10 @@ class MD5
         $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);
@@ -142,43 +160,51 @@ class MD5
         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;
+        $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($X, $Y, $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($X, $Y, $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($X, $Y, $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($X, $Y, $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, &$A, $B, $C, $D, $M, $s, $t)
+    /** @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;
     }
 
-    private static function rotate($decimal, $bits)
+    /** @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): 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
index 691aca7c3..b7c7c900c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
@@ -4,11 +4,13 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
 
 class RC4
 {
-    // Context
-    protected $s = [];
+    /** @var int[] */
+    protected $s = []; // Context
 
+    /** @var int */
     protected $i = 0;
 
+    /** @var int */
     protected $j = 0;
 
     /**
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
index 91cbe36f1..d832eb020 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
@@ -6,7 +6,10 @@ use PhpOffice\PhpSpreadsheet\Style\Border as StyleBorder;
 
 class Border
 {
-    protected static $map = [
+    /**
+     * @var array<int, string>
+     */
+    protected static $borderStyleMap = [
         0x00 => StyleBorder::BORDER_NONE,
         0x01 => StyleBorder::BORDER_THIN,
         0x02 => StyleBorder::BORDER_MEDIUM,
@@ -23,18 +26,10 @@ class Border
         0x0D => StyleBorder::BORDER_SLANTDASHDOT,
     ];
 
-    /**
-     * Map border style
-     * OpenOffice documentation: 2.5.11.
-     *
-     * @param int $index
-     *
-     * @return string
-     */
-    public static function lookup($index)
+    public static function lookup(int $index): string
     {
-        if (isset(self::$map[$index])) {
-            return self::$map[$index];
+        if (isset(self::$borderStyleMap[$index])) {
+            return self::$borderStyleMap[$index];
         }
 
         return StyleBorder::BORDER_NONE;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
new file mode 100644
index 000000000..f03d47fae
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class CellAlignment
+{
+    /**
+     * @var array<int, string>
+     */
+    protected static $horizontalAlignmentMap = [
+        0 => Alignment::HORIZONTAL_GENERAL,
+        1 => Alignment::HORIZONTAL_LEFT,
+        2 => Alignment::HORIZONTAL_CENTER,
+        3 => Alignment::HORIZONTAL_RIGHT,
+        4 => Alignment::HORIZONTAL_FILL,
+        5 => Alignment::HORIZONTAL_JUSTIFY,
+        6 => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    protected static $verticalAlignmentMap = [
+        0 => Alignment::VERTICAL_TOP,
+        1 => Alignment::VERTICAL_CENTER,
+        2 => Alignment::VERTICAL_BOTTOM,
+        3 => Alignment::VERTICAL_JUSTIFY,
+    ];
+
+    public static function horizontal(Alignment $alignment, int $horizontal): void
+    {
+        if (array_key_exists($horizontal, self::$horizontalAlignmentMap)) {
+            $alignment->setHorizontal(self::$horizontalAlignmentMap[$horizontal]);
+        }
+    }
+
+    public static function vertical(Alignment $alignment, int $vertical): void
+    {
+        if (array_key_exists($vertical, self::$verticalAlignmentMap)) {
+            $alignment->setVertical(self::$verticalAlignmentMap[$vertical]);
+        }
+    }
+
+    public static function wrap(Alignment $alignment, int $wrap): void
+    {
+        $alignment->setWrapText((bool) $wrap);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
new file mode 100644
index 000000000..e975be4dc
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class CellFont
+{
+    public static function escapement(Font $font, int $escapement): void
+    {
+        switch ($escapement) {
+            case 0x0001:
+                $font->setSuperscript(true);
+
+                break;
+            case 0x0002:
+                $font->setSubscript(true);
+
+                break;
+        }
+    }
+
+    /**
+     * @var array<int, string>
+     */
+    protected static $underlineMap = [
+        0x01 => Font::UNDERLINE_SINGLE,
+        0x02 => Font::UNDERLINE_DOUBLE,
+        0x21 => Font::UNDERLINE_SINGLEACCOUNTING,
+        0x22 => Font::UNDERLINE_DOUBLEACCOUNTING,
+    ];
+
+    public static function underline(Font $font, int $underline): void
+    {
+        if (array_key_exists($underline, self::$underlineMap)) {
+            $font->setUnderline(self::$underlineMap[$underline]);
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
index 7b85c0883..32ab5c859 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
@@ -6,7 +6,10 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
 
 class FillPattern
 {
-    protected static $map = [
+    /**
+     * @var array<int, string>
+     */
+    protected static $fillPatternMap = [
         0x00 => Fill::FILL_NONE,
         0x01 => Fill::FILL_SOLID,
         0x02 => Fill::FILL_PATTERN_MEDIUMGRAY,
@@ -38,8 +41,8 @@ class FillPattern
      */
     public static function lookup($index)
     {
-        if (isset(self::$map[$index])) {
-            return self::$map[$index];
+        if (isset(self::$fillPatternMap[$index])) {
+            return self::$fillPatternMap[$index];
         }
 
         return Fill::FILL_NONE;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
index 9b5b7db42..004cc5132 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -3,8 +3,9 @@
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\AutoFilter;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Chart;
@@ -12,11 +13,16 @@ use PhpOffice\PhpSpreadsheet\Reader\Xlsx\ColumnAndRowAttributes;
 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;
@@ -26,20 +32,21 @@ use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\Font;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Style\Border;
-use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
+use Throwable;
 use XMLReader;
 use ZipArchive;
 
 class Xlsx extends BaseReader
 {
+    const INITIAL_FILE = '_rels/.rels';
+
     /**
      * ReferenceHelper instance.
      *
@@ -48,11 +55,17 @@ class Xlsx extends BaseReader
     private $referenceHelper;
 
     /**
-     * Xlsx\Theme instance.
-     *
-     * @var Xlsx\Theme
+     * @var ZipArchive
      */
-    private static $theme = null;
+    private $zip;
+
+    /** @var Styles */
+    private $styleReader;
+
+    /**
+     * @var array
+     */
+    private $sharedFormulae = [];
 
     /**
      * Create a new Xlsx Reader instance.
@@ -66,22 +79,18 @@ class Xlsx extends BaseReader
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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();
@@ -90,43 +99,110 @@ class Xlsx extends BaseReader
         return $result;
     }
 
+    /**
+     * @param mixed $value
+     */
+    public static function testSimpleXml($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.
+    // Scrutinizer thinks it can't.
+    // Sigh.
+    private static function xpathNoFalse(SimpleXmlElement $sxml, string $path): array
+    {
+        return self::falseToArray($sxml->xpath($path));
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function falseToArray($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
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames($filename)
     {
-        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']}"))
-                    );
+        $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) $eleSheet['name'];
-                        }
+                if ($xmlWorkbook->sheets) {
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        // Check if sheet should be skipped
+                        $worksheetNames[] = (string) self::getAttributes($eleSheet)['name'];
                     }
+                }
             }
         }
 
@@ -138,74 +214,62 @@ class Xlsx extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
-        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', '');
 
                 $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')];
+                        $fileWorksheet = (string) $worksheets[(string) self::getArrayItem(self::getAttributes($eleSheet, $namespace), 'id')];
+                        $fileWorksheetPath = strpos($fileWorksheet, '/') === 0 ? substr($fileWorksheet, 1) : "$dir/$fileWorksheet";
 
                         $xml = new XMLReader();
                         $xml->xml(
-                            $this->securityScanner->scanFile(
-                                'zip://' . File::realpath($pFilename) . '#' . "$dir/$fileWorksheet"
+                            $this->getSecurityScannerOrThrow()->scan(
+                                $this->getFromZipArchive($this->zip, $fileWorksheetPath)
                             ),
                             null,
                             Settings::getLibXmlLoaderOptions()
@@ -214,13 +278,14 @@ class Xlsx extends BaseReader
 
                         $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);
@@ -240,7 +305,7 @@ class Xlsx extends BaseReader
         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') {
@@ -252,48 +317,55 @@ class Xlsx extends BaseReader
         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)
+    /**
+     * @param mixed $value
+     * @param mixed $calculatedValue
+     */
+    private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, string $castBaseType, bool $updateSharedCells = true): void
     {
-        $cellDataType = 'f';
+        if ($c === null) {
+            return;
+        }
+        $attr = $c->f->attributes();
+        $cellDataType = DataType::TYPE_FORMULA;
         $value = "={$c->f}";
         $calculatedValue = self::$castBaseType($c);
 
         // Shared formula?
-        if (isset($c->f['t']) && strtolower((string) $c->f['t']) == 'shared') {
-            $instance = (string) $c->f['si'];
+        if (isset($attr['t']) && strtolower((string) $attr['t']) == 'shared') {
+            $instance = (string) $attr['si'];
 
-            if (!isset($sharedFormulas[(string) $c->f['si']])) {
-                $sharedFormulas[$instance] = ['master' => $r, 'formula' => $value];
-            } else {
-                $master = Coordinate::coordinateFromString($sharedFormulas[$instance]['master']);
-                $current = Coordinate::coordinateFromString($r);
+            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] = Coordinate::columnIndexFromString($current[0]) - Coordinate::columnIndexFromString($master[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 ZipArchive $archive
      * @param string $fileName
-     *
-     * @return string
      */
-    private function getFromZipArchive(ZipArchive $archive, $fileName = '')
+    private function fileExistsInArchive(ZipArchive $archive, $fileName = ''): bool
     {
         // Root-relative paths
         if (strpos($fileName, '//') !== false) {
@@ -305,158 +377,206 @@ class Xlsx extends BaseReader
         //    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;
+    }
+
+    /**
+     * @param string $fileName
+     *
+     * @return string
+     */
+    private function getFromZipArchive(ZipArchive $archive, $fileName = '')
+    {
+        // Root-relative paths
+        if (strpos($fileName, '//') !== false) {
+            $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
-     *
-     * @throws Exception
-     *
-     * @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 (substr($relTarget, 0, 4) === '/xl/') {
+                $relTarget = substr($relTarget, 4);
+            }
             switch ($rel['Type']) {
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
+                case "$xmlNamespaceBase/theme":
                     $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'];
+                    $xmlTheme = $this->loadZip("xl/{$relTarget}", $drawingNS);
+                    $xmlThemeName = self::getAttributes($xmlTheme);
+                    $xmlTheme = $xmlTheme->children($drawingNS);
+                    $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');
+                    $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 = $xmlColour->sysClr->attributes();
-                                $themeColours[$themePos] = $xmlColourData['lastClr'];
-                            } elseif (isset($xmlColour->srgbClr)) {
-                                $xmlColourData = $xmlColour->srgbClr->attributes();
-                                $themeColours[$themePos] = $xmlColourData['val'];
-                            }
+                    $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']);
                         }
-                        self::$theme = new Xlsx\Theme($themeName, $colourSchemeName, $themeColours);
                     }
+                    $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'] ?? '');
+                        }
+                    }
+                    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());
+        $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, $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', '');
+                    $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;
@@ -476,26 +596,39 @@ class Xlsx extends BaseReader
                         }
                     }
 
-                    $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 {
+                        $xmlStyles = $this->loadZip("$dir/$xpath[Target]", $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) {
-                            $numFmt = NumberFormat::FORMAT_GENERAL;
+                    $this->styleReader->setNamespace($mainNS);
+                    if (!$this->readDataOnly/* && $xmlStyles*/) {
+                        foreach ($xfTags as $xfTag) {
+                            $xf = self::getAttributes($xfTag);
+                            $numFmt = null;
 
                             if ($xf['numFmtId']) {
                                 if (isset($numFmts)) {
@@ -509,34 +642,39 @@ class Xlsx extends BaseReader
                                 // We shouldn't override any of the built-in MS Excel values (values below id 164)
                                 //  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 ((int) $xf['numFmtId'] < 164 &&
-                                    NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== '') {
+                                if (
+                                    $numFmt === null &&
+                                    (int) $xf['numFmtId'] < 164 &&
+                                    NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== ''
+                                ) {
                                     $numFmt = NumberFormat::builtInFormatCode((int) $xf['numFmtId']);
                                 }
                             }
-                            $quotePrefix = false;
-                            if (isset($xf['quotePrefix'])) {
-                                $quotePrefix = (bool) $xf['quotePrefix'];
-                            }
+                            $quotePrefix = (bool) (string) ($xf['quotePrefix'] ?? '');
 
                             $style = (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,
+                                'numFmt' => $numFmt ?? NumberFormat::FORMAT_GENERAL,
+                                '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 (isset($xmlStyles->cellStyleXfs->xf) ? $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]]"));
@@ -547,41 +685,65 @@ class Xlsx extends BaseReader
                                 }
                             }
 
+                            $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) {
+                        $xmlStrings = $this->loadZip("$dir/$xpath[Target]", $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);
+                                }
+                            }
+                        }
+                    }
+
+                    $xmlWorkbook = $this->loadZipNoNamespace($relTarget, $mainNS);
+                    $xmlWorkbookNS = $this->loadZip($relTarget, $mainNS);
 
                     // Set base date
-                    if ($xmlWorkbook->workbookPr) {
+                    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);
                             }
                         }
@@ -597,19 +759,27 @@ class Xlsx extends BaseReader
 
                     $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;
@@ -620,44 +790,51 @@ class Xlsx extends BaseReader
                             //        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()
-                            );
+                            $docSheet->setTitle((string) $eleSheetAttr['name'], false, false);
 
-                            $sharedFormulas = [];
+                            $fileWorksheet = (string) $worksheets[$sheetReferenceId];
+                            $xmlSheet = $this->loadZipNoNamespace("$dir/$fileWorksheet", $mainNS);
+                            $xmlSheetNS = $this->loadZip("$dir/$fileWorksheet", $mainNS);
 
-                            if (isset($eleSheet['state']) && (string) $eleSheet['state'] != '') {
-                                $docSheet->setSheetState((string) $eleSheet['state']);
+                            // 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 ($xmlSheet) {
-                                if (isset($xmlSheet->sheetViews, $xmlSheet->sheetViews->sheetView)) {
-                                    $sheetViews = new SheetViews($xmlSheet->sheetViews->sheetView, $docSheet);
+                            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->extLst) {
+                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs))->loadFromExt($this->styleReader);
+                                }
+                                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->getReadDataOnly(), $this->styleReader);
 
-                                (new ColumnAndRowAttributes($docSheet, $xmlSheet))
+                                (new ColumnAndRowAttributes($docSheet, $xmlSheetNS))
                                     ->load($this->getReadFilter(), $this->getReadDataOnly());
                             }
 
-                            if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
+                            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'];
                                         $value = null;
                                         $calculatedValue = null;
 
@@ -666,7 +843,14 @@ class Xlsx extends BaseReader
                                             $coordinates = Coordinate::coordinateFromString($r);
 
                                             if (!$this->getReadFilter()->readCell($coordinates[0], (int) $coordinates[1], $docSheet->getTitle())) {
-                                                $rowIndex += 1;
+                                                // 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;
 
                                                 continue;
                                             }
@@ -688,10 +872,15 @@ class Xlsx extends BaseReader
                                                 break;
                                             case 'b':
                                                 if (!isset($c->f)) {
-                                                    $value = self::castToBoolean($c);
+                                                    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');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToBoolean');
                                                     if (isset($c->f['t'])) {
                                                         $att = $c->f;
                                                         $docSheet->getCell($r)->setFormulaAttributes($att);
@@ -701,7 +890,7 @@ class Xlsx extends BaseReader
                                                 break;
                                             case 'inlineStr':
                                                 if (isset($c->f)) {
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
                                                 } else {
                                                     $value = $this->parseRichText($c->is);
                                                 }
@@ -712,7 +901,7 @@ class Xlsx extends BaseReader
                                                     $value = self::castToError($c);
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
                                                 }
 
                                                 break;
@@ -721,7 +910,11 @@ class Xlsx extends BaseReader
                                                     $value = self::castToString($c);
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToString');
+                                                    if (isset($c->f['t'])) {
+                                                        $attributes = $c->f['t'];
+                                                        $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $attributes]);
+                                                    }
                                                 }
 
                                                 break;
@@ -737,7 +930,13 @@ class Xlsx extends BaseReader
                                             $cell = $docSheet->getCell($r);
                                             // Assign value
                                             if ($cellDataType != '') {
-                                                $cell->setValueExplicit($value, $cellDataType);
+                                                // it is possible, that datatype is numeric but with an empty string, which result in an error
+                                                if ($cellDataType === DataType::TYPE_NUMERIC && ($value === '' || $value === null)) {
+                                                    $cellDataType = DataType::TYPE_NULL;
+                                                }
+                                                if ($cellDataType !== DataType::TYPE_NULL) {
+                                                    $cell->setValueExplicit($value, $cellDataType);
+                                                }
                                             } else {
                                                 $cell->setValue($value);
                                             }
@@ -746,48 +945,52 @@ class Xlsx extends BaseReader
                                             }
 
                                             // Style information?
-                                            if ($c['s'] && !$this->readDataOnly) {
+                                            if ($cAttr['s'] && !$this->readDataOnly) {
                                                 // no style index means 0, it seems
-                                                $cell->setXfIndex(isset($styles[(int) ($c['s'])]) ?
-                                                    (int) ($c['s']) : 0);
+                                                $cell->setXfIndex(isset($styles[(int) ($cAttr['s'])]) ?
+                                                    (int) ($cAttr['s']) : 0);
+                                                // issue 3495
+                                                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                                                    $cell->getStyle()->setQuotePrefix(false);
+                                                }
                                             }
                                         }
-                                        $rowIndex += 1;
+                                        ++$rowIndex;
                                     }
-                                    $cIndex += 1;
+                                    ++$cIndex;
+                                }
+                            }
+                            if ($xmlSheetNS && $xmlSheetNS->ignoredErrors) {
+                                foreach ($xmlSheetNS->ignoredErrors->ignoredError as $ignoredErrorx) {
+                                    $ignoredError = self::testSimpleXml($ignoredErrorx);
+                                    $this->processIgnoredErrors($ignoredError, $docSheet);
                                 }
                             }
 
-                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
-                                (new ConditionalStyles($docSheet, $xmlSheet, $dxfs))->load();
-                            }
-
-                            $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));
                                 }
                             }
 
-                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-                                $docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection['password'], true);
-                                if ($xmlSheet->protectedRanges->protectedRange) {
-                                    foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
-                                        $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
-                                    }
-                                }
+                            if ($xmlSheet) {
+                                $this->readSheetProtection($docSheet, $xmlSheet);
                             }
 
-                            if ($xmlSheet && $xmlSheet->autoFilter && !$this->readDataOnly) {
-                                (new AutoFilter($docSheet, $xmlSheet))->load();
+                            if ($this->readDataOnly === false) {
+                                $this->readAutoFilter($xmlSheet, $docSheet);
+                                $this->readTables($xmlSheet, $docSheet, $dir, $fileWorksheet, $zip);
                             }
 
-                            if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->readDataOnly) {
-                                foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
-                                    $mergeRef = (string) $mergeCell['ref'];
+                            if ($xmlSheetNS && $xmlSheetNS->mergeCells && $xmlSheetNS->mergeCells->mergeCell && !$this->readDataOnly) {
+                                foreach ($xmlSheetNS->mergeCells->mergeCell as $mergeCellx) {
+                                    /** @scrutinizer ignore-call */
+                                    $mergeCell = $mergeCellx->attributes();
+                                    $mergeRef = (string) ($mergeCell['ref'] ?? '');
                                     if (strpos($mergeRef, ':') !== false) {
-                                        $docSheet->mergeCells((string) $mergeCell['ref']);
+                                        $docSheet->mergeCells($mergeRef, Worksheet::MERGE_CELL_CONTENT_HIDE);
                                     }
                                 }
                             }
@@ -796,15 +999,38 @@ class Xlsx extends BaseReader
                                 $unparsedLoadedData = (new PageSetup($docSheet, $xmlSheet))->load($unparsedLoadedData);
                             }
 
+                            if ($xmlSheet !== false && isset($xmlSheet->extLst, $xmlSheet->extLst->ext, $xmlSheet->extLst->ext['uri']) && ($xmlSheet->extLst->ext['uri'] == '{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}')) {
+                                // Create dataValidations node if does not exists, maybe is better inside the foreach ?
+                                if (!$xmlSheet->dataValidations) {
+                                    $xmlSheet->addChild('dataValidations');
+                                }
+
+                                foreach ($xmlSheet->extLst->ext->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
+                                            $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();
                                     }
                                 }
@@ -816,20 +1042,13 @@ class Xlsx extends BaseReader
                                 // 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()
-                                    );
+                                    $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);
                                 }
                             }
 
@@ -838,20 +1057,15 @@ class Xlsx extends BaseReader
                             $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)) {
+                                    $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'];
                                         }
                                     }
@@ -861,31 +1075,32 @@ class Xlsx extends BaseReader
                                 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) {
-                                        if (!empty($comment['authorId'])) {
-                                            $docSheet->getComment((string) $comment['ref'])->setAuthor($authors[(string) $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']]);
                                         }
-                                        $docSheet->getComment((string) $comment['ref'])->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) {
@@ -893,26 +1108,39 @@ class Xlsx extends BaseReader
                                     $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 $ex) {
                                         //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)) {
+                                        $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;
+                                            $fillImageRelId = null;
+                                            $fillImageTitle = '';
 
                                             $clientData = $shape->xpath('.//x:ClientData');
                                             if (is_array($clientData) && !empty($clientData)) {
@@ -931,10 +1159,39 @@ class Xlsx extends BaseReader
                                                 }
                                             }
 
+                                            $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/', $drowingImages[$fillImageRelId]);
+                                                    $objDrawing->setPath(
+                                                        'zip://' . File::realpath($filename) . '#' . $imagePath,
+                                                        true,
+                                                        $zip
+                                                    );
+                                                    $comment->setBackgroundImage($objDrawing);
+                                                }
 
                                                 // Parse style
                                                 $styleArray = explode(';', str_replace(' ', '', $style));
@@ -972,85 +1229,78 @@ class Xlsx extends BaseReader
                                         $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 ($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')) {
-                                        //~ 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()
-                                        );
+                                        $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 = [];
-                                            foreach ($relsVML->Relationship as $ele) {
-                                                if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
-                                                    $drawings[(string) $ele['Id']] = self::dirAdd($vmlRelationship, $ele['Target']);
+                                            if (isset($relsVML->Relationship)) {
+                                                foreach ($relsVML->Relationship as $ele) {
+                                                    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);
@@ -1060,46 +1310,64 @@ class Xlsx extends BaseReader
                             }
 
                             // 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 (substr($drawingFilename, 0, 7) === 'xl//xl/') {
+                                $drawingFilename = substr($drawingFilename, 4);
+                            }
+                            if (substr($drawingFilename, 0, 8) === '/xl//xl/') {
+                                $drawingFilename = substr($drawingFilename, 5);
+                            }
+                            if ($zip->locateName($drawingFilename)) {
+                                $relsWorksheet = $this->loadZipNoNamespace($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']);
+                                    if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
+                                        $eleTarget = (string) $ele['Target'];
+                                        if (substr($eleTarget, 0, 4) === '/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 = [];
-                                    foreach ($xmlSheet->drawing as $drawing) {
-                                        $drawingRelId = (string) self::getArrayItem($drawing->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id');
+                                    $fileDrawing = null;
+                                    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->loadZipNoNamespace($drawingFilename, $xmlNamespaceBase);
+
                                         $images = [];
                                         $hyperlinks = [];
                                         if ($relsDrawing && $relsDrawing->Relationship) {
                                             foreach ($relsDrawing->Relationship as $ele) {
-                                                if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
+                                                $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 (substr($eleTarget, 0, 4) === '/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 (substr($eleTarget, 0, 4) === '/xl/') {
+                                                            $index = substr($eleTarget, 1);
+                                                        } else {
+                                                            $index = self::dirAdd($fileDrawing, $eleTarget);
+                                                        }
+                                                        $charts[$index] = [
                                                             'id' => (string) $ele['Id'],
                                                             'sheet' => $docSheet->getTitle(),
                                                         ];
@@ -1107,124 +1375,180 @@ class Xlsx extends BaseReader
                                                 }
                                             }
                                         }
-                                        $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'));
-                                                    $objDrawing->setPath(
-                                                        'zip://' . File::realpath($pFilename) . '#' .
-                                                        $images[(string) self::getArrayItem(
-                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
-                                                            'embed'
-                                                        )],
-                                                        false
+                                                    $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'
                                                     );
-                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1));
-                                                    $objDrawing->setOffsetX(Drawing::EMUToPixels($oneCellAnchor->from->colOff));
+                                                    if (isset($images[$embedImageKey])) {
+                                                        $objDrawing->setPath(
+                                                            '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((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')));
                                                     }
                                                     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'));
-                                                        $clr = isset($outerShdw->srgbClr) ? $outerShdw->srgbClr : $outerShdw->prstClr;
-                                                        $shadow->getColor()->setRGB(self::getArrayItem($clr->attributes(), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem($clr->alpha->attributes(), 'val') / 1000);
+                                                        $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(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $oneCellAnchor, $hyperlinks);
 
                                                     $objDrawing->setWorksheet($docSheet);
-                                                } else {
-                                                    //    ? Can charts be positioned with a oneCellAnchor ?
-                                                    $coordinates = Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1);
+                                                } elseif ($this->includeCharts && $oneCellAnchor->graphicFrame) {
+                                                    // Exported XLSX from Google Sheets positions charts with a oneCellAnchor
+                                                    $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(Namespaces::DRAWINGML)->graphic;
+                                                    /** @var SimpleXMLElement $chartRef */
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
+
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                        'fromCoordinate' => $coordinates,
+                                                        'fromOffsetX' => $offsetX,
+                                                        'fromOffsetY' => $offsetY,
+                                                        '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;
+                                                    $blip = $twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->blip;
+                                                    $xfrm = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
+                                                    $outerShdw = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
                                                     $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'));
-                                                    $objDrawing->setPath(
-                                                        'zip://' . File::realpath($pFilename) . '#' .
-                                                        $images[(string) self::getArrayItem(
-                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
-                                                            'embed'
-                                                        )],
-                                                        false
+                                                    /** @scrutinizer ignore-call */
+                                                    $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'
                                                     );
-                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1));
+                                                    if (isset($images[$embedImageKey])) {
+                                                        $objDrawing->setPath(
+                                                            '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')));
                                                     }
                                                     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'));
-                                                        $clr = isset($outerShdw->srgbClr) ? $outerShdw->srgbClr : $outerShdw->prstClr;
-                                                        $shadow->getColor()->setRGB(self::getArrayItem($clr->attributes(), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem($clr->alpha->attributes(), 'val') / 1000);
+                                                        $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(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $twoCellAnchor, $hyperlinks);
 
                                                     $objDrawing->setWorksheet($docSheet);
                                                 } elseif (($this->includeCharts) && ($twoCellAnchor->graphicFrame)) {
-                                                    $fromCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1);
+                                                    $fromCoordinate = Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1);
                                                     $fromOffsetX = Drawing::EMUToPixels($twoCellAnchor->from->colOff);
                                                     $fromOffsetY = Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-                                                    $toCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1);
+                                                    $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,
@@ -1238,7 +1562,28 @@ class Xlsx extends BaseReader
                                                 }
                                             }
                                         }
-                                        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();
                                         }
@@ -1247,7 +1592,7 @@ class Xlsx extends BaseReader
                                     // 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') {
+                                        if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
                                             $drawingRelId = (string) $ele['Id'];
                                             $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'][(string) $ele['Target']] = $drawingRelId;
                                             if (isset($unparsedDrawings[$drawingRelId])) {
@@ -1255,24 +1600,29 @@ class Xlsx extends BaseReader
                                             }
                                         }
                                     }
+                                    if ($xmlSheet->legacyDrawing && !$this->readDataOnly) {
+                                        foreach ($xmlSheet->legacyDrawing as $drawing) {
+                                            $drawingRelId = (string) self::getArrayItem(self::getAttributes($drawing, $xmlNamespaceBase), 'id');
+                                            if (isset($vmlDrawingContents[$drawingRelId])) {
+                                                $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) {
@@ -1286,7 +1636,7 @@ class Xlsx extends BaseReader
                                     }
 
                                     // Valid range?
-                                    if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
+                                    if ($extractedRange == '') {
                                         continue;
                                     }
 
@@ -1326,16 +1676,21 @@ class Xlsx extends BaseReader
 
                                                 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);
+                                                    [, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
+                                                    if (empty($rangeSet)) {
+                                                        continue;
+                                                    }
                                                     if (strpos($rangeSet, ':') === false) {
                                                         $rangeSet = $rangeSet . ':' . $rangeSet;
                                                     }
                                                     $newRangeSets[] = str_replace('$', '', $rangeSet);
                                                 }
-                                                $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                if (count($newRangeSets) > 0) {
+                                                    $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                }
 
                                                 break;
                                             default:
@@ -1354,14 +1709,9 @@ class Xlsx extends BaseReader
                             foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
                                 // Extract range
                                 $extractedRange = (string) $definedName;
-                                if (($spos = strpos($extractedRange, '!')) !== false) {
-                                    $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
-                                } else {
-                                    $extractedRange = str_replace('$', '', $extractedRange);
-                                }
 
                                 // Valid range?
-                                if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
+                                if ($extractedRange == '') {
                                     continue;
                                 }
 
@@ -1376,113 +1726,56 @@ class Xlsx extends BaseReader
                                             break;
                                         default:
                                             if ($mapSheetId[(int) $definedName['localSheetId']] !== null) {
+                                                $range = Worksheet::extractSheetTitle((string) $definedName, true);
+                                                $scope = $excel->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
                                                 if (strpos((string) $definedName, '!') !== false) {
-                                                    $range = Worksheet::extractSheetTitle((string) $definedName, true);
                                                     $range[0] = str_replace("''", "'", $range[0]);
                                                     $range[0] = str_replace("'", '', $range[0]);
-                                                    if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
-                                                        $extractedRange = str_replace('$', '', $range[1]);
-                                                        $scope = $docSheet->getParent()->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
-                                                        $excel->addNamedRange(new NamedRange((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    if ($worksheet = $excel->getSheetByName($range[0])) { // @phpstan-ignore-line
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    } else {
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));
                                                     }
+                                                } else {
+                                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true));
                                                 }
                                             }
 
                                             break;
                                     }
                                 } elseif (!isset($definedName['localSheetId'])) {
+                                    $definedRange = (string) $definedName;
                                     // "Global" definedNames
                                     $locatedSheet = null;
-                                    $extractedSheetName = '';
                                     if (strpos((string) $definedName, '!') !== false) {
+                                        // 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) $definedName, true);
-                                        $extractedSheetName = trim($extractedSheetName[0], "'");
+                                        [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true); // @phpstan-ignore-line
+                                        $extractedSheetName = trim($extractedSheetName, "'");
 
                                         // Locate sheet
                                         $locatedSheet = $excel->getSheetByName($extractedSheetName);
-
-                                        // Modify range
-                                        [$worksheetName, $extractedRange] = Worksheet::extractSheetTitle($extractedRange, true);
                                     }
 
-                                    if ($locatedSheet !== null) {
-                                        $excel->addNamedRange(new NamedRange((string) $definedName['name'], $locatedSheet, $extractedRange, false));
+                                    if ($locatedSheet === null && !DefinedName::testIfFormula($definedRange)) {
+                                        $definedRange = '#REF!';
                                     }
+                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $definedRange, 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) {
@@ -1499,30 +1792,36 @@ class Xlsx extends BaseReader
                 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])) {
-                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart); // @phpstan-ignore-line
                                     $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-                                    $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
-                                    $objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'], $chartDetails[$chartPositionRef]['toOffsetX'], $chartDetails[$chartPositionRef]['toOffsetY']);
+                                    // 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])) {
+                                        // 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']);
+                                        }
+                                    }
                                 }
                             }
                         }
 
                         break;
 
-                    // unparsed
+                        // unparsed
                     case 'application/vnd.ms-excel.controlproperties+xml':
                         $unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
 
@@ -1538,228 +1837,86 @@ class Xlsx extends BaseReader
         return $excel;
     }
 
-    private static function readColor($color, $background = false)
-    {
-        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);
-                }
-
-                return 'FF' . $returnColour;
-            }
-        }
-
-        if ($background) {
-            return 'FFFFFFFF';
-        }
-
-        return 'FF000000';
-    }
-
     /**
-     * @param Style $docStyle
-     * @param SimpleXMLElement|\stdClass $style
-     */
-    private static function readStyle(Style $docStyle, $style)
-    {
-        $docStyle->getNumberFormat()->setFormatCode($style->numFmt);
-
-        // font
-        if (isset($style->font)) {
-            $docStyle->getFont()->setName((string) $style->font->name['val']);
-            $docStyle->getFont()->setSize((string) $style->font->sz['val']);
-            if (isset($style->font->b)) {
-                $docStyle->getFont()->setBold(!isset($style->font->b['val']) || self::boolean((string) $style->font->b['val']));
-            }
-            if (isset($style->font->i)) {
-                $docStyle->getFont()->setItalic(!isset($style->font->i['val']) || self::boolean((string) $style->font->i['val']));
-            }
-            if (isset($style->font->strike)) {
-                $docStyle->getFont()->setStrikethrough(!isset($style->font->strike['val']) || self::boolean((string) $style->font->strike['val']));
-            }
-            $docStyle->getFont()->getColor()->setARGB(self::readColor($style->font->color));
-
-            if (isset($style->font->u) && !isset($style->font->u['val'])) {
-                $docStyle->getFont()->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
-            } elseif (isset($style->font->u, $style->font->u['val'])) {
-                $docStyle->getFont()->setUnderline((string) $style->font->u['val']);
-            }
-
-            if (isset($style->font->vertAlign, $style->font->vertAlign['val'])) {
-                $vertAlign = strtolower((string) $style->font->vertAlign['val']);
-                if ($vertAlign == 'superscript') {
-                    $docStyle->getFont()->setSuperscript(true);
-                }
-                if ($vertAlign == 'subscript') {
-                    $docStyle->getFont()->setSubscript(true);
-                }
-            }
-        }
-
-        // fill
-        if (isset($style->fill)) {
-            if ($style->fill->gradientFill) {
-                /** @var SimpleXMLElement $gradientFill */
-                $gradientFill = $style->fill->gradientFill[0];
-                if (!empty($gradientFill['type'])) {
-                    $docStyle->getFill()->setFillType((string) $gradientFill['type']);
-                }
-                $docStyle->getFill()->setRotation((float) ($gradientFill['degree']));
-                $gradientFill->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-                $docStyle->getFill()->getStartColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color));
-                $docStyle->getFill()->getEndColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color));
-            } elseif ($style->fill->patternFill) {
-                $patternType = (string) $style->fill->patternFill['patternType'] != '' ? (string) $style->fill->patternFill['patternType'] : 'solid';
-                $docStyle->getFill()->setFillType($patternType);
-                if ($style->fill->patternFill->fgColor) {
-                    $docStyle->getFill()->getStartColor()->setARGB(self::readColor($style->fill->patternFill->fgColor, true));
-                } else {
-                    $docStyle->getFill()->getStartColor()->setARGB('FF000000');
-                }
-                if ($style->fill->patternFill->bgColor) {
-                    $docStyle->getFill()->getEndColor()->setARGB(self::readColor($style->fill->patternFill->bgColor, true));
-                }
-            }
-        }
-
-        // border
-        if (isset($style->border)) {
-            $diagonalUp = self::boolean((string) $style->border['diagonalUp']);
-            $diagonalDown = self::boolean((string) $style->border['diagonalDown']);
-            if (!$diagonalUp && !$diagonalDown) {
-                $docStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_NONE);
-            } elseif ($diagonalUp && !$diagonalDown) {
-                $docStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_UP);
-            } elseif (!$diagonalUp && $diagonalDown) {
-                $docStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_DOWN);
-            } else {
-                $docStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_BOTH);
-            }
-            self::readBorder($docStyle->getBorders()->getLeft(), $style->border->left);
-            self::readBorder($docStyle->getBorders()->getRight(), $style->border->right);
-            self::readBorder($docStyle->getBorders()->getTop(), $style->border->top);
-            self::readBorder($docStyle->getBorders()->getBottom(), $style->border->bottom);
-            self::readBorder($docStyle->getBorders()->getDiagonal(), $style->border->diagonal);
-        }
-
-        // alignment
-        if (isset($style->alignment)) {
-            $docStyle->getAlignment()->setHorizontal((string) $style->alignment['horizontal']);
-            $docStyle->getAlignment()->setVertical((string) $style->alignment['vertical']);
-
-            $textRotation = 0;
-            if ((int) $style->alignment['textRotation'] <= 90) {
-                $textRotation = (int) $style->alignment['textRotation'];
-            } elseif ((int) $style->alignment['textRotation'] > 90) {
-                $textRotation = 90 - (int) $style->alignment['textRotation'];
-            }
-
-            $docStyle->getAlignment()->setTextRotation((int) $textRotation);
-            $docStyle->getAlignment()->setWrapText(self::boolean((string) $style->alignment['wrapText']));
-            $docStyle->getAlignment()->setShrinkToFit(self::boolean((string) $style->alignment['shrinkToFit']));
-            $docStyle->getAlignment()->setIndent((int) ((string) $style->alignment['indent']) > 0 ? (int) ((string) $style->alignment['indent']) : 0);
-            $docStyle->getAlignment()->setReadOrder((int) ((string) $style->alignment['readingOrder']) > 0 ? (int) ((string) $style->alignment['readingOrder']) : 0);
-        }
-
-        // protection
-        if (isset($style->protection)) {
-            if (isset($style->protection['locked'])) {
-                if (self::boolean((string) $style->protection['locked'])) {
-                    $docStyle->getProtection()->setLocked(Protection::PROTECTION_PROTECTED);
-                } else {
-                    $docStyle->getProtection()->setLocked(Protection::PROTECTION_UNPROTECTED);
-                }
-            }
-
-            if (isset($style->protection['hidden'])) {
-                if (self::boolean((string) $style->protection['hidden'])) {
-                    $docStyle->getProtection()->setHidden(Protection::PROTECTION_PROTECTED);
-                } else {
-                    $docStyle->getProtection()->setHidden(Protection::PROTECTION_UNPROTECTED);
-                }
-            }
-        }
-
-        // top-level style settings
-        if (isset($style->quotePrefix)) {
-            $docStyle->setQuotePrefix($style->quotePrefix);
-        }
-    }
-
-    /**
-     * @param Border $docBorder
-     * @param SimpleXMLElement $eleBorder
-     */
-    private static function readBorder(Border $docBorder, $eleBorder)
-    {
-        if (isset($eleBorder['style'])) {
-            $docBorder->setBorderStyle((string) $eleBorder['style']);
-        }
-        if (isset($eleBorder->color)) {
-            $docBorder->getColor()->setARGB(self::readColor($eleBorder->color));
-        }
-    }
-
-    /**
-     * @param SimpleXMLElement | null $is
-     *
      * @return RichText
      */
-    private function parseRichText($is)
+    private function parseRichText(?SimpleXMLElement $is)
     {
         $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(self::readColor($run->rPr->color)));
+                            $objFont->setColor(new Color($this->styleReader->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);
-                        }
-                        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->vertAlign, $run->rPr->vertAlign['val'])) {
-                            $vertAlign = strtolower((string) $run->rPr->vertAlign['val']);
-                            if ($vertAlign == 'superscript') {
-                                $objText->getFont()->setSuperscript(true);
-                            }
-                            if ($vertAlign == 'subscript') {
-                                $objText->getFont()->setSubscript(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->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->i)) {
+                            $attr = $run->rPr->i->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val'])) ||
+                                (!isset($attr['val']))
+                            ) {
+                                $objFont->setItalic(true);
+                            }
                         }
-                        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->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)) {
+                            $attr = $run->rPr->u->attributes();
+                            if (!isset($attr['val'])) {
+                                $objFont->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
+                            } else {
+                                $objFont->setUnderline((string) $attr['val']);
+                            }
+                        }
+                        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);
+                            }
                         }
                     }
                 }
@@ -1769,12 +1926,7 @@ class Xlsx extends BaseReader
         return $value;
     }
 
-    /**
-     * @param Spreadsheet $excel
-     * @param mixed $customUITarget
-     * @param mixed $zip
-     */
-    private function readRibbon(Spreadsheet $excel, $customUITarget, $zip)
+    private function readRibbon(Spreadsheet $excel, string $customUITarget, ZipArchive $zip): void
     {
         $baseDir = dirname($customUITarget);
         $nameCustomUI = basename($customUITarget);
@@ -1788,14 +1940,14 @@ class Xlsx extends BaseReader
         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']);
@@ -1816,19 +1968,32 @@ class Xlsx extends BaseReader
         }
     }
 
+    /**
+     * @param null|array|bool|SimpleXMLElement $array
+     * @param int|string $key
+     *
+     * @return mixed
+     */
     private static function getArrayItem($array, $key = 0)
     {
-        return $array[$key] ?? null;
+        return ($array === null || is_bool($array)) ? null : ($array[$key] ?? null);
     }
 
-    private static function dirAdd($base, $add)
+    /**
+     * @param null|SimpleXMLElement|string $base
+     * @param null|SimpleXMLElement|string $add
+     */
+    private static function dirAdd($base, $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 = trim(str_replace(["\r", "\n"], '', $style), ';');
+        $style = self::stripWhiteSpaceFromStyleString($style);
 
         $temp = explode(';', $style);
         $style = [];
@@ -1840,15 +2005,15 @@ class Xlsx extends BaseReader
             }
             if (strpos($item[1], 'pt') !== false) {
                 $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) {
                 $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) {
                 $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];
@@ -1857,11 +2022,13 @@ class Xlsx extends BaseReader
         return $style;
     }
 
-    private static function boolean($value)
+    public static function stripWhiteSpaceFromStyleString(string $string): string
+    {
+        return trim(str_replace(["\r", "\n", ' '], '', $string), ';');
+    }
+
+    private static function boolean(string $value): bool
     {
-        if (is_object($value)) {
-            $value = (string) $value;
-        }
         if (is_numeric($value)) {
             return (bool) $value;
         }
@@ -1870,70 +2037,73 @@ class Xlsx extends BaseReader
     }
 
     /**
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $objDrawing
-     * @param \SimpleXMLElement $cellAnchor
      * @param array $hyperlinks
      */
-    private function readHyperLinkDrawing($objDrawing, $cellAnchor, $hyperlinks)
+    private function readHyperLinkDrawing(\PhpOffice\PhpSpreadsheet\Worksheet\Drawing $objDrawing, SimpleXMLElement $cellAnchor, $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);
     }
 
-    private function readProtection(Spreadsheet $excel, SimpleXMLElement $xmlWorkbook)
+    private function readProtection(Spreadsheet $excel, SimpleXMLElement $xmlWorkbook): void
     {
         if (!$xmlWorkbook->workbookProtection) {
             return;
         }
 
-        if ($xmlWorkbook->workbookProtection['lockRevision']) {
-            $excel->getSecurity()->setLockRevision((bool) $xmlWorkbook->workbookProtection['lockRevision']);
-        }
-
-        if ($xmlWorkbook->workbookProtection['lockStructure']) {
-            $excel->getSecurity()->setLockStructure((bool) $xmlWorkbook->workbookProtection['lockStructure']);
-        }
-
-        if ($xmlWorkbook->workbookProtection['lockWindows']) {
-            $excel->getSecurity()->setLockWindows((bool) $xmlWorkbook->workbookProtection['lockWindows']);
-        }
+        $excel->getSecurity()->setLockRevision(self::getLockValue($xmlWorkbook->workbookProtection, 'lockRevision'));
+        $excel->getSecurity()->setLockStructure(self::getLockValue($xmlWorkbook->workbookProtection, 'lockStructure'));
+        $excel->getSecurity()->setLockWindows(self::getLockValue($xmlWorkbook->workbookProtection, 'lockWindows'));
 
         if ($xmlWorkbook->workbookProtection['revisionsPassword']) {
-            $excel->getSecurity()->setRevisionsPassword((string) $xmlWorkbook->workbookProtection['revisionsPassword'], true);
+            $excel->getSecurity()->setRevisionsPassword(
+                (string) $xmlWorkbook->workbookProtection['revisionsPassword'],
+                true
+            );
         }
 
         if ($xmlWorkbook->workbookProtection['workbookPassword']) {
-            $excel->getSecurity()->setWorkbookPassword((string) $xmlWorkbook->workbookProtection['workbookPassword'], true);
+            $excel->getSecurity()->setWorkbookPassword(
+                (string) $xmlWorkbook->workbookProtection['workbookPassword'],
+                true
+            );
         }
     }
 
-    private function readFormControlProperties(Spreadsheet $excel, ZipArchive $zip, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData)
+    private static function getLockValue(SimpleXmlElement $protection, string $key): ?bool
     {
+        $returnValue = null;
+        $protectKey = $protection[$key];
+        if (!empty($protectKey)) {
+            $protectKey = (string) $protectKey;
+            $returnValue = $protectKey !== 'false' && (bool) $protectKey;
+        }
+
+        return $returnValue;
+    }
+
+    private function readFormControlProperties(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
+    {
+        $zip = $this->zip;
         if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
             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;
             }
         }
@@ -1944,28 +2114,23 @@ class Xlsx extends BaseReader
             $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)
+    private function readPrinterSettings(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
     {
+        $zip = $this->zip;
         if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
             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;
             }
         }
@@ -1973,68 +2138,191 @@ class Xlsx extends BaseReader
         $unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings'];
         foreach ($sheetPrinterSettings as $rId => $printerSettings) {
             $rId = substr($rId, 3); // rIdXXX
+            if (substr($rId, -2) !== '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']));
+            $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, $xmlNamespaceBase];
+    }
+
+    private function readSheetProtection(Worksheet $docSheet, SimpleXMLElement $xmlSheet): void
+    {
+        if ($this->readDataOnly || !$xmlSheet->sheetProtection) {
+            return;
+        }
+
+        $algorithmName = (string) $xmlSheet->sheetProtection['algorithmName'];
+        $protection = $docSheet->getProtection();
+        $protection->setAlgorithm($algorithmName);
+
+        if ($algorithmName) {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['hashValue'], true);
+            $protection->setSalt((string) $xmlSheet->sheetProtection['saltValue']);
+            $protection->setSpinCount((int) $xmlSheet->sheetProtection['spinCount']);
+        } else {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['password'], true);
+        }
+
+        if ($xmlSheet->protectedRanges->protectedRange) {
+            foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
+                $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
+            }
+        }
+    }
+
+    private function readAutoFilter(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet
+    ): void {
+        if ($xmlSheet && $xmlSheet->autoFilter) {
+            (new AutoFilter($docSheet, $xmlSheet))->load();
+        }
+    }
+
+    private function readTables(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip
+    ): void {
+        if ($xmlSheet && $xmlSheet->tableParts && (int) $xmlSheet->tableParts['count'] > 0) {
+            $this->readTablesInTablesFile($xmlSheet, $dir, $fileWorksheet, $zip, $docSheet);
+        }
+    }
+
+    private function readTablesInTablesFile(
+        SimpleXMLElement $xmlSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip,
+        Worksheet $docSheet
+    ): 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)) {
+                $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);
+                            (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 $workbookBasename;
+        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);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
index 69d5f69e0..a6ab4d894 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -4,32 +4,43 @@ namespace 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;
+    /**
+     * @var Table|Worksheet
+     */
+    private $parent;
 
+    /**
+     * @var SimpleXMLElement
+     */
     private $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml)
+    /**
+     * @param Table|Worksheet $parent
+     */
+    public function __construct($parent, SimpleXMLElement $worksheetXml)
     {
-        $this->worksheet = $workSheet;
+        $this->parent = $parent;
         $this->worksheetXml = $worksheetXml;
     }
 
-    public function load()
+    public function load(): void
     {
         // Remove all "$" in the auto filter range
-        $autoFilterRange = preg_replace('/\$/', '', $this->worksheetXml->autoFilter['ref']);
+        $autoFilterRange = (string) preg_replace('/\$/', '', $this->worksheetXml->autoFilter['ref'] ?? '');
         if (strpos($autoFilterRange, ':') !== false) {
             $this->readAutoFilter($autoFilterRange, $this->worksheetXml);
         }
     }
 
-    private function readAutoFilter($autoFilterRange, $xmlSheet)
+    private function readAutoFilter(string $autoFilterRange, SimpleXMLElement $xmlSheet): void
     {
-        $autoFilter = $this->worksheet->getAutoFilter();
+        $autoFilter = $this->parent->getAutoFilter();
         $autoFilter->setRange($autoFilterRange);
 
         foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
@@ -38,15 +49,15 @@ class AutoFilter
             if ($filterColumn->filters) {
                 $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_FILTER);
                 $filters = $filterColumn->filters;
-                if ((isset($filters['blank'])) && ($filters['blank'] == 1)) {
+                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) {
                     //    Operator is undefined, but always treated as EQUAL
-                    $column->createRule()->setRule(null, (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                    $column->createRule()->setRule('', (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
                 }
 
                 //    Or Date Group elements
@@ -60,14 +71,15 @@ class AutoFilter
             //    Check for dynamic filters
             $this->readTopTenAutoFilter($filterColumn, $column);
         }
+        $autoFilter->setEvaluated(true);
     }
 
-    private function readDateRangeAutoFilter(\SimpleXMLElement $filters, Column $column)
+    private function readDateRangeAutoFilter(SimpleXMLElement $filters, Column $column): void
     {
         foreach ($filters->dateGroupItem as $dateGroupItem) {
             //    Operator is undefined, but always treated as EQUAL
             $column->createRule()->setRule(
-                null,
+                '',
                 [
                     'year' => (string) $dateGroupItem['year'],
                     'month' => (string) $dateGroupItem['month'],
@@ -81,14 +93,14 @@ class AutoFilter
         }
     }
 
-    private function readCustomAutoFilter(\SimpleXMLElement $filterColumn, Column $column)
+    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;
             //    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($customFilters['and'])) && ((string) $customFilters['and'] === '1')) {
                 $column->setJoin(Column::AUTOFILTER_COLUMN_JOIN_AND);
             }
             foreach ($customFilters->customFilter as $filterRule) {
@@ -100,15 +112,15 @@ class AutoFilter
         }
     }
 
-    private function readDynamicAutoFilter(\SimpleXMLElement $filterColumn, Column $column)
+    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
                 $column->createRule()->setRule(
-                    null,
+                    '',
                     (string) $filterRule['val'],
                     (string) $filterRule['type']
                 )->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
@@ -122,19 +134,21 @@ class AutoFilter
         }
     }
 
-    private function readTopTenAutoFilter(\SimpleXMLElement $filterColumn, Column $column)
+    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) {
                 $column->createRule()->setRule(
-                    (((isset($filterRule['percent'])) && ($filterRule['percent'] == 1))
+                    (
+                        ((isset($filterRule['percent'])) && ((string) $filterRule['percent'] === '1'))
                         ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
                         : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
                     ),
                     (string) $filterRule['val'],
-                    (((isset($filterRule['top'])) && ($filterRule['top'] == 1))
+                    (
+                        ((isset($filterRule['top'])) && ((string) $filterRule['top'] === '1'))
                         ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
                         : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
                     )
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
index 1679f01f9..6b99877c5 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
@@ -4,16 +4,19 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 class BaseParserClass
 {
-    protected static function boolean($value)
+    /**
+     * @param mixed $value
+     */
+    protected static function boolean($value): bool
     {
         if (is_object($value)) {
-            $value = (string) $value;
+            $value = (string) $value; // @phpstan-ignore-line
         }
 
         if (is_numeric($value)) {
             return (bool) $value;
         }
 
-        return $value === strtolower('true');
+        return $value === 'true' || $value === 'TRUE';
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 2b920d705..c5a59f558 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -2,22 +2,39 @@
 
 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
 {
+    /** @var string */
+    private $cNamespace;
+
+    /** @var string */
+    private $aNamespace;
+
+    public function __construct(string $cNamespace = Namespaces::CHART, string $aNamespace = Namespaces::DRAWINGML)
+    {
+        $this->cNamespace = $cNamespace;
+        $this->aNamespace = $aNamespace;
+    }
+
     /**
-     * @param SimpleXMLElement $component
      * @param string $name
      * @param string $format
      *
@@ -26,13 +43,15 @@ class Chart
     private static function getAttribute(SimpleXMLElement $component, $name, $format)
     {
         $attributes = $component->attributes();
-        if (isset($attributes[$name])) {
+        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;
+                $value = (string) $attributes[$name];
+
+                return $value === 'true' || $value === '1';
             }
 
             return (float) $attributes[$name];
@@ -41,129 +60,291 @@ class Chart
         return null;
     }
 
-    private static function readColor($color, $background = false)
-    {
-        if (isset($color['rgb'])) {
-            return (string) $color['rgb'];
-        } elseif (isset($color['indexed'])) {
-            return Color::indexedColor($color['indexed'] - 7, $background)->getARGB();
-        }
-    }
-
     /**
-     * @param SimpleXMLElement $chartElements
      * @param string $chartName
      *
      * @return \PhpOffice\PhpSpreadsheet\Chart\Chart
      */
-    public static function readChart(SimpleXMLElement $chartElements, $chartName)
+    public function readChart(SimpleXMLElement $chartElements, $chartName)
     {
-        $namespacesChartMeta = $chartElements->getNamespaces(true);
-        $chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+        $chartElementsC = $chartElements->children($this->cNamespace);
 
         $XaxisLabel = $YaxisLabel = $legend = $title = null;
         $dispBlanksAs = $plotVisOnly = null;
-
+        $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 = self::getAttribute($chartElementsC->roundedCorners, 'val', 'boolean');
+
+                    break;
                 case 'chart':
                     foreach ($chartElement as $chartDetailsKey => $chartDetails) {
-                        $chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+                        $chartDetails = Xlsx::testSimpleXml($chartDetails);
                         switch ($chartDetailsKey) {
+                            case 'autoTitleDeleted':
+                                /** @var bool */
+                                $autoTitleDeleted = self::getAttribute($chartElementsC->chart->autoTitleDeleted, 'val', 'boolean');
+
+                                break;
+                            case 'view3D':
+                                $rotX = self::getAttribute($chartDetails->rotX, 'val', 'integer');
+                                $rotY = self::getAttribute($chartDetails->rotY, 'val', 'integer');
+                                $rAngAx = self::getAttribute($chartDetails->rAngAx, 'val', 'integer');
+                                $perspective = self::getAttribute($chartDetails->perspective, 'val', 'integer');
+
+                                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 = self::getAttribute($gradient, 'pos', 'float');
+                                                    $gradientArray[] = [
+                                                        $pos / ChartProperties::PERCENTAGE_MULTIPLIER,
+                                                        new ChartColor($this->readColor($gradient)),
+                                                    ];
+                                                }
+                                            }
+                                            if (isset($possibleNoFill->gradFill->lin)) {
+                                                $gradientLin = ChartProperties::XmlToAngle((string) self::getAttribute($possibleNoFill->gradFill->lin, 'ang', 'string'));
+                                            }
+
+                                            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::getAttribute($chartDetail->axPos, 'val', 'string');
                                             }
+                                            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)) {
-                                                $YaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta);
+                                                        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':
+                                                    case 'b':
+                                                        $XaxisLabel = $axisLabel;
+
+                                                        break;
+                                                    case 'r':
+                                                    case 'l':
+                                                        $YaxisLabel = $axisLabel;
+
+                                                        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);
+                                            $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::getAttribute($chartDetail->ser->explosion, 'val', 'string');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$explosion");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'scatterChart':
+                                            /** @var string */
                                             $scatterStyle = self::getAttribute($chartDetail->scatterStyle, 'val', 'string');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $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);
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$bubbleScale");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'radarChart':
+                                            /** @var string */
                                             $radarStyle = self::getAttribute($chartDetail->radarStyle, 'val', 'string');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $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);
+                                            $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::getAttribute($chartDetail->upDownBars->gapWidth, 'val', 'integer');
+                                            }
+                                            if (isset($chartDetail->upDownBars->upBars)) {
+                                                $useUpBars = true;
+                                            }
+                                            if (isset($chartDetail->upDownBars->downBars)) {
+                                                $useDownBars = true;
+                                            }
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                     }
@@ -172,7 +353,22 @@ class Chart
                                     $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':
@@ -184,14 +380,19 @@ class Chart
 
                                 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');
@@ -202,74 +403,150 @@ class Chart
 
                                             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 = [];
         $titleLayout = null;
+        $titleOverlay = false;
         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);
+                    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;
+                            }
                         }
                     }
 
+                    break;
+                case 'overlay':
+                    $titleOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
+
                     break;
                 case 'layout':
-                    $titleLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                    $titleLayout = $this->chartLayoutDetails($chartDetail);
 
                     break;
             }
         }
 
-        return new Title($caption, $titleLayout);
+        return new Title($caption, $titleLayout, (bool) $titleOverlay);
     }
 
-    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) {
+            $detail = Xlsx::testSimpleXml($detail);
             $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
         }
 
         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 = [];
 
-        $seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+        $seriesDetailSet = $chartDetail->children($this->cNamespace);
         foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
             switch ($seriesDetailKey) {
                 case 'grouping':
@@ -279,7 +556,18 @@ class Chart
                 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');
@@ -291,11 +579,89 @@ class Chart
 
                                 break;
                             case 'tx':
-                                $seriesLabel[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                $seriesLabel[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail);
+
+                                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::getAttribute($seriesDetail->idx, 'val', 'string');
+                                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);
+                                /** @var ?string */
+                                $trendLineType = self::getAttribute($seriesDetail->trendlineType, 'val', 'string');
+                                /** @var ?bool */
+                                $dispRSqr = self::getAttribute($seriesDetail->dispRSqr, 'val', 'boolean');
+                                /** @var ?bool */
+                                $dispEq = self::getAttribute($seriesDetail->dispEq, 'val', 'boolean');
+                                /** @var ?int */
+                                $order = self::getAttribute($seriesDetail->order, 'val', 'integer');
+                                /** @var ?int */
+                                $period = self::getAttribute($seriesDetail->period, 'val', 'integer');
+                                /** @var ?float */
+                                $forward = self::getAttribute($seriesDetail->forward, 'val', 'float');
+                                /** @var ?float */
+                                $backward = self::getAttribute($seriesDetail->backward, 'val', 'float');
+                                /** @var ?float */
+                                $intercept = self::getAttribute($seriesDetail->intercept, 'val', 'float');
+                                /** @var ?string */
+                                $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');
+                                $pointSize = self::getAttribute($seriesDetail->size, 'val', 'string');
+                                $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':
@@ -303,65 +669,218 @@ class Chart
 
                                 break;
                             case 'cat':
-                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                $seriesCategory[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail);
 
                                 break;
                             case 'val':
-                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $seriesValues[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
 
                                 break;
                             case 'xVal':
-                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $seriesCategory[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
 
                                 break;
                             case 'yVal':
-                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $seriesValues[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+
+                                break;
+                            case 'bubbleSize':
+                                $seriesBubbles[$seriesIndex] = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+
+                                break;
+                            case 'bubble3D':
+                                $bubble3D = self::getAttribute($seriesDetail, 'val', 'boolean');
+
+                                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);
+                        }
+                    }
             }
         }
+        /** @phpstan-ignore-next-line */
+        $series = new DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
+        $series->setPlotBubbleSizes($seriesBubbles);
 
-        return new DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
+        return $series;
     }
 
-    private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null)
+    /**
+     * @return mixed
+     */
+    private function chartDataSeriesValueSet(SimpleXMLElement $seriesDetail, ?string $marker = null, ?ChartColor $fillColor = null, ?string $pointSize = null)
     {
         if (isset($seriesDetail->strRef)) {
             $seriesSource = (string) $seriesDetail->strRef->f;
-            $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
-            return new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker);
+            if (isset($seriesDetail->strRef->strCache)) {
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->strRef->strCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
         } elseif (isset($seriesDetail->numRef)) {
             $seriesSource = (string) $seriesDetail->numRef->f;
-            $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
+            if (isset($seriesDetail->numRef->numCache)) {
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->numRef->numCache->children($this->cNamespace));
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
 
-            return new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker);
+            return $seriesValues;
         } elseif (isset($seriesDetail->multiLvlStrRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
-            $seriesData['pointCount'] = count($seriesData['dataValues']);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
-            return new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker);
+            if (isset($seriesDetail->multiLvlStrRef->multiLvlStrCache)) {
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
         } elseif (isset($seriesDetail->multiLvlNumRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
-            $seriesData['pointCount'] = count($seriesData['dataValues']);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
-            return new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker);
+            if (isset($seriesDetail->multiLvlNumRef->multiLvlNumCache)) {
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            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');
@@ -375,7 +894,7 @@ class Chart
                     $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
                     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;
@@ -392,7 +911,7 @@ class Chart
         ];
     }
 
-    private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n')
+    private function chartDataSeriesValuesMultiLevel(SimpleXMLElement $seriesValueSet, string $dataType = 'n'): array
     {
         $seriesVal = [];
         $formatCode = '';
@@ -400,6 +919,7 @@ class Chart
 
         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');
@@ -413,7 +933,7 @@ class Chart
                         $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
                         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;
@@ -431,78 +951,265 @@ class Chart
         ];
     }
 
-    private static function parseRichText(SimpleXMLElement $titleDetailPart)
+    private function parseRichText(SimpleXMLElement $titleDetailPart): RichText
     {
         $value = new RichText();
-        $objText = null;
-        foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
-            if (isset($titleDetailElement->t)) {
-                $objText = $value->createTextRun((string) $titleDetailElement->t);
+        $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)) {
+            /** @var ?int */
+            $defaultFontSize = self::getAttribute($titleDetailPart->pPr->defRPr, 'sz', 'integer');
+            /** @var ?bool */
+            $defaultBold = self::getAttribute($titleDetailPart->pPr->defRPr, 'b', 'boolean');
+            /** @var ?bool */
+            $defaultItalic = self::getAttribute($titleDetailPart->pPr->defRPr, 'i', 'boolean');
+            /** @var ?string */
+            $defaultUnderscore = self::getAttribute($titleDetailPart->pPr->defRPr, 'u', 'string');
+            /** @var ?string */
+            $defaultStrikethrough = self::getAttribute($titleDetailPart->pPr->defRPr, 'strike', 'string');
+            /** @var ?int */
+            $defaultBaseline = self::getAttribute($titleDetailPart->pPr->defRPr, 'baseline', 'integer');
+            if (isset($titleDetailPart->defRPr->rFont['val'])) {
+                $defaultFontName = (string) $titleDetailPart->defRPr->rFont['val'];
             }
+            if (isset($titleDetailPart->pPr->defRPr->latin)) {
+                /** @var ?string */
+                $defaultLatin = self::getAttribute($titleDetailPart->pPr->defRPr->latin, 'typeface', 'string');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->ea)) {
+                /** @var ?string */
+                $defaultEastAsian = self::getAttribute($titleDetailPart->pPr->defRPr->ea, 'typeface', 'string');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->cs)) {
+                /** @var ?string */
+                $defaultComplexScript = self::getAttribute($titleDetailPart->pPr->defRPr->cs, 'typeface', 'string');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->solidFill)) {
+                $defaultFontColor = $this->readColor($titleDetailPart->pPr->defRPr->solidFill);
+            }
+        }
+        foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+            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']);
-                }
-
-                $fontSize = (self::getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-                if ($fontSize !== null) {
-                    $objText->getFont()->setSize(floor($fontSize / 100));
-                }
-
-                $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string'));
-                if ($fontColor !== null) {
-                    $objText->getFont()->setColor(new Color(self::readColor($fontColor)));
+                    // @codeCoverageIgnoreStart
+                    $fontName = (string) $titleDetailElement->rPr->rFont['val'];
+                    // @codeCoverageIgnoreEnd
+                }
+                if (isset($titleDetailElement->rPr->latin)) {
+                    /** @var ?string */
+                    $latinName = self::getAttribute($titleDetailElement->rPr->latin, 'typeface', 'string');
+                }
+                if (isset($titleDetailElement->rPr->ea)) {
+                    /** @var ?string */
+                    $eastAsian = self::getAttribute($titleDetailElement->rPr->ea, 'typeface', 'string');
+                }
+                if (isset($titleDetailElement->rPr->cs)) {
+                    /** @var ?string */
+                    $complexScript = self::getAttribute($titleDetailElement->rPr->cs, 'typeface', 'string');
+                }
+                /** @var ?int */
+                $fontSize = self::getAttribute($titleDetailElement->rPr, 'sz', 'integer');
+
+                // not used now, not sure it ever was, grandfathering
+                if (isset($titleDetailElement->rPr->solidFill)) {
+                    $fontColor = $this->readColor($titleDetailElement->rPr->solidFill);
                 }
 
+                /** @var ?bool */
                 $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-                if ($bold !== null) {
-                    $objText->getFont()->setBold($bold);
-                }
 
+                /** @var ?bool */
                 $italic = self::getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-                if ($italic !== null) {
-                    $objText->getFont()->setItalic($italic);
-                }
 
+                /** @var ?int */
                 $baseline = self::getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-                if ($baseline !== null) {
-                    if ($baseline > 0) {
-                        $objText->getFont()->setSuperscript(true);
-                    } elseif ($baseline < 0) {
-                        $objText->getFont()->setSubscript(true);
-                    }
+
+                /** @var ?string */
+                $underscore = self::getAttribute($titleDetailElement->rPr, 'u', 'string');
+                if (isset($titleDetailElement->rPr->uFill->solidFill)) {
+                    $underlineColor = $this->readColor($titleDetailElement->rPr->uFill->solidFill);
                 }
 
-                $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);
-                    }
-                }
+                /** @var ?string */
+                $strikethrough = self::getAttribute($titleDetailElement->rPr, 'strike', 'string');
+            }
 
-                $strikethrough = (self::getAttribute($titleDetailElement->rPr, 's', 'string'));
-                if ($strikethrough !== null) {
-                    if ($strikethrough == 'noStrike') {
-                        $objText->getFont()->setStrikethrough(false);
-                    } else {
-                        $objText->getFont()->setStrikethrough(true);
-                    }
+            $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 = $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 = $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::getAttribute($titleDetailPart->pPr->defRPr, 'sz', 'integer');
+        $fontArray['bold'] = self::getAttribute($titleDetailPart->pPr->defRPr, 'b', 'boolean');
+        $fontArray['italic'] = self::getAttribute($titleDetailPart->pPr->defRPr, 'i', 'boolean');
+        $fontArray['underscore'] = self::getAttribute($titleDetailPart->pPr->defRPr, 'u', 'string');
+        $fontArray['strikethrough'] = self::getAttribute($titleDetailPart->pPr->defRPr, 'strike', 'string');
+
+        if (isset($titleDetailPart->pPr->defRPr->latin)) {
+            $fontArray['latin'] = self::getAttribute($titleDetailPart->pPr->defRPr->latin, 'typeface', 'string');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->ea)) {
+            $fontArray['eastAsian'] = self::getAttribute($titleDetailPart->pPr->defRPr->ea, 'typeface', 'string');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->cs)) {
+            $fontArray['complexScript'] = self::getAttribute($titleDetailPart->pPr->defRPr->cs, 'typeface', 'string');
+        }
+        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;
+    }
+
+    /**
+     * @param ?SimpleXMLElement $chartDetail
+     */
+    private function readChartAttributes($chartDetail): array
     {
         $plotAttributes = [];
         if (isset($chartDetail->dLbls)) {
-            if (isset($chartDetail->dLbls->howLegendKey)) {
+            if (isset($chartDetail->dLbls->dLblPos)) {
+                $plotAttributes['dLblPos'] = self::getAttribute($chartDetail->dLbls->dLblPos, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->numFmt)) {
+                $plotAttributes['numFmtCode'] = self::getAttribute($chartDetail->dLbls->numFmt, 'formatCode', 'string');
+                $plotAttributes['numFmtLinked'] = self::getAttribute($chartDetail->dLbls->numFmt, 'sourceLinked', 'boolean');
+            }
+            if (isset($chartDetail->dLbls->showLegendKey)) {
                 $plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showVal)) {
@@ -523,16 +1230,35 @@ class Chart
             if (isset($chartDetail->dLbls->showLeaderLines)) {
                 $plotAttributes['showLeaderLines'] = self::getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
             }
+            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 Layout $plotArea
      * @param mixed $plotAttributes
      */
-    private static function setChartAttributes(Layout $plotArea, $plotAttributes)
+    private function setChartAttributes(Layout $plotArea, $plotAttributes): void
     {
         foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
             switch ($plotAttributeKey) {
@@ -567,4 +1293,273 @@ class Chart
             }
         }
     }
+
+    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::getAttribute($sppr->effectLst->glow, 'rad', 'integer') / 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)) {
+            /** @var string */
+            $softEdgeSize = self::getAttribute($sppr->effectLst->softEdge, 'rad', 'string');
+            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 !== '') {
+            /** @var string */
+            $blur = self::getAttribute($sppr->effectLst->$type, 'blurRad', 'string');
+            $blur = is_numeric($blur) ? ChartProperties::xmlToPoints($blur) : null;
+            /** @var string */
+            $dist = self::getAttribute($sppr->effectLst->$type, 'dist', 'string');
+            $dist = is_numeric($dist) ? ChartProperties::xmlToPoints($dist) : null;
+            /** @var string */
+            $direction = self::getAttribute($sppr->effectLst->$type, 'dir', 'string');
+            $direction = is_numeric($direction) ? ChartProperties::xmlToAngle($direction) : null;
+            $algn = self::getAttribute($sppr->effectLst->$type, 'algn', 'string');
+            $rot = self::getAttribute($sppr->effectLst->$type, 'rotWithShape', 'string');
+            $size = [];
+            foreach (['sx', 'sy'] as $sizeType) {
+                $sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
+                if (is_numeric($sizeValue)) {
+                    $size[$sizeType] = ChartProperties::xmlToTenthOfPercent((string) $sizeValue);
+                } else {
+                    $size[$sizeType] = null;
+                }
+            }
+            foreach (['kx', 'ky'] as $sizeType) {
+                $sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
+                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::getAttribute($colorXml->$type, 'val', 'string');
+                if (isset($colorXml->$type->alpha)) {
+                    /** @var string */
+                    $alpha = self::getAttribute($colorXml->$type->alpha, 'val', 'string');
+                    if (is_numeric($alpha)) {
+                        $result['alpha'] = ChartColor::alphaFromXml($alpha);
+                    }
+                }
+                if (isset($colorXml->$type->lumMod)) {
+                    /** @var string */
+                    $brightness = self::getAttribute($colorXml->$type->lumMod, 'val', 'string');
+                    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;
+        /** @var string */
+        $lineWidthTemp = self::getAttribute($sppr->ln, 'w', 'string');
+        if (is_numeric($lineWidthTemp)) {
+            $lineWidth = ChartProperties::xmlToPoints($lineWidthTemp);
+        }
+        /** @var string */
+        $compoundType = self::getAttribute($sppr->ln, 'cmpd', 'string');
+        /** @var string */
+        $dashType = self::getAttribute($sppr->ln->prstDash, 'val', 'string');
+        /** @var string */
+        $capType = self::getAttribute($sppr->ln, 'cap', 'string');
+        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 = '';
+        $endArrowSize = '';
+        /** @var string */
+        $headArrowType = self::getAttribute($sppr->ln->headEnd, 'type', 'string');
+        /** @var string */
+        $headArrowWidth = self::getAttribute($sppr->ln->headEnd, 'w', 'string');
+        /** @var string */
+        $headArrowLength = self::getAttribute($sppr->ln->headEnd, 'len', 'string');
+        /** @var string */
+        $endArrowType = self::getAttribute($sppr->ln->tailEnd, 'type', 'string');
+        /** @var string */
+        $endArrowWidth = self::getAttribute($sppr->ln->tailEnd, 'w', 'string');
+        /** @var string */
+        $endArrowLength = self::getAttribute($sppr->ln->tailEnd, 'len', 'string');
+        $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::getAttribute($chartDetail->delete, 'val', 'string'));
+        }
+        if (isset($chartDetail->numFmt)) {
+            $whichAxis->setAxisNumberProperties(
+                (string) self::getAttribute($chartDetail->numFmt, 'formatCode', 'string'),
+                null,
+                (int) self::getAttribute($chartDetail->numFmt, 'sourceLinked', 'int')
+            );
+        }
+        if (isset($chartDetail->crossBetween)) {
+            $whichAxis->setCrossBetween((string) self::getAttribute($chartDetail->crossBetween, 'val', 'string'));
+        }
+        if (isset($chartDetail->majorTickMark)) {
+            $whichAxis->setAxisOption('major_tick_mark', (string) self::getAttribute($chartDetail->majorTickMark, 'val', 'string'));
+        }
+        if (isset($chartDetail->minorTickMark)) {
+            $whichAxis->setAxisOption('minor_tick_mark', (string) self::getAttribute($chartDetail->minorTickMark, 'val', 'string'));
+        }
+        if (isset($chartDetail->tickLblPos)) {
+            $whichAxis->setAxisOption('axis_labels', (string) self::getAttribute($chartDetail->tickLblPos, 'val', 'string'));
+        }
+        if (isset($chartDetail->crosses)) {
+            $whichAxis->setAxisOption('horizontal_crosses', (string) self::getAttribute($chartDetail->crosses, 'val', 'string'));
+        }
+        if (isset($chartDetail->crossesAt)) {
+            $whichAxis->setAxisOption('horizontal_crosses_value', (string) self::getAttribute($chartDetail->crossesAt, 'val', 'string'));
+        }
+        if (isset($chartDetail->scaling->orientation)) {
+            $whichAxis->setAxisOption('orientation', (string) self::getAttribute($chartDetail->scaling->orientation, 'val', 'string'));
+        }
+        if (isset($chartDetail->scaling->max)) {
+            $whichAxis->setAxisOption('maximum', (string) self::getAttribute($chartDetail->scaling->max, 'val', 'string'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttribute($chartDetail->scaling->min, 'val', 'string'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttribute($chartDetail->scaling->min, 'val', 'string'));
+        }
+        if (isset($chartDetail->majorUnit)) {
+            $whichAxis->setAxisOption('major_unit', (string) self::getAttribute($chartDetail->majorUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->minorUnit)) {
+            $whichAxis->setAxisOption('minor_unit', (string) self::getAttribute($chartDetail->minorUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->baseTimeUnit)) {
+            $whichAxis->setAxisOption('baseTimeUnit', (string) self::getAttribute($chartDetail->baseTimeUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->majorTimeUnit)) {
+            $whichAxis->setAxisOption('majorTimeUnit', (string) self::getAttribute($chartDetail->majorTimeUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->minorTimeUnit)) {
+            $whichAxis->setAxisOption('minorTimeUnit', (string) self::getAttribute($chartDetail->minorTimeUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->txPr)) {
+            $children = $chartDetail->txPr->children($this->aNamespace);
+            $addAxisText = false;
+            $axisText = new AxisText();
+            if (isset($children->bodyPr)) {
+                /** @var string */
+                $textRotation = self::getAttribute($children->bodyPr, 'rot', 'string');
+                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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
index e901d9904..2b14eab7c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -3,16 +3,20 @@
 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
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml = null)
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
         $this->worksheet = $workSheet;
         $this->worksheetXml = $worksheetXml;
@@ -25,7 +29,7 @@ class ColumnAndRowAttributes extends BaseParserClass
      * @param array $columnAttributes array of attributes (indexes are attribute name, values are value)
      *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'width', ... ?
      */
-    private function setColumnAttributes($columnAddress, array $columnAttributes)
+    private function setColumnAttributes($columnAddress, array $columnAttributes): void
     {
         if (isset($columnAttributes['xfIndex'])) {
             $this->worksheet->getColumnDimension($columnAddress)->setXfIndex($columnAttributes['xfIndex']);
@@ -51,7 +55,7 @@ class ColumnAndRowAttributes extends BaseParserClass
      * @param array $rowAttributes array of attributes (indexes are attribute name, values are value)
      *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'rowHeight', ... ?
      */
-    private function setRowAttributes($rowNumber, array $rowAttributes)
+    private function setRowAttributes($rowNumber, array $rowAttributes): void
     {
         if (isset($rowAttributes['xfIndex'])) {
             $this->worksheet->getRowDimension($rowNumber)->setXfIndex($rowAttributes['xfIndex']);
@@ -70,11 +74,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         }
     }
 
-    /**
-     * @param IReadFilter $readFilter
-     * @param bool $readDataOnly
-     */
-    public function load(IReadFilter $readFilter = null, $readDataOnly = false)
+    public function load(?IReadFilter $readFilter = null, bool $readDataOnly = false): void
     {
         if ($this->worksheetXml === null) {
             return;
@@ -90,11 +90,17 @@ class ColumnAndRowAttributes extends BaseParserClass
             $rowsAttributes = $this->readRowAttributes($this->worksheetXml->sheetData->row, $readDataOnly);
         }
 
+        if ($readFilter !== null && get_class($readFilter) === DefaultReadFilter::class) {
+            $readFilter = null;
+        }
+
         // set columns/rows attributes
         $columnsAttributesAreSet = [];
         foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
-            if ($readFilter === null ||
-                !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)) {
+            if (
+                $readFilter === null ||
+                !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)
+            ) {
                 if (!isset($columnsAttributesAreSet[$columnCoordinate])) {
                     $this->setColumnAttributes($columnCoordinate, $columnAttributes);
                     $columnsAttributesAreSet[$columnCoordinate] = true;
@@ -104,8 +110,10 @@ class ColumnAndRowAttributes extends BaseParserClass
 
         $rowsAttributesAreSet = [];
         foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
-            if ($readFilter === null ||
-                !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)) {
+            if (
+                $readFilter === null ||
+                !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)
+            ) {
                 if (!isset($rowsAttributesAreSet[$rowCoordinate])) {
                     $this->setRowAttributes($rowCoordinate, $rowAttributes);
                     $rowsAttributesAreSet[$rowCoordinate] = true;
@@ -114,7 +122,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         }
     }
 
-    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())) {
@@ -125,19 +133,23 @@ class ColumnAndRowAttributes extends BaseParserClass
         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);
+        foreach ($worksheetCols->col as $columnx) {
+            /** @scrutinizer ignore-call */
+            $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;
+                    if ((int) ($column['max']) == 16384) {
+                        break;
+                    }
                 }
             }
         }
@@ -145,28 +157,31 @@ class ColumnAndRowAttributes extends BaseParserClass
         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 ($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'];
+            }
         }
-        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'];
-        }
-        $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())) {
@@ -177,25 +192,29 @@ class ColumnAndRowAttributes extends BaseParserClass
         return false;
     }
 
-    private function readRowAttributes(\SimpleXMLElement $worksheetRow, $readDataOnly)
+    private function readRowAttributes(SimpleXMLElement $worksheetRow, bool $readDataOnly): 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) {
+            /** @scrutinizer ignore-call */
+            $row = $rowx->attributes();
+            if ($row !== null) {
+                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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index 722b77952..59bf5b84e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -2,44 +2,170 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles as StyleReader;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
+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
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var SimpleXMLElement */
     private $worksheetXml;
 
+    /**
+     * @var array
+     */
+    private $ns;
+
+    /** @var array */
     private $dxfs;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml, array $dxfs = [])
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs = [])
     {
         $this->worksheet = $workSheet;
         $this->worksheetXml = $worksheetXml;
         $this->dxfs = $dxfs;
     }
 
-    public function load()
+    public function load(): void
     {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
         $this->setConditionalStyles(
             $this->worksheet,
-            $this->readConditionalStyles($this->worksheetXml)
+            $this->readConditionalStyles($this->worksheetXml),
+            $this->worksheetXml->extLst
         );
+
+        $this->worksheet->setSelectedCells($selectedCells);
     }
 
-    private function readConditionalStyles($xmlSheet)
+    public function loadFromExt(StyleReader $styleReader): void
+    {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
+        $this->ns = $this->worksheetXml->getNamespaces(true);
+        $this->setConditionalsFromExt(
+            $this->readConditionalsFromExt($this->worksheetXml->extLst, $styleReader)
+        );
+
+        $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, StyleReader $styleReader): array
+    {
+        $conditionals = [];
+
+        if (isset($extLst->ext['uri']) && (string) $extLst->ext['uri'] === '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+            $conditionalFormattingRuleXml = $extLst->ext->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, $styleReader);
+                $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, StyleReader $styleReader): Style
+    {
+        $cfStyle = new Style(false, true);
+        if ($extCfRuleXml->dxf) {
+            $styleXML = $extCfRuleXml->dxf->children();
+
+            if ($styleXML->borders) {
+                $styleReader->readBorderStyle($cfStyle->getBorders(), $styleXML->borders);
+            }
+            if ($styleXML->fill) {
+                $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 (((string) $cfRule['type'] == Conditional::CONDITION_NONE
-                    || (string) $cfRule['type'] == Conditional::CONDITION_CELLIS
-                    || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSTEXT
-                    || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSBLANKS
-                    || (string) $cfRule['type'] == Conditional::CONDITION_NOTCONTAINSBLANKS
-                    || (string) $cfRule['type'] == Conditional::CONDITION_EXPRESSION)
-                    && 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;
                 }
             }
@@ -48,47 +174,118 @@ class ConditionalStyles
         return $conditionals;
     }
 
-    private function setConditionalStyles(Worksheet $worksheet, array $conditionals)
+    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);
+            $conditionalStyles = $this->readStyleRules($cfRules, $xmlExtLst);
 
-            // Extract all cell references in $ref
-            $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));
+            // Extract all cell references in $cellRangeReference
+            $cellBlocks = explode(' ', str_replace('$', '', strtoupper($cellRangeReference)));
             foreach ($cellBlocks as $cellBlock) {
                 $worksheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);
             }
         }
     }
 
-    private function readStyleRules($cfRules)
+    private function readStyleRules(array $cfRules, SimpleXMLElement $extLst): array
     {
+        $conditionalFormattingRuleExtensions = ConditionalFormattingRuleExtension::parseExtLstXml($extLst);
         $conditionalStyles = [];
+
         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;
+                    if ($formula === 'TRUE') {
+                        $objConditional->addCondition(true);
+                    } elseif ($formula === 'FALSE') {
+                        $objConditional->addCondition(false);
+                    } else {
+                        $objConditional->addCondition($formula);
+                    }
                 }
             } else {
-                $objConditional->addCondition((string) $cfRule->formula);
+                $objConditional->addCondition('');
             }
-            $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
+
+            if (isset($cfRule->dataBar)) {
+                $objConditional->setDataBar(
+                    $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions) // @phpstan-ignore-line
+                );
+            } elseif (isset($cfRule['dxfId'])) {
+                $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
+            }
+
             $conditionalStyles[] = $objConditional;
         }
 
         return $conditionalStyles;
     }
+
+    /**
+     * @param SimpleXMLElement|stdClass $cfRule
+     */
+    private function readDataBarOfConditionalRule($cfRule, array $conditionalFormattingRuleExtensions): ConditionalDataBar
+    {
+        $dataBar = new ConditionalDataBar();
+        //dataBar attribute
+        if (isset($cfRule->dataBar['showValue'])) {
+            $dataBar->setShowValue((bool) $cfRule->dataBar['showValue']);
+        }
+
+        //dataBar children
+        //conditionalFormatValueObjects
+        $cfvoXml = $cfRule->dataBar->cfvo;
+        $cfvoIndex = 0;
+        foreach ((count($cfvoXml) > 1 ? $cfvoXml : [$cfvoXml]) as $cfvo) {
+            if ($cfvoIndex === 0) {
+                $dataBar->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
+            }
+            if ($cfvoIndex === 1) {
+                $dataBar->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
+            }
+            ++$cfvoIndex;
+        }
+
+        //color
+        if (isset($cfRule->dataBar->color)) {
+            $dataBar->setColor((string) $cfRule->dataBar->color['rgb']);
+        }
+        //extLst
+        $this->readDataBarExtLstOfConditionalRule($dataBar, $cfRule, $conditionalFormattingRuleExtensions);
+
+        return $dataBar;
+    }
+
+    /**
+     * @param SimpleXMLElement|stdClass $cfRule
+     */
+    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $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) {
+                $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
index 4bb441292..210c322f9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
@@ -4,24 +4,39 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 
 class DataValidations
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var SimpleXMLElement */
     private $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml)
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
     {
         $this->worksheet = $workSheet;
         $this->worksheetXml = $worksheetXml;
     }
 
-    public function load()
+    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);
@@ -33,16 +48,18 @@ class DataValidations
                     $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
index 400b27252..7d48c7967 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
@@ -3,12 +3,16 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 
 class Hyperlinks
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var array */
     private $hyperlinks = [];
 
     public function __construct(Worksheet $workSheet)
@@ -16,42 +20,46 @@ class Hyperlinks
         $this->worksheet = $workSheet;
     }
 
-    public function readHyperlinks(\SimpleXMLElement $relsWorksheet)
+    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)
+    public function setHyperlinks(SimpleXMLElement $worksheetXml): void
     {
-        foreach ($worksheetXml->hyperlink as $hyperlink) {
-            $this->setHyperlink($hyperlink, $this->worksheet);
+        foreach ($worksheetXml->children(Namespaces::MAIN)->hyperlink as $hyperlink) {
+            if ($hyperlink !== null) {
+                $this->setHyperlink($hyperlink, $this->worksheet);
+            }
         }
     }
 
-    private function setHyperlink(\SimpleXMLElement $hyperlink, Worksheet $worksheet)
+    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']];
-                if (isset($hyperlink['location'])) {
-                    $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
+                $hyperlinkUrl = $this->hyperlinks[(string) $linkRel['id']] ?? null;
+                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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
new file mode 100644
index 000000000..fa3e57e7b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
@@ -0,0 +1,118 @@
+<?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_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';
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index 6f286769c..ab5754884 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -4,34 +4,38 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 
 class PageSetup extends BaseParserClass
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml = null)
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
         $this->worksheet = $workSheet;
         $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;
     }
 
-    private function margins(\SimpleXMLElement $xmlSheet, Worksheet $worksheet)
+    private function margins(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
     {
         if ($xmlSheet->pageMargins) {
             $docPageMargins = $worksheet->getPageMargins();
@@ -44,7 +48,7 @@ class PageSetup extends BaseParserClass
         }
     }
 
-    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();
@@ -64,45 +68,62 @@ class PageSetup extends BaseParserClass
             if (isset($xmlSheet->pageSetup['fitToWidth']) && (int) ($xmlSheet->pageSetup['fitToWidth']) >= 0) {
                 $docPageSetup->setFitToWidth((int) ($xmlSheet->pageSetup['fitToWidth']), false);
             }
-            if (isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber']) &&
-                self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])) {
+            if (
+                isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber']) &&
+                self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])
+            ) {
                 $docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
             }
+            if (isset($xmlSheet->pageSetup['pageOrder'])) {
+                $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 (substr($relid, -2) !== 'ps') {
+                    $relid .= 'ps';
+                }
+                $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'] = $relid;
             }
         }
 
         return $unparsedLoadedData;
     }
 
-    private function headerFooter(\SimpleXMLElement $xmlSheet, Worksheet $worksheet)
+    private function headerFooter(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
     {
         if ($xmlSheet->headerFooter) {
             $docHeaderFooter = $worksheet->getHeaderFooter();
 
-            if (isset($xmlSheet->headerFooter['differentOddEven']) &&
-                self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])) {
+            if (
+                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'])) {
+            if (
+                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'])) {
+            if (
+                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'])) {
+            if (
+                isset($xmlSheet->headerFooter['alignWithMargins']) &&
+                !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])
+            ) {
                 $docHeaderFooter->setAlignWithMargins(false);
             } else {
                 $docHeaderFooter->setAlignWithMargins(true);
@@ -117,7 +138,7 @@ class PageSetup extends BaseParserClass
         }
     }
 
-    private function pageBreaks(\SimpleXMLElement $xmlSheet, Worksheet $worksheet)
+    private function pageBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
     {
         if ($xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk) {
             $this->rowBreaks($xmlSheet, $worksheet);
@@ -127,16 +148,17 @@ class PageSetup extends BaseParserClass
         }
     }
 
-    private function rowBreaks(\SimpleXMLElement $xmlSheet, Worksheet $worksheet)
+    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);
             }
         }
     }
 
-    private function columnBreaks(\SimpleXMLElement $xmlSheet, Worksheet $worksheet)
+    private function columnBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
     {
         foreach ($xmlSheet->colBreaks->brk as $brk) {
             if ($brk['man']) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
index bf8e57d80..0d4701afa 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
@@ -5,11 +5,14 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Settings;
+use SimpleXMLElement;
 
 class Properties
 {
+    /** @var XmlScanner */
     private $securityScanner;
 
+    /** @var DocumentProperties */
     private $docProps;
 
     public function __construct(XmlScanner $securityScanner, DocumentProperties $docProps)
@@ -18,28 +21,39 @@ class Properties
         $this->docProps = $docProps;
     }
 
-    private function extractPropertyData($propertyData)
+    /**
+     * @param mixed $obj
+     */
+    private static function nullOrSimple($obj): ?SimpleXMLElement
     {
-        return simplexml_load_string(
+        return ($obj instanceof SimpleXMLElement) ? $obj : null;
+    }
+
+    private function extractPropertyData(string $propertyData): ?SimpleXMLElement
+    {
+        // okay to omit namespace because everything will be processed by xpath
+        $obj = simplexml_load_string(
             $this->securityScanner->scan($propertyData),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
         );
+
+        return self::nullOrSimple($obj);
     }
 
-    public function readCoreProperties($propertyData)
+    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');
+            $xmlCore->registerXPathNamespace('dc', Namespaces::DC_ELEMENTS);
+            $xmlCore->registerXPathNamespace('dcterms', Namespaces::DC_TERMS);
+            $xmlCore->registerXPathNamespace('cp', Namespaces::CORE_PROPERTIES2);
 
             $this->docProps->setCreator((string) self::getArrayItem($xmlCore->xpath('dc:creator')));
             $this->docProps->setLastModifiedBy((string) self::getArrayItem($xmlCore->xpath('cp:lastModifiedBy')));
-            $this->docProps->setCreated(strtotime(self::getArrayItem($xmlCore->xpath('dcterms:created')))); //! respect xsi:type
-            $this->docProps->setModified(strtotime(self::getArrayItem($xmlCore->xpath('dcterms:modified')))); //! respect xsi:type
+            $this->docProps->setCreated((string) self::getArrayItem($xmlCore->xpath('dcterms:created'))); //! respect xsi:type
+            $this->docProps->setModified((string) self::getArrayItem($xmlCore->xpath('dcterms: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')));
@@ -48,7 +62,7 @@ class Properties
         }
     }
 
-    public function readExtendedProperties($propertyData)
+    public function readExtendedProperties(string $propertyData): void
     {
         $xmlCore = $this->extractPropertyData($propertyData);
 
@@ -59,16 +73,19 @@ class Properties
             if (isset($xmlCore->Manager)) {
                 $this->docProps->setManager((string) $xmlCore->Manager);
             }
+            if (isset($xmlCore->HyperlinkBase)) {
+                $this->docProps->setHyperlinkBase((string) $xmlCore->HyperlinkBase);
+            }
         }
     }
 
-    public function readCustomProperties($propertyData)
+    public function readCustomProperties(string $propertyData): void
     {
         $xmlCore = $this->extractPropertyData($propertyData);
 
         if (is_object($xmlCore)) {
             foreach ($xmlCore as $xmlProperty) {
-                /** @var \SimpleXMLElement $xmlProperty */
+                /** @var SimpleXMLElement $xmlProperty */
                 $cellDataOfficeAttributes = $xmlProperty->attributes();
                 if (isset($cellDataOfficeAttributes['name'])) {
                     $propertyName = (string) $cellDataOfficeAttributes['name'];
@@ -84,8 +101,12 @@ class Properties
         }
     }
 
-    private static function getArrayItem(array $array, $key = 0)
+    /**
+     * @param null|array|false $array
+     * @param mixed $key
+     */
+    private static function getArrayItem($array, $key = 0): ?SimpleXMLElement
     {
-        return $array[$key] ?? null;
+        return is_array($array) ? ($array[$key] ?? null) : null;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php
new file mode 100644
index 000000000..fb7a39320
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
index eb61a5d30..5a496444f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -3,33 +3,34 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 
 class SheetViewOptions extends BaseParserClass
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, \SimpleXMLElement $worksheetXml = null)
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
         $this->worksheet = $workSheet;
         $this->worksheetXml = $worksheetXml;
     }
 
-    /**
-     * @param bool $readDataOnly
-     */
-    public function load($readDataOnly = false)
+    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)) {
@@ -41,32 +42,38 @@ class SheetViewOptions extends BaseParserClass
         }
     }
 
-    private function tabColor(\SimpleXMLElement $sheetPr)
+    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)
+    private function codeName(SimpleXMLElement $sheetPrx): void
     {
+        $sheetPr = $sheetPrx->attributes() ?? [];
         if (isset($sheetPr['codeName'])) {
             $this->worksheet->setCodeName((string) $sheetPr['codeName'], false);
         }
     }
 
-    private function outlines(\SimpleXMLElement $sheetPr)
+    private function outlines(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->outlinePr)) {
-            if (isset($sheetPr->outlinePr['summaryRight']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryRight'])) {
+            $attr = $sheetPr->outlinePr->attributes() ?? [];
+            if (
+                isset($attr['summaryRight']) &&
+                !self::boolean((string) $attr['summaryRight'])
+            ) {
                 $this->worksheet->setShowSummaryRight(false);
             } else {
                 $this->worksheet->setShowSummaryRight(true);
             }
 
-            if (isset($sheetPr->outlinePr['summaryBelow']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryBelow'])) {
+            if (
+                isset($attr['summaryBelow']) &&
+                !self::boolean((string) $attr['summaryBelow'])
+            ) {
                 $this->worksheet->setShowSummaryBelow(false);
             } else {
                 $this->worksheet->setShowSummaryBelow(true);
@@ -74,11 +81,14 @@ class SheetViewOptions extends BaseParserClass
         }
     }
 
-    private function pageSetup(\SimpleXMLElement $sheetPr)
+    private function pageSetup(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->pageSetUpPr)) {
-            if (isset($sheetPr->pageSetUpPr['fitToPage']) &&
-                !self::boolean((string) $sheetPr->pageSetUpPr['fitToPage'])) {
+            $attr = $sheetPr->pageSetUpPr->attributes() ?? [];
+            if (
+                isset($attr['fitToPage']) &&
+                !self::boolean((string) $attr['fitToPage'])
+            ) {
                 $this->worksheet->getPageSetup()->setFitToPage(false);
             } else {
                 $this->worksheet->getPageSetup()->setFitToPage(true);
@@ -86,11 +96,14 @@ class SheetViewOptions extends BaseParserClass
         }
     }
 
-    private function sheetFormat(\SimpleXMLElement $sheetFormatPr)
+    private function sheetFormat(SimpleXMLElement $sheetFormatPrx): void
     {
-        if (isset($sheetFormatPr['customHeight']) &&
+        $sheetFormatPr = $sheetFormatPrx->attributes() ?? [];
+        if (
+            isset($sheetFormatPr['customHeight']) &&
             self::boolean((string) $sheetFormatPr['customHeight']) &&
-            isset($sheetFormatPr['defaultRowHeight'])) {
+            isset($sheetFormatPr['defaultRowHeight'])
+        ) {
             $this->worksheet->getDefaultRowDimension()
                 ->setRowHeight((float) $sheetFormatPr['defaultRowHeight']);
         }
@@ -100,24 +113,27 @@ class SheetViewOptions extends BaseParserClass
                 ->setWidth((float) $sheetFormatPr['defaultColWidth']);
         }
 
-        if (isset($sheetFormatPr['zeroHeight']) &&
-            ((string) $sheetFormatPr['zeroHeight'] === '1')) {
+        if (
+            isset($sheetFormatPr['zeroHeight']) &&
+            ((string) $sheetFormatPr['zeroHeight'] === '1')
+        ) {
             $this->worksheet->getDefaultRowDimension()->setZeroHeight(true);
         }
     }
 
-    private function printOptions(\SimpleXMLElement $printOptions)
+    private function printOptions(SimpleXMLElement $printOptionsx): void
     {
-        if (self::boolean((string) $printOptions['gridLinesSet'])) {
+        $printOptions = $printOptionsx->attributes() ?? [];
+        if (isset($printOptions['gridLinesSet']) && self::boolean((string) $printOptions['gridLinesSet'])) {
             $this->worksheet->setShowGridlines(true);
         }
-        if (self::boolean((string) $printOptions['gridLines'])) {
+        if (isset($printOptions['gridLines']) && self::boolean((string) $printOptions['gridLines'])) {
             $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
index 88c01ead3..b2bc99f05 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
@@ -3,22 +3,31 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 
 class SheetViews extends BaseParserClass
 {
+    /** @var SimpleXMLElement */
     private $sheetViewXml;
 
+    /** @var SimpleXMLElement */
+    private $sheetViewAttributes;
+
+    /** @var Worksheet */
     private $worksheet;
 
-    public function __construct(\SimpleXMLElement $sheetViewXml, Worksheet $workSheet)
+    public function __construct(SimpleXMLElement $sheetViewXml, Worksheet $workSheet)
     {
         $this->sheetViewXml = $sheetViewXml;
+        $this->sheetViewAttributes = Xlsx::testSimpleXml($sheetViewXml->attributes());
         $this->worksheet = $workSheet;
     }
 
-    public function load()
+    public function load(): void
     {
+        $this->topLeft();
         $this->zoomScale();
         $this->view();
         $this->gridLines();
@@ -29,15 +38,15 @@ class SheetViews extends BaseParserClass
         if (isset($this->sheetViewXml->pane)) {
             $this->pane();
         }
-        if (isset($this->sheetViewXml->selection, $this->sheetViewXml->selection['sqref'])) {
+        if (isset($this->sheetViewXml->selection, $this->sheetViewXml->selection->attributes()->sqref)) {
             $this->selection();
         }
     }
 
-    private function zoomScale()
+    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
@@ -47,8 +56,8 @@ class SheetViews extends BaseParserClass
             $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
@@ -59,65 +68,73 @@ class SheetViews extends BaseParserClass
         }
     }
 
-    private function view()
+    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 gridLines()
+    private function topLeft(): void
     {
-        if (isset($this->sheetViewXml['showGridLines'])) {
+        if (isset($this->sheetViewAttributes->topLeftCell)) {
+            $this->worksheet->setTopLeftCell($this->sheetViewAttributes->topLeftCell);
+        }
+    }
+
+    private function gridLines(): void
+    {
+        if (isset($this->sheetViewAttributes->showGridLines)) {
             $this->worksheet->setShowGridLines(
-                self::boolean((string) $this->sheetViewXml['showGridLines'])
+                self::boolean((string) $this->sheetViewAttributes->showGridLines)
             );
         }
     }
 
-    private function headers()
+    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()
+    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()
+    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)
             );
         }
     }
 
-    private function pane()
+    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);
         }
 
-        if (isset($this->sheetViewXml->pane['ySplit'])) {
-            $ySplit = (int) ($this->sheetViewXml->pane['ySplit']);
+        if (isset($paneAttributes->ySplit)) {
+            $ySplit = (int) ($paneAttributes->ySplit);
         }
 
-        if (isset($this->sheetViewXml->pane['topLeftCell'])) {
-            $topLeftCell = (string) $this->sheetViewXml->pane['topLeftCell'];
+        if (isset($paneAttributes->topLeftCell)) {
+            $topLeftCell = (string) $paneAttributes->topLeftCell;
         }
 
         $this->worksheet->freezePane(
@@ -126,12 +143,14 @@ class SheetViews extends BaseParserClass
         );
     }
 
-    private function selection()
+    private function selection(): void
     {
-        $sqref = (string) $this->sheetViewXml->selection['sqref'];
-        $sqref = explode(' ', $sqref);
-        $sqref = $sqref[0];
-
-        $this->worksheet->setSelectedCells($sqref);
+        $attributes = $this->sheetViewXml->selection->attributes();
+        if ($attributes !== null) {
+            $sqref = (string) $attributes->sqref;
+            $sqref = explode(' ', $sqref);
+            $sqref = $sqref[0];
+            $this->worksheet->setSelectedCells($sqref);
+        }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
index 40106258c..5a360fda1 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
+++ b/libraries/phpspreadsheet/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;
@@ -11,194 +12,342 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
+use SimpleXMLElement;
+use stdClass;
 
 class Styles extends BaseParserClass
 {
     /**
      * Theme instance.
      *
-     * @var Theme
+     * @var ?Theme
      */
-    private static $theme = null;
+    private $theme;
 
+    /** @var array */
+    private $workbookPalette = [];
+
+    /** @var array */
     private $styles = [];
 
+    /** @var array */
     private $cellStyles = [];
 
+    /** @var SimpleXMLElement */
     private $styleXml;
 
-    public function __construct(\SimpleXMLElement $styleXml)
+    /** @var string */
+    private $namespace = '';
+
+    public function setNamespace(string $namespace): void
+    {
+        $this->namespace = $namespace;
+    }
+
+    public function setWorkbookPalette(array $palette): void
+    {
+        $this->workbookPalette = $palette;
+    }
+
+    /**
+     * Cast SimpleXMLElement to bool to overcome Scrutinizer problem.
+     *
+     * @param mixed $value
+     */
+    private static function castBool($value): bool
+    {
+        return (bool) $value;
+    }
+
+    private function getStyleAttributes(SimpleXMLElement $value): SimpleXMLElement
+    {
+        $attr = null;
+        if (self::castBool($value)) {
+            $attr = $value->attributes('');
+            if ($attr === null || count($attr) === 0) {
+                $attr = $value->attributes($this->namespace);
+            }
+        }
+
+        return Xlsx::testSimpleXml($attr);
+    }
+
+    public function setStyleXml(SimpleXmlElement $styleXml): void
     {
         $this->styleXml = $styleXml;
     }
 
-    public function setStyleBaseData(Theme $theme = null, $styles = [], $cellStyles = [])
+    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;
     }
 
-    private static function readFontStyle(Font $fontStyle, \SimpleXMLElement $fontStyleXml)
+    public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml): void
     {
-        $fontStyle->setName((string) $fontStyleXml->name['val']);
-        $fontStyle->setSize((float) $fontStyleXml->sz['val']);
-
+        if (isset($fontStyleXml->name)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->name);
+            if (isset($attr['val'])) {
+                $fontStyle->setName((string) $attr['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);
-            }
-            if ($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)
+    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']));
         }
     }
 
-    private static function readFillStyle(Fill $fillStyle, \SimpleXMLElement $fillStyleXml)
+    public function readFillStyle(Fill $fillStyle, SimpleXMLElement $fillStyleXml): void
     {
         if ($fillStyleXml->gradientFill) {
-            /** @var \SimpleXMLElement $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));
+            $fillStyle->getEndColor()->setARGB($this->readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color));
         } elseif ($fillStyleXml->patternFill) {
-            $patternType = (string) $fillStyleXml->patternFill['patternType'] != '' ? (string) $fillStyleXml->patternFill['patternType'] : 'solid';
-            $fillStyle->setFillType($patternType);
+            $defaultFillStyle = Fill::FILL_NONE;
             if ($fillStyleXml->patternFill->fgColor) {
-                $fillStyle->getStartColor()->setARGB(self::readColor($fillStyleXml->patternFill->fgColor, true));
-            } else {
-                $fillStyle->getStartColor()->setARGB('FF000000');
+                $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;
             }
+
+            $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);
         }
     }
 
-    private static function readBorderStyle(Borders $borderStyle, \SimpleXMLElement $borderStyleXml)
+    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 static function readBorder(Border $border, \SimpleXMLElement $borderXml)
+    private function getAttribute(SimpleXMLElement $xml, string $attribute): string
     {
-        if (isset($borderXml['style'])) {
-            $border->setBorderStyle((string) $borderXml['style']);
+        $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 function readBorder(Border $border, SimpleXMLElement $borderXml): void
+    {
+        $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));
         }
     }
 
-    private static function readAlignmentStyle(Alignment $alignment, \SimpleXMLElement $alignmentXml)
+    public function readAlignmentStyle(Alignment $alignment, SimpleXMLElement $alignmentXml): void
     {
-        $alignment->setHorizontal((string) $alignmentXml->alignment['horizontal']);
-        $alignment->setVertical((string) $alignmentXml->alignment['vertical']);
-
-        $textRotation = 0;
-        if ((int) $alignmentXml->alignment['textRotation'] <= 90) {
-            $textRotation = (int) $alignmentXml->alignment['textRotation'];
-        } elseif ((int) $alignmentXml->alignment['textRotation'] > 90) {
-            $textRotation = 90 - (int) $alignmentXml->alignment['textRotation'];
+        $horizontal = (string) $this->getAttribute($alignmentXml, 'horizontal');
+        if ($horizontal !== '') {
+            $alignment->setHorizontal($horizontal);
+        }
+        $vertical = (string) $this->getAttribute($alignmentXml, 'vertical');
+        if ($vertical !== '') {
+            $alignment->setVertical($vertical);
         }
 
-        $alignment->setTextRotation((int) $textRotation);
-        $alignment->setWrapText(self::boolean((string) $alignmentXml->alignment['wrapText']));
-        $alignment->setShrinkToFit(self::boolean((string) $alignmentXml->alignment['shrinkToFit']));
-        $alignment->setIndent((int) ((string) $alignmentXml->alignment['indent']) > 0 ? (int) ((string) $alignmentXml->alignment['indent']) : 0);
-        $alignment->setReadOrder((int) ((string) $alignmentXml->alignment['readingOrder']) > 0 ? (int) ((string) $alignmentXml->alignment['readingOrder']) : 0);
+        $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));
     }
 
-    private function readStyle(Style $docStyle, $style)
+    private static function formatGeneral(string $formatString): string
     {
-        if ($style->numFmt instanceof \SimpleXMLElement) {
-            self::readNumberFormat($docStyle->getNumberFormat(), $style->numFmt);
+        if ($formatString === 'GENERAL') {
+            $formatString = NumberFormat::FORMAT_GENERAL;
+        }
+
+        return $formatString;
+    }
+
+    /**
+     * Read style.
+     *
+     * @param SimpleXMLElement|stdClass $style
+     */
+    public function readStyle(Style $docStyle, $style): void
+    {
+        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)) {
-            $this->readProtectionLocked($docStyle, $style);
-            $this->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);
         }
     }
 
-    private function readProtectionLocked(Style $docStyle, $style)
+    /**
+     * 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);
@@ -206,10 +355,22 @@ class Styles extends BaseParserClass
         }
     }
 
-    private function readProtectionHidden(Style $docStyle, $style)
+    /**
+     * 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);
@@ -217,18 +378,26 @@ class Styles extends BaseParserClass
         }
     }
 
-    private 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;
@@ -238,7 +407,7 @@ class Styles extends BaseParserClass
         return ($background) ? 'FFFFFFFF' : 'FF000000';
     }
 
-    public function dxfs($readDataOnly = false)
+    public function dxfs(bool $readDataOnly = false): array
     {
         $dxfs = [];
         if (!$readDataOnly && $this->styleXml) {
@@ -252,7 +421,8 @@ class Styles extends BaseParserClass
             }
             //    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
@@ -269,13 +439,20 @@ class Styles extends BaseParserClass
         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)
+     *
+     * @return stdClass
+     */
+    private static function getArrayItem($array, int $key = 0)
     {
-        return $array[$key] ?? null;
+        return is_array($array) ? ($array[$key] ?? null) : null;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
new file mode 100644
index 000000000..cf89e995f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
@@ -0,0 +1,113 @@
+<?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
+{
+    /**
+     * @var Worksheet
+     */
+    private $worksheet;
+
+    /**
+     * @var SimpleXMLElement
+     */
+    private $tableXml;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $tableXml)
+    {
+        $this->worksheet = $workSheet;
+        $this->tableXml = $tableXml;
+    }
+
+    /**
+     * Loads Table into the Worksheet.
+     */
+    public function load(): void
+    {
+        // Remove all "$" in the table range
+        $tableRange = (string) preg_replace('/\$/', '', $this->tableXml['ref'] ?? '');
+        if (strpos($tableRange, ':') !== false) {
+            $this->readTable($tableRange, $this->tableXml);
+        }
+    }
+
+    /**
+     * Read Table from xml.
+     */
+    private function readTable(string $tableRange, SimpleXMLElement $tableXml): void
+    {
+        $table = new Table($tableRange);
+        $table->setName((string) $tableXml['displayName']);
+        $table->setShowHeaderRow((string) $tableXml['headerRowCount'] !== '0');
+        $table->setShowTotalsRow((string) $tableXml['totalsRowCount'] === '1');
+
+        $this->readTableAutoFilter($table, $tableXml->autoFilter);
+        $this->readTableColumns($table, $tableXml->tableColumns);
+        $this->readTableStyle($table, $tableXml->tableStyleInfo);
+
+        (new AutoFilter($table, $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) {
+            $column = $table->getColumnByOffset((int) $filterColumn['colId']);
+            $column->setShowFilterButton((string) $filterColumn['hiddenButton'] !== '1');
+        }
+    }
+
+    /**
+     * Reads TableColumns from xml.
+     */
+    private function readTableColumns(Table $table, SimpleXMLElement $tableColumnsXml): void
+    {
+        $offset = 0;
+        foreach ($tableColumnsXml->tableColumn as $tableColumn) {
+            $column = $table->getColumnByOffset($offset++);
+
+            if ($table->getShowTotalsRow()) {
+                if ($tableColumn['totalsRowLabel']) {
+                    $column->setTotalsRowLabel((string) $tableColumn['totalsRowLabel']);
+                }
+
+                if ($tableColumn['totalsRowFunction']) {
+                    $column->setTotalsRowFunction((string) $tableColumn['totalsRowFunction']);
+                }
+            }
+
+            if ($tableColumn->calculatedColumnFormula) {
+                $column->setColumnFormula((string) $tableColumn->calculatedColumnFormula);
+            }
+        }
+    }
+
+    /**
+     * Reads TableStyle from xml.
+     */
+    private function readTableStyle(Table $table, SimpleXMLElement $tableStyleInfoXml): void
+    {
+        $tableStyle = new TableStyle();
+        $tableStyle->setTheme((string) $tableStyleInfoXml['name']);
+        $tableStyle->setShowRowStripes((string) $tableStyleInfoXml['showRowStripes'] === '1');
+        $tableStyle->setShowColumnStripes((string) $tableStyleInfoXml['showColumnStripes'] === '1');
+        $tableStyle->setShowFirstColumn((string) $tableStyleInfoXml['showFirstColumn'] === '1');
+        $tableStyle->setShowLastColumn((string) $tableStyleInfoXml['showLastColumn'] === '1');
+        $table->setStyle($tableStyle);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
index c105f3c1a..706c4d193 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
@@ -21,16 +21,16 @@ class Theme
     /**
      * Colour Map.
      *
-     * @var array of string
+     * @var string[]
      */
     private $colourMap;
 
     /**
      * Create a new Theme.
      *
-     * @param mixed $themeName
-     * @param mixed $colourSchemeName
-     * @param mixed $colourMap
+     * @param string $themeName
+     * @param string $colourSchemeName
+     * @param string[] $colourMap
      */
     public function __construct($themeName, $colourSchemeName, $colourMap)
     {
@@ -41,9 +41,11 @@ class Theme
     }
 
     /**
-     * Get Theme Name.
+     * Not called by Reader, never accessible any other time.
      *
      * @return string
+     *
+     * @codeCoverageIgnore
      */
     public function getThemeName()
     {
@@ -51,9 +53,11 @@ class Theme
     }
 
     /**
-     * Get colour Scheme Name.
+     * Not called by Reader, never accessible any other time.
      *
      * @return string
+     *
+     * @codeCoverageIgnore
      */
     public function getColourSchemeName()
     {
@@ -63,31 +67,12 @@ class Theme
     /**
      * Get colour Map Value by Position.
      *
-     * @param mixed $index
+     * @param int $index
      *
-     * @return string
+     * @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()
-    {
-        $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
new file mode 100644
index 000000000..4743afbf9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class WorkbookView
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    /**
+     * @param mixed $mainNS
+     */
+    public function viewSettings(SimpleXMLElement $xmlWorkbook, $mainNS, array $mapSheetId, bool $readDataOnly): void
+    {
+        if ($this->spreadsheet->getSheetCount() == 0) {
+            $this->spreadsheet->createSheet();
+        }
+        // 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);
+        }
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function testSimpleXml($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
index b4fffa4fb..6be26fc2c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
@@ -2,19 +2,24 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use DateTime;
+use DateTimeZone;
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 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;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Style\Alignment;
-use PhpOffice\PhpSpreadsheet\Style\Border;
-use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 /**
@@ -22,6 +27,8 @@ use SimpleXMLElement;
  */
 class Xml extends BaseReader
 {
+    public const NAMESPACES_SS = 'urn:schemas-microsoft-com:office:spreadsheet';
+
     /**
      * Formats.
      *
@@ -29,13 +36,6 @@ class Xml extends BaseReader
      */
     protected $styles = [];
 
-    /**
-     * Character set used in the file.
-     *
-     * @var string
-     */
-    protected $charSet = 'UTF-8';
-
     /**
      * Create a new Excel2003XML Reader instance.
      */
@@ -45,16 +45,21 @@ class Xml extends BaseReader
         $this->securityScanner = XmlScanner::getInstance($this);
     }
 
+    /** @var string */
+    private $fileContents = '';
+
+    public static function xmlMappings(): array
+    {
+        return array_merge(
+            Style\Fill::FILL_MAPPINGS,
+            Style\Border::BORDER_MAPPINGS
+        );
+    }
+
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @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"
@@ -68,17 +73,14 @@ class Xml extends BaseReader
 
         $signature = [
             '<?xml version="1.0"',
-            '<?mso-application progid="Excel.Sheet"?>',
+            'xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet',
         ];
 
         // Open file
-        $this->openFile($pFilename);
-        $fileHandle = $this->fileHandle;
+        $data = file_get_contents($filename) ?: '';
 
-        // Read sample data (first 2 KB will do)
-        $data = fread($fileHandle, 2048);
-        fclose($fileHandle);
-        $data = str_replace("'", '"', $data); // fix headers with single quote
+        // Why?
+        //$data = str_replace("'", '"', $data); // fix headers with single quote
 
         $valid = true;
         foreach ($signature as $match) {
@@ -91,9 +93,14 @@ class Xml extends BaseReader
         }
 
         //    Retrieve charset encoding
-        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
-            $this->charSet = strtoupper($matches[1]);
+        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $data, $matches)) {
+            $charSet = strtoupper($matches[1]);
+            if (preg_match('/^ISO-8859-\d[\dL]?$/i', $charSet) === 1) {
+                $data = StringHelper::convertEncoding($data, 'UTF-8', $charSet);
+                $data = (string) preg_replace('/(<?xml.*encoding=[\'"]).*?([\'"].*?>)/um', '$1' . 'UTF-8' . '$2', $data, 1);
+            }
         }
+        $this->fileContents = $data;
 
         return $valid;
     }
@@ -101,23 +108,22 @@ class Xml extends BaseReader
     /**
      * Check if the file is a valid SimpleXML.
      *
-     * @param string $pFilename
+     * @param string $filename
      *
-     * @throws Exception
-     *
-     * @return false|\SimpleXMLElement
+     * @return false|SimpleXMLElement
      */
-    public function trySimpleXMLLoadString($pFilename)
+    public function trySimpleXMLLoadString($filename)
     {
         try {
             $xml = simplexml_load_string(
-                $this->securityScanner->scan(file_get_contents($pFilename)),
+                $this->getSecurityScannerOrThrow()->scan($this->fileContents ?: file_get_contents($filename)),
                 'SimpleXMLElement',
                 Settings::getLibXmlLoaderOptions()
             );
         } catch (\Exception $e) {
-            throw new Exception('Cannot load invalid XML file: ' . $pFilename, 0, $e);
+            throw new Exception('Cannot load invalid XML file: ' . $filename, 0, $e);
         }
+        $this->fileContents = '';
 
         return $xml;
     }
@@ -125,29 +131,28 @@ class Xml extends BaseReader
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames($filename)
     {
-        File::assertFile($pFilename);
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
         }
 
         $worksheetNames = [];
 
-        $xml = $this->trySimpleXMLLoadString($pFilename);
+        $xml = $this->trySimpleXMLLoadString($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 = $worksheet->attributes($namespaces['ss']);
-            $worksheetNames[] = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
+            $worksheetNames[] = (string) $worksheet_ss['Name'];
         }
 
         return $worksheetNames;
@@ -156,26 +161,28 @@ class Xml extends BaseReader
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param string $filename
      *
      * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($filename)
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        }
 
         $worksheetInfo = [];
 
-        $xml = $this->trySimpleXMLLoadString($pFilename);
-
-        $namespaces = $xml->getNamespaces(true);
+        $xml = $this->trySimpleXMLLoadString($filename);
+        if ($xml === false) {
+            throw new Exception("Problem reading {$filename}");
+        }
 
         $worksheetID = 1;
-        $xml_ss = $xml->children($namespaces['ss']);
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
         foreach ($xml_ss->Worksheet as $worksheet) {
-            $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
 
             $tmpInfo = [];
             $tmpInfo['worksheetName'] = '';
@@ -184,10 +191,9 @@ class Xml extends BaseReader
             $tmpInfo['totalRows'] = 0;
             $tmpInfo['totalColumns'] = 0;
 
+            $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
             if (isset($worksheet_ss['Name'])) {
                 $tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
-            } else {
-                $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
             }
 
             if (isset($worksheet->Table->Row)) {
@@ -225,221 +231,138 @@ class Xml extends BaseReader
     }
 
     /**
-     * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @throws Exception
-     *
-     * @return Spreadsheet
+     * Loads Spreadsheet from string.
      */
-    public function load($pFilename)
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
         $spreadsheet->removeSheetByIndex(0);
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadIntoExisting($contents, $spreadsheet, true);
     }
 
-    private static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
+    /**
+     * Loads Spreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
-        $styleAttributeValue = strtolower($styleAttributeValue);
-        foreach ($styleList as $style) {
-            if ($styleAttributeValue == strtolower($style)) {
-                $styleAttributeValue = $style;
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
 
-                return true;
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads from file or contents into Spreadsheet instance.
+     *
+     * @param string $filename file name if useContents is false else file contents
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet, bool $useContents = false): Spreadsheet
+    {
+        if ($useContents) {
+            $this->fileContents = $filename;
+        } else {
+            File::assertFile($filename);
+            if (!$this->canRead($filename)) {
+                throw new Exception($filename . ' is an Invalid Spreadsheet file.');
             }
         }
 
-        return false;
-    }
-
-    /**
-     * pixel units to excel width units(units of 1/256th of a character width).
-     *
-     * @param float $pxs
-     *
-     * @return float
-     */
-    protected static function pixel2WidthUnits($pxs)
-    {
-        $UNIT_OFFSET_MAP = [0, 36, 73, 109, 146, 182, 219];
-
-        $widthUnits = 256 * ($pxs / 7);
-        $widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
-
-        return $widthUnits;
-    }
-
-    /**
-     * excel width units(units of 1/256th of a character width) to pixel units.
-     *
-     * @param float $widthUnits
-     *
-     * @return float
-     */
-    protected static function widthUnits2Pixel($widthUnits)
-    {
-        $pixels = ($widthUnits / 256) * 7;
-        $offsetWidthUnits = $widthUnits % 256;
-
-        return $pixels + round($offsetWidthUnits / (256 / 7));
-    }
-
-    protected static function hex2str($hex)
-    {
-        return chr(hexdec($hex[1]));
-    }
-
-    /**
-     * Loads from file into Spreadsheet instance.
-     *
-     * @param string $pFilename
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws Exception
-     *
-     * @return Spreadsheet
-     */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
-    {
-        File::assertFile($pFilename);
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+        $xml = $this->trySimpleXMLLoadString($filename);
+        if ($xml === false) {
+            throw new Exception("Problem reading {$filename}");
         }
 
-        $xml = $this->trySimpleXMLLoadString($pFilename);
-
         $namespaces = $xml->getNamespaces(true);
 
-        $docProps = $spreadsheet->getProperties();
-        if (isset($xml->DocumentProperties[0])) {
-            foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
-                switch ($propertyName) {
-                    case 'Title':
-                        $docProps->setTitle(self::convertStringEncoding($propertyValue, $this->charSet));
+        (new Properties($spreadsheet))->readProperties($xml, $namespaces);
 
-                        break;
-                    case 'Subject':
-                        $docProps->setSubject(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Author':
-                        $docProps->setCreator(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Created':
-                        $creationDate = strtotime($propertyValue);
-                        $docProps->setCreated($creationDate);
-
-                        break;
-                    case 'LastAuthor':
-                        $docProps->setLastModifiedBy(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'LastSaved':
-                        $lastSaveDate = strtotime($propertyValue);
-                        $docProps->setModified($lastSaveDate);
-
-                        break;
-                    case 'Company':
-                        $docProps->setCompany(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Category':
-                        $docProps->setCategory(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Manager':
-                        $docProps->setManager(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Keywords':
-                        $docProps->setKeywords(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                    case 'Description':
-                        $docProps->setDescription(self::convertStringEncoding($propertyValue, $this->charSet));
-
-                        break;
-                }
-            }
+        $this->styles = (new Style())->parseStyles($xml, $namespaces);
+        if (isset($this->styles['Default'])) {
+            $spreadsheet->getCellXfCollection()[0]->applyFromArray($this->styles['Default']);
         }
-        if (isset($xml->CustomDocumentProperties)) {
-            foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
-                $propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-                $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', ['self', 'hex2str'], $propertyName);
-                $propertyType = Properties::PROPERTY_TYPE_UNKNOWN;
-                switch ((string) $propertyAttributes) {
-                    case 'string':
-                        $propertyType = Properties::PROPERTY_TYPE_STRING;
-                        $propertyValue = trim($propertyValue);
-
-                        break;
-                    case 'boolean':
-                        $propertyType = Properties::PROPERTY_TYPE_BOOLEAN;
-                        $propertyValue = (bool) $propertyValue;
-
-                        break;
-                    case 'integer':
-                        $propertyType = Properties::PROPERTY_TYPE_INTEGER;
-                        $propertyValue = (int) $propertyValue;
-
-                        break;
-                    case 'float':
-                        $propertyType = Properties::PROPERTY_TYPE_FLOAT;
-                        $propertyValue = (float) $propertyValue;
-
-                        break;
-                    case 'dateTime.tz':
-                        $propertyType = Properties::PROPERTY_TYPE_DATE;
-                        $propertyValue = strtotime(trim($propertyValue));
-
-                        break;
-                }
-                $docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
-            }
-        }
-
-        $this->parseStyles($xml, $namespaces);
 
         $worksheetID = 0;
-        $xml_ss = $xml->children($namespaces['ss']);
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
 
-        foreach ($xml_ss->Worksheet as $worksheet) {
-            $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+        /** @var null|SimpleXMLElement $worksheetx */
+        foreach ($xml_ss->Worksheet as $worksheetx) {
+            $worksheet = $worksheetx ?? new SimpleXMLElement('<xml></xml>');
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
 
-            if ((isset($this->loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))) {
+            if (
+                isset($this->loadSheetsOnly, $worksheet_ss['Name']) &&
+                (!in_array($worksheet_ss['Name'], /** @scrutinizer ignore-type */ $this->loadSheetsOnly))
+            ) {
                 continue;
             }
 
             // Create new Worksheet
             $spreadsheet->createSheet();
             $spreadsheet->setActiveSheetIndex($worksheetID);
+            $worksheetName = '';
             if (isset($worksheet_ss['Name'])) {
-                $worksheetName = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+                $worksheetName = (string) $worksheet_ss['Name'];
                 //    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
                 $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, self::NAMESPACES_SS);
+                    $name = (string) $definedName_ss['Name'];
+                    $definedValue = (string) $definedName_ss['RefersTo'];
+                    $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                    if ($convertedValue[0] === '=') {
+                        $convertedValue = substr($convertedValue, 1);
+                    }
+                    $spreadsheet->addDefinedName(DefinedName::createInstance($name, $spreadsheet->getActiveSheet(), $convertedValue, true));
+                }
+            }
 
             $columnID = 'A';
             if (isset($worksheet->Table->Column)) {
                 foreach ($worksheet->Table->Column as $columnData) {
-                    $columnData_ss = $columnData->attributes($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;
+                    }
                 }
             }
 
@@ -448,14 +371,18 @@ class Xml extends BaseReader
                 $additionalMergedCells = 0;
                 foreach ($worksheet->Table->Row as $rowData) {
                     $rowHasData = false;
-                    $row_ss = $rowData->attributes($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 = $cell->attributes($namespaces['ss']);
+                        $cell_ss = self::getAttributes($cell, self::NAMESPACES_SS);
                         if (isset($cell_ss['Index'])) {
                             $columnID = Coordinate::stringFromColumnIndex((int) $cell_ss['Index']);
                         }
@@ -470,33 +397,34 @@ class Xml extends BaseReader
                         }
 
                         if (isset($cell_ss['HRef'])) {
-                            $spreadsheet->getActiveSheet()->getCell($cellRange)->getHyperlink()->setUrl($cell_ss['HRef']);
+                            $spreadsheet->getActiveSheet()->getCell($cellRange)->getHyperlink()->setUrl((string) $cell_ss['HRef']);
                         }
 
                         if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
                             $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);
                         }
 
-                        $cellIsSet = $hasCalculatedValue = false;
+                        $hasCalculatedValue = false;
                         $cellDataFormula = '';
                         if (isset($cell_ss['Formula'])) {
                             $cellDataFormula = $cell_ss['Formula'];
                             $hasCalculatedValue = true;
                         }
                         if (isset($cell->Data)) {
-                            $cellValue = $cellData = $cell->Data;
+                            $cellData = $cell->Data;
+                            $cellValue = (string) $cellData;
                             $type = DataType::TYPE_NULL;
-                            $cellData_ss = $cellData->attributes($namespaces['ss']);
+                            $cellData_ss = self::getAttributes($cellData, self::NAMESPACES_SS);
                             if (isset($cellData_ss['Type'])) {
                                 $cellDataType = $cellData_ss['Type'];
                                 switch ($cellDataType) {
@@ -510,7 +438,6 @@ class Xml extends BaseReader
                                     const TYPE_ERROR        = 'e';
                                     */
                                     case 'String':
-                                        $cellValue = self::convertStringEncoding($cellValue, $this->charSet);
                                         $type = DataType::TYPE_STRING;
 
                                         break;
@@ -529,11 +456,13 @@ class Xml extends BaseReader
                                         break;
                                     case 'DateTime':
                                         $type = DataType::TYPE_NUMERIC;
-                                        $cellValue = Date::PHPToExcel(strtotime($cellValue));
+                                        $dateTime = new DateTime($cellValue, new DateTimeZone('UTC'));
+                                        $cellValue = Date::PHPToExcel($dateTime);
 
                                         break;
                                     case 'Error':
                                         $type = DataType::TYPE_ERROR;
+                                        $hasCalculatedValue = false;
 
                                         break;
                                 }
@@ -542,85 +471,28 @@ class Xml extends BaseReader
                             if ($hasCalculatedValue) {
                                 $type = DataType::TYPE_FORMULA;
                                 $columnNumber = Coordinate::columnIndexFromString($columnID);
-                                if (substr($cellDataFormula, 0, 3) == 'of:') {
-                                    $cellDataFormula = substr($cellDataFormula, 3);
-                                    $temp = explode('"', $cellDataFormula);
-                                    $key = false;
-                                    foreach ($temp as &$value) {
-                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
-                                        if ($key = !$key) {
-                                            $value = str_replace(['[.', '.', ']'], '', $value);
-                                        }
-                                    }
-                                } else {
-                                    //    Convert R1C1 style references to A1 style references (but only when not quoted)
-                                    $temp = explode('"', $cellDataFormula);
-                                    $key = false;
-                                    foreach ($temp as &$value) {
-                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
-                                        if ($key = !$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
-                                            //        the formula
-                                            $cellReferences = array_reverse($cellReferences);
-                                            //    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) {
-                                                $rowReference = $cellReference[2][0];
-                                                //    Empty R reference is the current row
-                                                if ($rowReference == '') {
-                                                    $rowReference = $rowID;
-                                                }
-                                                //    Bracketed R references are relative to the current row
-                                                if ($rowReference[0] == '[') {
-                                                    $rowReference = $rowID + trim($rowReference, '[]');
-                                                }
-                                                $columnReference = $cellReference[4][0];
-                                                //    Empty C reference is the current column
-                                                if ($columnReference == '') {
-                                                    $columnReference = $columnNumber;
-                                                }
-                                                //    Bracketed C references are relative to the current column
-                                                if ($columnReference[0] == '[') {
-                                                    $columnReference = $columnNumber + trim($columnReference, '[]');
-                                                }
-                                                $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
-                                                $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
-                                            }
-                                        }
-                                    }
-                                }
-                                unset($value);
-                                //    Then rebuild the formula string
-                                $cellDataFormula = implode('"', $temp);
+                                $cellDataFormula = AddressHelper::convertFormulaToA1($cellDataFormula, $rowID, $columnNumber);
                             }
 
                             $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
                             if ($hasCalculatedValue) {
                                 $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
                             }
-                            $cellIsSet = $rowHasData = true;
+                            $rowHasData = true;
                         }
 
                         if (isset($cell->Comment)) {
-                            $commentAttributes = $cell->Comment->attributes($namespaces['ss']);
-                            $author = 'unknown';
-                            if (isset($commentAttributes->Author)) {
-                                $author = (string) $commentAttributes->Author;
-                            }
-                            $node = $cell->Comment->Data->asXML();
-                            $annotation = strip_tags($node);
-                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                            $this->parseCellComment($cell->Comment, $spreadsheet, $columnID, $rowID);
                         }
 
-                        if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
+                        if (isset($cell_ss['StyleID'])) {
                             $style = (string) $cell_ss['StyleID'];
                             if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
-                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
-                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
-                                }
-                                $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
+                                //if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
+                                //    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
+                                //}
+                                $spreadsheet->getActiveSheet()->getStyle($cellRange)
+                                    ->applyFromArray($this->styles[$style]);
                             }
                         }
                         ++$columnID;
@@ -633,249 +505,124 @@ class Xml extends BaseReader
                     if ($rowHasData) {
                         if (isset($row_ss['Height'])) {
                             $rowHeight = $row_ss['Height'];
-                            $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
+                            $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setRowHeight((float) $rowHeight);
                         }
                     }
 
                     ++$rowID;
                 }
             }
+
+            $dataValidations = new Xml\DataValidations();
+            $dataValidations->loadDataValidations($worksheet, $spreadsheet);
+            $xmlX = $worksheet->children(Namespaces::URN_EXCEL);
+            if (isset($xmlX->WorksheetOptions)) {
+                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;
+                    }
+                    $spreadsheet->getActiveSheet()->freezePane(Coordinate::stringFromColumnIndex($freezeColumn) . (string) $freezeRow);
+                }
+                (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);
+                    }
+                }
+            }
             ++$worksheetID;
         }
 
+        // Globally scoped defined names
+        $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, self::NAMESPACES_SS);
+                $name = (string) $definedName_ss['Name'];
+                $definedValue = (string) $definedName_ss['RefersTo'];
+                $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                if ($convertedValue[0] === '=') {
+                    $convertedValue = substr($convertedValue, 1);
+                }
+                $spreadsheet->addDefinedName(DefinedName::createInstance($name, $activeWorksheet, $convertedValue));
+            }
+        }
+
         // Return
         return $spreadsheet;
     }
 
-    protected static function convertStringEncoding($string, $charset)
-    {
-        if ($charset != 'UTF-8') {
-            return StringHelper::convertEncoding($string, 'UTF-8', $charset);
+    protected function parseCellComment(
+        SimpleXMLElement $comment,
+        Spreadsheet $spreadsheet,
+        string $columnID,
+        int $rowID
+    ): void {
+        $commentAttributes = $comment->attributes(self::NAMESPACES_SS);
+        $author = 'unknown';
+        if (isset($commentAttributes->Author)) {
+            $author = (string) $commentAttributes->Author;
         }
 
-        return $string;
+        $node = $comment->Data->asXML();
+        $annotation = strip_tags((string) $node);
+        $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)
+            ->setAuthor($author)
+            ->setText($this->parseRichText($annotation));
     }
 
-    protected function parseRichText($is)
+    protected function parseRichText(string $annotation): RichText
     {
         $value = new RichText();
 
-        $value->createText(self::convertStringEncoding($is, $this->charSet));
+        $value->createText($annotation);
 
         return $value;
     }
 
-    /**
-     * @param SimpleXMLElement $xml
-     * @param array $namespaces
-     */
-    private function parseStyles(SimpleXMLElement $xml, array $namespaces)
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
     {
-        if (!isset($xml->Styles)) {
-            return;
-        }
-
-        foreach ($xml->Styles[0] as $style) {
-            $style_ss = $style->attributes($namespaces['ss']);
-            $styleID = (string) $style_ss['ID'];
-            $this->styles[$styleID] = (isset($this->styles['Default'])) ? $this->styles['Default'] : [];
-            foreach ($style as $styleType => $styleData) {
-                $styleAttributes = $styleData->attributes($namespaces['ss']);
-                switch ($styleType) {
-                    case 'Alignment':
-                        $this->parseStyleAlignment($styleID, $styleAttributes);
-
-                        break;
-                    case 'Borders':
-                        $this->parseStyleBorders($styleID, $styleData, $namespaces);
-
-                        break;
-                    case 'Font':
-                        $this->parseStyleFont($styleID, $styleAttributes);
-
-                        break;
-                    case 'Interior':
-                        $this->parseStyleInterior($styleID, $styleAttributes);
-
-                        break;
-                    case 'NumberFormat':
-                        $this->parseStyleNumberFormat($styleID, $styleAttributes);
-
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $styleID
-     * @param SimpleXMLElement $styleAttributes
-     */
-    private function parseStyleAlignment($styleID, SimpleXMLElement $styleAttributes)
-    {
-        $verticalAlignmentStyles = [
-            Alignment::VERTICAL_BOTTOM,
-            Alignment::VERTICAL_TOP,
-            Alignment::VERTICAL_CENTER,
-            Alignment::VERTICAL_JUSTIFY,
-        ];
-        $horizontalAlignmentStyles = [
-            Alignment::HORIZONTAL_GENERAL,
-            Alignment::HORIZONTAL_LEFT,
-            Alignment::HORIZONTAL_RIGHT,
-            Alignment::HORIZONTAL_CENTER,
-            Alignment::HORIZONTAL_CENTER_CONTINUOUS,
-            Alignment::HORIZONTAL_JUSTIFY,
-        ];
-
-        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-            $styleAttributeValue = (string) $styleAttributeValue;
-            switch ($styleAttributeKey) {
-                case 'Vertical':
-                    if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) {
-                        $this->styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
-                    }
-
-                    break;
-                case 'Horizontal':
-                    if (self::identifyFixedStyleValue($horizontalAlignmentStyles, $styleAttributeValue)) {
-                        $this->styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
-                    }
-
-                    break;
-                case 'WrapText':
-                    $this->styles[$styleID]['alignment']['wrapText'] = true;
-
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param $styleID
-     * @param SimpleXMLElement $styleData
-     * @param array $namespaces
-     */
-    private function parseStyleBorders($styleID, SimpleXMLElement $styleData, array $namespaces)
-    {
-        foreach ($styleData->Border as $borderStyle) {
-            $borderAttributes = $borderStyle->attributes($namespaces['ss']);
-            $thisBorder = [];
-            foreach ($borderAttributes as $borderStyleKey => $borderStyleValue) {
-                switch ($borderStyleKey) {
-                    case 'LineStyle':
-                        $thisBorder['borderStyle'] = Border::BORDER_MEDIUM;
-
-                        break;
-                    case 'Weight':
-                        break;
-                    case 'Position':
-                        $borderPosition = strtolower($borderStyleValue);
-
-                        break;
-                    case 'Color':
-                        $borderColour = substr($borderStyleValue, 1);
-                        $thisBorder['color']['rgb'] = $borderColour;
-
-                        break;
-                }
-            }
-            if (!empty($thisBorder)) {
-                if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
-                    $this->styles[$styleID]['borders'][$borderPosition] = $thisBorder;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param $styleID
-     * @param SimpleXMLElement $styleAttributes
-     */
-    private function parseStyleFont($styleID, SimpleXMLElement $styleAttributes)
-    {
-        $underlineStyles = [
-            Font::UNDERLINE_NONE,
-            Font::UNDERLINE_DOUBLE,
-            Font::UNDERLINE_DOUBLEACCOUNTING,
-            Font::UNDERLINE_SINGLE,
-            Font::UNDERLINE_SINGLEACCOUNTING,
-        ];
-
-        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-            $styleAttributeValue = (string) $styleAttributeValue;
-            switch ($styleAttributeKey) {
-                case 'FontName':
-                    $this->styles[$styleID]['font']['name'] = $styleAttributeValue;
-
-                    break;
-                case 'Size':
-                    $this->styles[$styleID]['font']['size'] = $styleAttributeValue;
-
-                    break;
-                case 'Color':
-                    $this->styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue, 1);
-
-                    break;
-                case 'Bold':
-                    $this->styles[$styleID]['font']['bold'] = true;
-
-                    break;
-                case 'Italic':
-                    $this->styles[$styleID]['font']['italic'] = true;
-
-                    break;
-                case 'Underline':
-                    if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
-                        $this->styles[$styleID]['font']['underline'] = $styleAttributeValue;
-                    }
-
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param $styleID
-     * @param SimpleXMLElement $styleAttributes
-     */
-    private function parseStyleInterior($styleID, SimpleXMLElement $styleAttributes)
-    {
-        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-            switch ($styleAttributeKey) {
-                case 'Color':
-                    $this->styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
-
-                    break;
-                case 'Pattern':
-                    $this->styles[$styleID]['fill']['fillType'] = strtolower($styleAttributeValue);
-
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param $styleID
-     * @param SimpleXMLElement $styleAttributes
-     */
-    private function parseStyleNumberFormat($styleID, SimpleXMLElement $styleAttributes)
-    {
-        $fromFormats = ['\-', '\ '];
-        $toFormats = ['-', ' '];
-
-        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-            $styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
-            switch ($styleAttributeValue) {
-                case 'Short Date':
-                    $styleAttributeValue = 'dd/mm/yyyy';
-
-                    break;
-            }
-
-            if ($styleAttributeValue > '') {
-                $this->styles[$styleID]['numberFormat']['formatCode'] = $styleAttributeValue;
-            }
-        }
+        return ($simple === null)
+            ? new SimpleXMLElement('<xml></xml>')
+            : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php
new file mode 100644
index 000000000..31748cb9c
--- /dev/null
+++ b/libraries/phpspreadsheet/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 = [$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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
new file mode 100644
index 000000000..137cabaf3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use SimpleXMLElement;
+use stdClass;
+
+class PageSettings
+{
+    /**
+     * @var stdClass
+     */
+    private $printSettings;
+
+    public function __construct(SimpleXMLElement $xmlX)
+    {
+        $printSettings = $this->pageSetup($xmlX, $this->getPrintDefaults());
+        $this->printSettings = $this->printSetup($xmlX, $printSettings);
+    }
+
+    public function loadPageSettings(Spreadsheet $spreadsheet): void
+    {
+        $spreadsheet->getActiveSheet()->getPageSetup()
+            ->setPaperSize($this->printSettings->paperSize)
+            ->setOrientation($this->printSettings->orientation)
+            ->setScale($this->printSettings->scale)
+            ->setVerticalCentered($this->printSettings->verticalCentered)
+            ->setHorizontalCentered($this->printSettings->horizontalCentered)
+            ->setPageOrder($this->printSettings->printOrder);
+        $spreadsheet->getActiveSheet()->getPageMargins()
+            ->setTop($this->printSettings->topMargin)
+            ->setHeader($this->printSettings->headerMargin)
+            ->setLeft($this->printSettings->leftMargin)
+            ->setRight($this->printSettings->rightMargin)
+            ->setBottom($this->printSettings->bottomMargin)
+            ->setFooter($this->printSettings->footerMargin);
+    }
+
+    private function getPrintDefaults(): stdClass
+    {
+        return (object) [
+            'paperSize' => 9,
+            'orientation' => PageSetup::ORIENTATION_DEFAULT,
+            'scale' => 100,
+            'horizontalCentered' => false,
+            'verticalCentered' => false,
+            'printOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            'topMargin' => 0.75,
+            'headerMargin' => 0.3,
+            'leftMargin' => 0.7,
+            'rightMargin' => 0.7,
+            'bottomMargin' => 0.75,
+            'footerMargin' => 0.3,
+        ];
+    }
+
+    private function pageSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->PageSetup)) {
+            foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
+                foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
+                    /** @scrutinizer ignore-call */
+                    $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;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->Print)) {
+            foreach ($xmlX->WorksheetOptions->Print as $printData) {
+                foreach ($printData as $printKey => $printValue) {
+                    switch ($printKey) {
+                        case 'LeftToRight':
+                            $printDefaults->printOrder = PageSetup::PAGEORDER_OVER_THEN_DOWN;
+
+                            break;
+                        case 'PaperSizeIndex':
+                            $printDefaults->paperSize = (int) $printValue ?: 9;
+
+                            break;
+                        case 'Scale':
+                            $printDefaults->scale = (int) $printValue ?: 100;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation ?? '') ?: PageSetup::ORIENTATION_PORTRAIT;
+        $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
+        $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
+    }
+
+    private function setMargins(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
+        $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
+        $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
+        $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
new file mode 100644
index 000000000..e216c254d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class Properties
+{
+    /**
+     * @var Spreadsheet
+     */
+    protected $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function readProperties(SimpleXMLElement $xml, array $namespaces): void
+    {
+        $this->readStandardProperties($xml);
+        $this->readCustomProperties($xml, $namespaces);
+    }
+
+    protected function readStandardProperties(SimpleXMLElement $xml): void
+    {
+        if (isset($xml->DocumentProperties[0])) {
+            $docProps = $this->spreadsheet->getProperties();
+
+            foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+                $propertyValue = (string) $propertyValue;
+
+                $this->processStandardProperty($docProps, $propertyName, $propertyValue);
+            }
+        }
+    }
+
+    protected function readCustomProperties(SimpleXMLElement $xml, array $namespaces): void
+    {
+        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 = (string) preg_replace_callback('/_x([0-9a-f]{4})_/i', [$this, 'hex2str'], $propertyName);
+
+                $this->processCustomProperty($docProps, $propertyName, $propertyValue, $propertyAttributes);
+            }
+        }
+    }
+
+    protected function processStandardProperty(
+        DocumentProperties $docProps,
+        string $propertyName,
+        string $stringValue
+    ): void {
+        switch ($propertyName) {
+            case 'Title':
+                $docProps->setTitle($stringValue);
+
+                break;
+            case 'Subject':
+                $docProps->setSubject($stringValue);
+
+                break;
+            case 'Author':
+                $docProps->setCreator($stringValue);
+
+                break;
+            case 'Created':
+                $docProps->setCreated($stringValue);
+
+                break;
+            case 'LastAuthor':
+                $docProps->setLastModifiedBy($stringValue);
+
+                break;
+            case 'LastSaved':
+                $docProps->setModified($stringValue);
+
+                break;
+            case 'Company':
+                $docProps->setCompany($stringValue);
+
+                break;
+            case 'Category':
+                $docProps->setCategory($stringValue);
+
+                break;
+            case 'Manager':
+                $docProps->setManager($stringValue);
+
+                break;
+            case 'HyperlinkBase':
+                $docProps->setHyperlinkBase($stringValue);
+
+                break;
+            case 'Keywords':
+                $docProps->setKeywords($stringValue);
+
+                break;
+            case 'Description':
+                $docProps->setDescription($stringValue);
+
+                break;
+        }
+    }
+
+    protected function processCustomProperty(
+        DocumentProperties $docProps,
+        string $propertyName,
+        ?SimpleXMLElement $propertyValue,
+        SimpleXMLElement $propertyAttributes
+    ): void {
+        switch ((string) $propertyAttributes) {
+            case 'boolean':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+                $propertyValue = (bool) (string) $propertyValue;
+
+                break;
+            case 'integer':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_INTEGER;
+                $propertyValue = (int) $propertyValue;
+
+                break;
+            case 'float':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_FLOAT;
+                $propertyValue = (float) $propertyValue;
+
+                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;
+        }
+
+        $docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
+    }
+
+    protected function hex2str(array $hex): string
+    {
+        return mb_chr((int) hexdec($hex[1]), 'UTF-8');
+    }
+
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
new file mode 100644
index 000000000..698acf6ac
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use SimpleXMLElement;
+
+class Style
+{
+    /**
+     * Formats.
+     *
+     * @var array
+     */
+    protected $styles = [];
+
+    public function parseStyles(SimpleXMLElement $xml, array $namespaces): array
+    {
+        if (!isset($xml->Styles) || !is_iterable($xml->Styles[0])) {
+            return [];
+        }
+
+        $alignmentStyleParser = new Style\Alignment();
+        $borderStyleParser = new Style\Border();
+        $fontStyleParser = new Style\Font();
+        $fillStyleParser = new Style\Fill();
+        $numberFormatStyleParser = new Style\NumberFormat();
+
+        foreach ($xml->Styles[0] 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 = $protection = [];
+
+            foreach ($style as $styleType => $styleDatax) {
+                $styleData = self::getSxml($styleDatax);
+                $styleAttributes = $styleData->attributes($namespaces['ss']);
+
+                switch ($styleType) {
+                    case 'Alignment':
+                        if ($styleAttributes) {
+                            $alignment = $alignmentStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Borders':
+                        $border = $borderStyleParser->parseStyle($styleData, $namespaces);
+
+                        break;
+                    case 'Font':
+                        if ($styleAttributes) {
+                            $font = $fontStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Interior':
+                        if ($styleAttributes) {
+                            $fill = $fillStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'NumberFormat':
+                        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, $protection);
+        }
+
+        return $this->styles;
+    }
+
+    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) ? $simple : new SimpleXMLElement('<xml></xml>');
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php
new file mode 100644
index 000000000..d1363548b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment as AlignmentStyles;
+use SimpleXMLElement;
+
+class Alignment extends StyleBase
+{
+    protected const VERTICAL_ALIGNMENT_STYLES = [
+        AlignmentStyles::VERTICAL_BOTTOM,
+        AlignmentStyles::VERTICAL_TOP,
+        AlignmentStyles::VERTICAL_CENTER,
+        AlignmentStyles::VERTICAL_JUSTIFY,
+    ];
+
+    protected const HORIZONTAL_ALIGNMENT_STYLES = [
+        AlignmentStyles::HORIZONTAL_GENERAL,
+        AlignmentStyles::HORIZONTAL_LEFT,
+        AlignmentStyles::HORIZONTAL_RIGHT,
+        AlignmentStyles::HORIZONTAL_CENTER,
+        AlignmentStyles::HORIZONTAL_CENTER_CONTINUOUS,
+        AlignmentStyles::HORIZONTAL_JUSTIFY,
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = (string) $styleAttributeValue;
+            switch ($styleAttributeKey) {
+                case 'Vertical':
+                    if (self::identifyFixedStyleValue(self::VERTICAL_ALIGNMENT_STYLES, $styleAttributeValue)) {
+                        $style['alignment']['vertical'] = $styleAttributeValue;
+                    }
+
+                    break;
+                case 'Horizontal':
+                    if (self::identifyFixedStyleValue(self::HORIZONTAL_ALIGNMENT_STYLES, $styleAttributeValue)) {
+                        $style['alignment']['horizontal'] = $styleAttributeValue;
+                    }
+
+                    break;
+                case 'WrapText':
+                    $style['alignment']['wrapText'] = true;
+
+                    break;
+                case 'Rotate':
+                    $style['alignment']['textRotation'] = $styleAttributeValue;
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
new file mode 100644
index 000000000..8aefd9c9e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Border as BorderStyle;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use SimpleXMLElement;
+
+class Border extends StyleBase
+{
+    protected const BORDER_POSITIONS = [
+        'top',
+        'left',
+        'bottom',
+        'right',
+    ];
+
+    /**
+     * @var array
+     */
+    public const BORDER_MAPPINGS = [
+        'borderStyle' => [
+            '1continuous' => BorderStyle::BORDER_THIN,
+            '1dash' => BorderStyle::BORDER_DASHED,
+            '1dashdot' => BorderStyle::BORDER_DASHDOT,
+            '1dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            '1dot' => BorderStyle::BORDER_DOTTED,
+            '1double' => BorderStyle::BORDER_DOUBLE,
+            '2continuous' => BorderStyle::BORDER_MEDIUM,
+            '2dash' => BorderStyle::BORDER_MEDIUMDASHED,
+            '2dashdot' => BorderStyle::BORDER_MEDIUMDASHDOT,
+            '2dashdotdot' => BorderStyle::BORDER_MEDIUMDASHDOTDOT,
+            '2dot' => BorderStyle::BORDER_DOTTED,
+            '2double' => BorderStyle::BORDER_DOUBLE,
+            '3continuous' => BorderStyle::BORDER_THICK,
+            '3dash' => BorderStyle::BORDER_MEDIUMDASHED,
+            '3dashdot' => BorderStyle::BORDER_MEDIUMDASHDOT,
+            '3dashdotdot' => BorderStyle::BORDER_MEDIUMDASHDOTDOT,
+            '3dot' => BorderStyle::BORDER_DOTTED,
+            '3double' => BorderStyle::BORDER_DOUBLE,
+        ],
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleData, array $namespaces): array
+    {
+        $style = [];
+
+        $diagonalDirection = '';
+        $borderPosition = '';
+        foreach ($styleData->Border as $borderStyle) {
+            $borderAttributes = self::getAttributes($borderStyle, $namespaces['ss']);
+            $thisBorder = [];
+            $styleType = (string) $borderAttributes->Weight;
+            $styleType .= strtolower((string) $borderAttributes->LineStyle);
+            $thisBorder['borderStyle'] = self::BORDER_MAPPINGS['borderStyle'][$styleType] ?? BorderStyle::BORDER_NONE;
+
+            foreach ($borderAttributes as $borderStyleKey => $borderStyleValuex) {
+                $borderStyleValue = (string) $borderStyleValuex;
+                switch ($borderStyleKey) {
+                    case 'Position':
+                        [$borderPosition, $diagonalDirection] =
+                            $this->parsePosition($borderStyleValue, $diagonalDirection);
+
+                        break;
+                    case 'Color':
+                        $borderColour = substr($borderStyleValue, 1);
+                        $thisBorder['color']['rgb'] = $borderColour;
+
+                        break;
+                }
+            }
+
+            if ($borderPosition) {
+                $style['borders'][$borderPosition] = $thisBorder;
+            } elseif ($diagonalDirection) {
+                $style['borders']['diagonalDirection'] = $diagonalDirection;
+                $style['borders']['diagonal'] = $thisBorder;
+            }
+        }
+
+        return $style;
+    }
+
+    protected function parsePosition(string $borderStyleValue, string $diagonalDirection): array
+    {
+        $borderStyleValue = strtolower($borderStyleValue);
+
+        if (in_array($borderStyleValue, self::BORDER_POSITIONS)) {
+            $borderPosition = $borderStyleValue;
+        } elseif ($borderStyleValue === 'diagonalleft') {
+            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_DOWN;
+        } elseif ($borderStyleValue === 'diagonalright') {
+            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_UP;
+        }
+
+        return [$borderPosition ?? null, $diagonalDirection];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php
new file mode 100644
index 000000000..9a6121525
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Fill as FillStyles;
+use SimpleXMLElement;
+
+class Fill extends StyleBase
+{
+    /**
+     * @var array
+     */
+    public const FILL_MAPPINGS = [
+        'fillType' => [
+            'solid' => FillStyles::FILL_SOLID,
+            'gray75' => FillStyles::FILL_PATTERN_DARKGRAY,
+            'gray50' => FillStyles::FILL_PATTERN_MEDIUMGRAY,
+            'gray25' => FillStyles::FILL_PATTERN_LIGHTGRAY,
+            'gray125' => FillStyles::FILL_PATTERN_GRAY125,
+            'gray0625' => FillStyles::FILL_PATTERN_GRAY0625,
+            'horzstripe' => FillStyles::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            'vertstripe' => FillStyles::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            'reversediagstripe' => FillStyles::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            'diagstripe' => FillStyles::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            'diagcross' => FillStyles::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            'thickdiagcross' => FillStyles::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            'thinhorzstripe' => FillStyles::FILL_PATTERN_LIGHTHORIZONTAL,
+            'thinvertstripe' => FillStyles::FILL_PATTERN_LIGHTVERTICAL,
+            'thinreversediagstripe' => FillStyles::FILL_PATTERN_LIGHTUP,
+            'thindiagstripe' => FillStyles::FILL_PATTERN_LIGHTDOWN,
+            'thinhorzcross' => FillStyles::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            'thindiagcross' => FillStyles::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValuex) {
+            $styleAttributeValue = (string) $styleAttributeValuex;
+            switch ($styleAttributeKey) {
+                case 'Color':
+                    $style['fill']['endColor']['rgb'] = substr($styleAttributeValue, 1);
+                    $style['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'PatternColor':
+                    $style['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'Pattern':
+                    $lcStyleAttributeValue = strtolower((string) $styleAttributeValue);
+                    $style['fill']['fillType']
+                        = self::FILL_MAPPINGS['fillType'][$lcStyleAttributeValue] ?? FillStyles::FILL_NONE;
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
new file mode 100644
index 000000000..5f824889a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Font as FontUnderline;
+use SimpleXMLElement;
+
+class Font extends StyleBase
+{
+    protected const UNDERLINE_STYLES = [
+        FontUnderline::UNDERLINE_NONE,
+        FontUnderline::UNDERLINE_DOUBLE,
+        FontUnderline::UNDERLINE_DOUBLEACCOUNTING,
+        FontUnderline::UNDERLINE_SINGLE,
+        FontUnderline::UNDERLINE_SINGLEACCOUNTING,
+    ];
+
+    protected function parseUnderline(array $style, string $styleAttributeValue): array
+    {
+        if (self::identifyFixedStyleValue(self::UNDERLINE_STYLES, $styleAttributeValue)) {
+            $style['font']['underline'] = $styleAttributeValue;
+        }
+
+        return $style;
+    }
+
+    protected function parseVerticalAlign(array $style, string $styleAttributeValue): array
+    {
+        if ($styleAttributeValue == 'Superscript') {
+            $style['font']['superscript'] = true;
+        }
+        if ($styleAttributeValue == 'Subscript') {
+            $style['font']['subscript'] = true;
+        }
+
+        return $style;
+    }
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = (string) $styleAttributeValue;
+            switch ($styleAttributeKey) {
+                case 'FontName':
+                    $style['font']['name'] = $styleAttributeValue;
+
+                    break;
+                case 'Size':
+                    $style['font']['size'] = $styleAttributeValue;
+
+                    break;
+                case 'Color':
+                    $style['font']['color']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'Bold':
+                    $style['font']['bold'] = $styleAttributeValue === '1';
+
+                    break;
+                case 'Italic':
+                    $style['font']['italic'] = $styleAttributeValue === '1';
+
+                    break;
+                case 'Underline':
+                    $style = $this->parseUnderline($style, $styleAttributeValue);
+
+                    break;
+                case 'VerticalAlign':
+                    $style = $this->parseVerticalAlign($style, $styleAttributeValue);
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php
new file mode 100644
index 000000000..a31aa9ebd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use SimpleXMLElement;
+
+class NumberFormat extends StyleBase
+{
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        $fromFormats = ['\-', '\ '];
+        $toFormats = ['-', ' '];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
+
+            switch ($styleAttributeValue) {
+                case 'Short Date':
+                    $styleAttributeValue = 'dd/mm/yyyy';
+
+                    break;
+            }
+
+            if ($styleAttributeValue > '') {
+                $style['numberFormat']['formatCode'] = $styleAttributeValue;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
new file mode 100644
index 000000000..8103a71cb
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use SimpleXMLElement;
+
+abstract class StyleBase
+{
+    protected static function identifyFixedStyleValue(array $styleList, string &$styleAttributeValue): bool
+    {
+        $returnValue = false;
+
+        $styleAttributeValue = strtolower($styleAttributeValue);
+        foreach ($styleList as $style) {
+            if ($styleAttributeValue == strtolower($style)) {
+                $styleAttributeValue = $style;
+                $returnValue = true;
+
+                break;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    protected static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/chunkReadFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/chunkReadFilter.php
deleted file mode 100644
index 78738b33b..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/chunkReadFilter.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Reader;
-
-
-/**  Define a Read Filter class implementing IReadFilter  */
-class chunkReadFilter implements IReadFilter
-{
-	private $startRow = 0;
-
-	private $endRow = 0;
-
-	/**
-	 * We expect a list of the rows that we want to read to be passed into the constructor.
-	 *
-	 * @param mixed $startRow
-	 * @param mixed $chunkSize
-	 */
-	public function __construct($startRow, $chunkSize)
-	{
-		$this->startRow = $startRow;
-		$this->endRow = $startRow + $chunkSize;
-	}
-
-	public function readCell($column, $row, $worksheetName = '')
-	{
-		//  Only read the heading row, and the rows that were configured in the constructor
-		if (($row == 1) || ($row >= $this->startRow && $row < $this->endRow))
-		{
-			return true;
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
index 143e80d8c..90eee534d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
@@ -2,8 +2,12 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 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
@@ -18,10 +22,15 @@ class ReferenceHelper
     /**
      * Instance of this class.
      *
-     * @var ReferenceHelper
+     * @var ?ReferenceHelper
      */
     private static $instance;
 
+    /**
+     * @var CellReferenceHelper
+     */
+    private $cellReferenceHelper;
+
     /**
      * Get an instance of this class.
      *
@@ -29,7 +38,7 @@ class ReferenceHelper
      */
     public static function getInstance()
     {
-        if (!isset(self::$instance) || (self::$instance === null)) {
+        if (self::$instance === null) {
             self::$instance = new self();
         }
 
@@ -66,9 +75,9 @@ class ReferenceHelper
      *
      * @return int
      */
-    public static function columnReverseSort($a, $b)
+    public static function columnReverseSort(string $a, string $b)
     {
-        return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
+        return -strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
 
     /**
@@ -80,11 +89,16 @@ class ReferenceHelper
      *
      * @return int
      */
-    public static function cellSort($a, $b)
+    public static function cellSort(string $a, string $b)
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
-
+        /** @scrutinizer be-damned */
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        /** @scrutinizer be-damned */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
         if ($ar === $br) {
             return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
@@ -101,75 +115,49 @@ class ReferenceHelper
      *
      * @return int
      */
-    public static function cellReverseSort($a, $b)
+    public static function cellReverseSort(string $a, string $b)
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
-
+        /** @scrutinizer be-damned */
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        /** @scrutinizer be-damned */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
         if ($ar === $br) {
-            return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+            return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
 
         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)
+    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']);
+        $aBreaks = $worksheet->getBreaks();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aBreaks, [self::class, 'cellReverseSort'])
+            : uksort($aBreaks, [self::class, 'cellSort']);
 
-        foreach ($aBreaks as $key => $value) {
-            if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
+        foreach ($aBreaks as $cellAddress => $value) {
+            if ($this->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);
                 }
             }
         }
@@ -178,76 +166,109 @@ class ReferenceHelper
     /**
      * 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)
+    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)) {
+            if ($this->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)
+    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']);
+        $aHyperlinkCollection = $worksheet->getHyperlinkCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aHyperlinkCollection, [self::class, 'cellReverseSort'])
+            : uksort($aHyperlinkCollection, [self::class, 'cellSort']);
 
-        foreach ($aHyperlinkCollection as $key => $value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-            if ($key != $newReference) {
-                $pSheet->setHyperlink($newReference, $value);
-                $pSheet->setHyperlink($key, null);
+        foreach ($aHyperlinkCollection as $cellAddress => $value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($this->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)) {
+                        $condition = $this->updateFormulaReferences(
+                            $condition,
+                            $this->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)
+    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']);
+        $aDataValidationCollection = $worksheet->getDataValidationCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aDataValidationCollection, [self::class, 'cellReverseSort'])
+            : uksort($aDataValidationCollection, [self::class, 'cellSort']);
 
-        foreach ($aDataValidationCollection as $key => $value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-            if ($key != $newReference) {
-                $pSheet->setDataValidation($newReference, $value);
-                $pSheet->setDataValidation($key, null);
+        foreach ($aDataValidationCollection as $cellAddress => $dataValidation) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($cellAddress !== $newReference) {
+                $dataValidation->setSqref($newReference);
+                $worksheet->setDataValidation($newReference, $dataValidation);
+                $worksheet->setDataValidation($cellAddress, null);
             }
         }
     }
@@ -255,44 +276,37 @@ class ReferenceHelper
     /**
      * 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)
+    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)
+    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);
             }
         }
     }
@@ -300,54 +314,49 @@ class ReferenceHelper
     /**
      * 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)
+    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)
+    protected function adjustRowDimensions(Worksheet $worksheet, $beforeRow, $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());
@@ -359,302 +368,245 @@ class ReferenceHelper
     /**
      * 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
-     *
-     * @throws Exception
+     * @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)
-    {
-        $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);
 
-        // Get coordinate of $pBefore
-        [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($pBefore);
-        $beforeColumnIndex = Coordinate::columnIndexFromString($beforeColumn);
+        if (
+            $this->cellReferenceHelper === null ||
+            $this->cellReferenceHelper->refreshRequired($beforeCellAddress, $numberOfColumns, $numberOfRows)
+        ) {
+            $this->cellReferenceHelper = new CellReferenceHelper($beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
+        // Get coordinate of $beforeCellAddress
+        [$beforeColumn, $beforeRow] = Coordinate::indexesFromString($beforeCellAddress);
 
         // Clear cells if we are removing columns or rows
-        $highestColumn = $pSheet->getHighestColumn();
-        $highestRow = $pSheet->getHighestRow();
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestRow = $worksheet->getHighestRow();
 
         // 1. Clear column strips if we are removing columns
-        if ($pNumCols < 0 && $beforeColumnIndex - 2 + $pNumCols > 0) {
-            for ($i = 1; $i <= $highestRow - 1; ++$i) {
-                for ($j = $beforeColumnIndex - 1 + $pNumCols; $j <= $beforeColumnIndex - 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 = $beforeColumnIndex - 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 column before the last column
+        $cellCollection = $worksheet->getCellCollection();
+        $missingCoordinates = array_filter(
+            array_map(function ($row) use ($highestColumn) {
+                return "{$highestColumn}{$row}";
+            }, range(1, $highestRow)),
+            function ($coordinate) use ($cellCollection) {
+                return $cellCollection->has($coordinate) === false;
+            }
+        );
+
+        // Create missing cells with null values
+        if (!empty($missingCoordinates)) {
+            foreach ($missingCoordinates as $coordinate) {
+                $worksheet->createNewCell($coordinate);
             }
         }
 
-        // 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 >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
+            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->getValue(), $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->getValue(), $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true));
                 }
             }
         }
 
         // Duplicate styles for the newly inserted cells
-        $highestColumn = $pSheet->getHighestColumn();
-        $highestRow = $pSheet->getHighestRow();
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestRow = $worksheet->getHighestRow();
 
-        if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
-            for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
-                // Style
-                $coordinate = Coordinate::stringFromColumnIndex($beforeColumnIndex - 1) . $i;
-                if ($pSheet->cellExists($coordinate)) {
-                    $xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-                    $conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-                        $pSheet->getConditionalStyles($coordinate) : false;
-                    for ($j = $beforeColumnIndex; $j <= $beforeColumnIndex - 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);
-                        }
-                    }
-                }
-            }
+        if ($numberOfColumns > 0 && $beforeColumn - 2 > 0) {
+            $this->duplicateStylesByColumn($worksheet, $beforeColumn, $beforeRow, $highestRow, $numberOfColumns);
         }
 
-        if ($pNumRows > 0 && $beforeRow - 1 > 0) {
-            for ($i = $beforeColumnIndex; $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, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustColumnDimensions($worksheet);
 
         // Update worksheet: row dimensions
-        $this->adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustRowDimensions($worksheet, $beforeRow, $numberOfRows);
 
         //    Update worksheet: page breaks
-        $this->adjustPageBreaks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustPageBreaks($worksheet, $numberOfColumns, $numberOfRows);
 
         //    Update worksheet: comments
-        $this->adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustComments($worksheet);
 
         // Update worksheet: hyperlinks
-        $this->adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $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, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustDataValidations($worksheet, $numberOfColumns, $numberOfRows);
 
         // Update worksheet: merge cells
-        $this->adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustMergeCells($worksheet);
 
         // Update worksheet: protected cells
-        $this->adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $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);
             }
-        }
-
-        // Update workbook: named ranges
-        if (count($pSheet->getParent()->getNamedRanges()) > 0) {
-            foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
-                if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
-                    $namedRange->setRange($this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows));
+            if ($objDrawing->getCoordinates2() !== '') {
+                $newReference = $this->updateCellReference($objDrawing->getCoordinates2());
+                if ($objDrawing->getCoordinates2() != $newReference) {
+                    $objDrawing->setCoordinates2($newReference);
                 }
             }
         }
 
+        // Update workbook: define names
+        if (count($worksheet->getParentOrThrow()->getDefinedNames()) > 0) {
+            $this->updateDefinedNames($worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
         // Garbage collect
-        $pSheet->garbageCollect();
+        $worksheet->garbageCollect();
     }
 
     /**
      * 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
-     *
-     * @throws Exception
+     * @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(
+        $formula = '',
+        $beforeCellAddress = 'A1',
+        $numberOfColumns = 0,
+        $numberOfRows = 0,
+        $worksheetName = '',
+        bool $includeAbsoluteReferences = false
+    ) {
+        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);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/mui', ' ' . $formulaBlock . ' ', $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);
+                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $includeAbsoluteReferences), 2);
+                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $includeAbsoluteReferences), 2);
 
                         if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) {
                                 $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $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 + trim($match[3], '$');
-                                $cellIndex = $column . $row;
+                                $row = 10000000 + (int) trim($match[3], '$');
+                                $cellIndex = "{$column}{$row}";
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<!\d\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -664,22 +616,22 @@ class ReferenceHelper
                     }
                 }
                 //    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);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/mui', ' ' . $formulaBlock . ' ', $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);
+                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $includeAbsoluteReferences), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $includeAbsoluteReferences), 0, -2);
 
                         if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) {
                                 $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $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 +641,23 @@ class ReferenceHelper
                     }
                 }
                 //    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);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/mui', ' ' . $formulaBlock . ' ', $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);
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences);
+                        $modified4 = $this->updateCellReference($match[4], $includeAbsoluteReferences);
 
                         if ($match[3] . $match[4] !== $modified3 . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) {
                                 $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $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 = trim($row, '$') + 10000000;
-                                $cellIndex = $column . $row;
+                                $row = (int) trim($row, '$') + 10000000;
+                                $cellIndex = "{$column}{$row}";
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -715,23 +667,25 @@ class ReferenceHelper
                     }
                 }
                 //    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);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/mui', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
 
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
                         $fromString = ($match[2] > '') ? $match[2] . '!' : '';
                         $fromString .= $match[3];
 
-                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences);
                         if ($match[3] !== $modified3) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
+                            if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) {
                                 $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $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 = trim($row, '$') + 10000000;
-                                $cellIndex = $row . $column;
+                                $row = (int) trim($row, '$') + 10000000;
+                                $cellIndex = $row . $rowAdditionalIndex . $column . $columnAdditionalIndex;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -741,14 +695,14 @@ class ReferenceHelper
                     }
                 }
                 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));
                 }
             }
         }
@@ -759,43 +713,171 @@ class ReferenceHelper
     }
 
     /**
-     * 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
-     *
-     * @throws Exception
-     *
-     * @return string Updated cell range
+     * Update all cell references within a formula, irrespective of worksheet.
      */
-    public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    public function updateFormulaReferencesAnyWorksheet(string $formula = '', int $numberOfColumns = 0, int $numberOfRows = 0): string
     {
-        // Is it in another worksheet? Will not have to update anything.
-        if (strpos($pCellRange, '!') !== false) {
-            return $pCellRange;
-        // Is it a range or a single cell?
-        } elseif (!Coordinate::coordinateIsRange($pCellRange)) {
-            // Single cell
-            return $this->updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
-        } elseif (Coordinate::coordinateIsRange($pCellRange)) {
-            // Range
-            return $this->updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
+        $formula = $this->updateCellReferencesAllWorksheets($formula, $numberOfColumns, $numberOfRows);
+
+        if ($numberOfColumns !== 0) {
+            $formula = $this->updateColumnRangesAllWorksheets($formula, $numberOfColumns);
         }
 
-        // Return original
-        return $pCellRange;
+        if ($numberOfRows !== 0) {
+            $formula = $this->updateRowRangesAllWorksheets($formula, $numberOfRows);
+        }
+
+        return $formula;
+    }
+
+    private function updateCellReferencesAllWorksheets(string $formula, int $numberOfColumns, int $numberOfRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $columnLengths = array_map('strlen', array_column($splitRanges[6], 0));
+        $rowLengths = array_map('strlen', array_column($splitRanges[7], 0));
+        $columnOffsets = array_column($splitRanges[6], 1);
+        $rowOffsets = array_column($splitRanges[7], 1);
+
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $columnLength = $columnLengths[$splitCount];
+            $rowLength = $rowLengths[$splitCount];
+            $columnOffset = $columnOffsets[$splitCount];
+            $rowOffset = $rowOffsets[$splitCount];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            if (!empty($column) && $column[0] !== '$') {
+                $column = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($column) + $numberOfColumns);
+                $formula = substr($formula, 0, $columnOffset) . $column . substr($formula, $columnOffset + $columnLength);
+            }
+            if (!empty($row) && $row[0] !== '$') {
+                $row = (int) $row + $numberOfRows;
+                $formula = substr($formula, 0, $rowOffset) . $row . substr($formula, $rowOffset + $rowLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateColumnRangesAllWorksheets(string $formula, int $numberOfColumns): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromColumnLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromColumnOffsets = array_column($splitRanges[1], 1);
+        $toColumnLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toColumnOffsets = array_column($splitRanges[2], 1);
+
+        $fromColumns = $splitRanges[1];
+        $toColumns = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromColumnLength = $fromColumnLengths[$splitCount];
+            $toColumnLength = $toColumnLengths[$splitCount];
+            $fromColumnOffset = $fromColumnOffsets[$splitCount];
+            $toColumnOffset = $toColumnOffsets[$splitCount];
+            $fromColumn = $fromColumns[$splitCount][0];
+            $toColumn = $toColumns[$splitCount][0];
+
+            if (!empty($fromColumn) && $fromColumn[0] !== '$') {
+                $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) + $numberOfColumns);
+                $formula = substr($formula, 0, $toColumnOffset) . $toColumn . substr($formula, $toColumnOffset + $toColumnLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateRowRangesAllWorksheets(string $formula, int $numberOfRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromRowLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromRowOffsets = array_column($splitRanges[1], 1);
+        $toRowLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toRowOffsets = array_column($splitRanges[2], 1);
+
+        $fromRows = $splitRanges[1];
+        $toRows = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromRowLength = $fromRowLengths[$splitCount];
+            $toRowLength = $toRowLengths[$splitCount];
+            $fromRowOffset = $fromRowOffsets[$splitCount];
+            $toRowOffset = $toRowOffsets[$splitCount];
+            $fromRow = $fromRows[$splitCount][0];
+            $toRow = $toRows[$splitCount][0];
+
+            if (!empty($fromRow) && $fromRow[0] !== '$') {
+                $fromRow = (int) $fromRow + $numberOfRows;
+                $formula = substr($formula, 0, $fromRowOffset) . $fromRow . substr($formula, $fromRowOffset + $fromRowLength);
+            }
+            if (!empty($toRow) && $toRow[0] !== '$') {
+                $toRow = (int) $toRow + $numberOfRows;
+                $formula = substr($formula, 0, $toRowOffset) . $toRow . substr($formula, $toRowOffset + $toRowLength);
+            }
+        }
+
+        return $formula;
     }
 
     /**
-     * Update named formulas (i.e. containing worksheet references / named ranges).
+     * Update cell reference.
+     *
+     * @param string $cellReference Cell address or range of addresses
+     *
+     * @return string Updated cell range
+     */
+    private function updateCellReference($cellReference = 'A1', bool $includeAbsoluteReferences = false)
+    {
+        // Is it in another worksheet? Will not have to update anything.
+        if (strpos($cellReference, '!') !== false) {
+            return $cellReference;
+        }
+        // Is it a range or a single cell?
+        if (!Coordinate::coordinateIsRange($cellReference)) {
+            // Single cell
+            return $this->cellReferenceHelper->updateCellReference($cellReference, $includeAbsoluteReferences);
+        }
+
+        // Range
+        return $this->updateCellRange($cellReference, $includeAbsoluteReferences);
+    }
+
+    /**
+     * 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 = '')
+    public function updateNamedFormulae(Spreadsheet $spreadsheet, $oldName = '', $newName = ''): void
     {
         if ($oldName == '') {
             return;
@@ -804,7 +886,7 @@ class ReferenceHelper
         foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
             foreach ($sheet->getCoordinates(false) as $coordinate) {
                 $cell = $sheet->getCell($coordinate);
-                if (($cell !== null) && ($cell->getDataType() == DataType::TYPE_FORMULA)) {
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
                     $formula = $cell->getValue();
                     if (strpos($formula, $oldName) !== false) {
                         $formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
@@ -816,38 +898,83 @@ class ReferenceHelper
         }
     }
 
+    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);
+                $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
-     *
-     * @throws Exception
+     * @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): 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) {
                 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(
+                        $this->cellReferenceHelper->updateCellReference($range[$i][$j] . '1', $includeAbsoluteReferences)
+                    )[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(
+                        $this->cellReferenceHelper->updateCellReference('A' . $range[$i][$j], $includeAbsoluteReferences)
+                    )[1];
                 } else {
-                    $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
+                    $range[$i][$j] = $this->cellReferenceHelper->updateCellReference($range[$i][$j], $includeAbsoluteReferences);
                 }
             }
         }
@@ -856,52 +983,234 @@ class ReferenceHelper
         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
-     *
-     * @throws Exception
-     *
-     * @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
     {
-        if (Coordinate::coordinateIsRange($pCellReference)) {
-            throw new Exception('Only single cell references may be passed to this method.');
+        $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);
+            }
         }
+    }
 
-        // Get coordinate of $pBefore
-        [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($pBefore);
+    private function clearRowStrips(string $highestColumn, int $beforeColumn, int $beforeRow, int $numberOfRows, Worksheet $worksheet): void
+    {
+        $startColumnId = Coordinate::stringFromColumnIndex($beforeColumn);
+        ++$highestColumn;
 
-        // Get coordinate of $pCellReference
-        [$newColumn, $newRow] = Coordinate::coordinateFromString($pCellReference);
-
-        // Verify which parts should be updated
-        $updateColumn = (($newColumn[0] != '$') && ($beforeColumn[0] != '$') && (Coordinate::columnIndexFromString($newColumn) >= Coordinate::columnIndexFromString($beforeColumn)));
-        $updateRow = (($newRow[0] != '$') && ($beforeRow[0] != '$') && $newRow >= $beforeRow);
-
-        // Create new column reference
-        if ($updateColumn) {
-            $newColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($newColumn) + $pNumCols);
+        for ($column = $startColumnId; $column !== $highestColumn; ++$column) {
+            for ($row = $beforeRow + $numberOfRows; $row <= $beforeRow - 1; ++$row) {
+                $coordinate = $column . $row;
+                $this->clearStripCell($worksheet, $coordinate);
+            }
         }
+    }
 
-        // Create new row reference
-        if ($updateRow) {
-            $newRow = $newRow + $pNumRows;
+    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);
         }
+    }
 
-        // Return new reference
-        return $newColumn . $newRow;
+    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 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);
+    }
+
+    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];
+
+                            //    Shuffle columns in table range
+                            if ($numberOfColumns > 0) {
+                                $this->adjustTableInsert($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            } else {
+                                $this->adjustTableDelete($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            }
+                        }
+                    }
+                }
+
+                $table->setRange($this->updateCellReference($tableRange));
+            }
+        }
+    }
+
+    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);
+    }
+
+    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) {
+                    $worksheet->getCell([$j, $i])->setXfIndex($xfIndex);
+                }
+            }
+        }
+    }
+
+    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) {
+                    $worksheet->getCell(Coordinate::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
+                }
+            }
+        }
     }
 
     /**
      * __clone implementation. Cloning should not be allowed in a Singleton!
-     *
-     * @throws Exception
      */
     final public function __clone()
     {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
index 699546760..39b70c868 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
@@ -14,7 +14,7 @@ interface ITextElement
     /**
      * Set text.
      *
-     * @param $text string Text
+     * @param string $text Text
      *
      * @return ITextElement
      */
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
index 6e90fa355..88e7c7923 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
@@ -4,7 +4,6 @@ namespace PhpOffice\PhpSpreadsheet\RichText;
 
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\IComparable;
 
 class RichText implements IComparable
@@ -18,40 +17,36 @@ class RichText implements IComparable
 
     /**
      * Create a new RichText instance.
-     *
-     * @param Cell $pCell
-     *
-     * @throws Exception
      */
-    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->getValue() != '') {
+                $objRun = new Run($cell->getValue());
+                $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)
     {
-        $this->richTextElements[] = $pText;
+        $this->richTextElements[] = $text;
 
         return $this;
     }
@@ -59,15 +54,13 @@ class RichText implements IComparable
     /**
      * Create text.
      *
-     * @param string $pText Text
-     *
-     * @throws Exception
+     * @param string $text Text
      *
      * @return TextElement
      */
-    public function createText($pText)
+    public function createText($text)
     {
-        $objText = new TextElement($pText);
+        $objText = new TextElement($text);
         $this->addText($objText);
 
         return $objText;
@@ -76,15 +69,13 @@ class RichText implements IComparable
     /**
      * Create text run.
      *
-     * @param string $pText Text
-     *
-     * @throws Exception
+     * @param string $text Text
      *
      * @return Run
      */
-    public function createTextRun($pText)
+    public function createTextRun($text)
     {
-        $objText = new Run($pText);
+        $objText = new Run($text);
         $this->addText($objText);
 
         return $objText;
@@ -167,11 +158,14 @@ class RichText implements IComparable
     {
         $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
index aa4a8e462..862cdbf92 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
@@ -9,18 +9,18 @@ class Run extends TextElement implements ITextElement
     /**
      * Font.
      *
-     * @var Font
+     * @var ?Font
      */
     private $font;
 
     /**
      * Create a new Run instance.
      *
-     * @param string $pText Text
+     * @param string $text Text
      */
-    public function __construct($pText = '')
+    public function __construct($text = '')
     {
-        parent::__construct($pText);
+        parent::__construct($text);
         // Initialise variables
         $this->font = new Font();
     }
@@ -38,13 +38,13 @@ class Run extends TextElement implements ITextElement
     /**
      * Set font.
      *
-     * @param Font $pFont Font
+     * @param Font $font Font
      *
      * @return $this
      */
-    public function setFont(Font $pFont = null)
+    public function setFont(?Font $font = null)
     {
-        $this->font = $pFont;
+        $this->font = $font;
 
         return $this;
     }
@@ -58,7 +58,7 @@ class Run extends TextElement implements ITextElement
     {
         return md5(
             $this->getText() .
-            $this->font->getHashCode() .
+            (($this->font === null) ? '' : $this->font->getHashCode()) .
             __CLASS__
         );
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
index f8be5d55b..ee693a2b3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
@@ -14,12 +14,12 @@ class TextElement implements ITextElement
     /**
      * Create a new TextElement instance.
      *
-     * @param string $pText Text
+     * @param string $text Text
      */
-    public function __construct($pText = '')
+    public function __construct($text = '')
     {
         // Initialise variables
-        $this->text = $pText;
+        $this->text = $text;
     }
 
     /**
@@ -35,7 +35,7 @@ class TextElement implements ITextElement
     /**
      * Set text.
      *
-     * @param $text string Text
+     * @param string $text Text
      *
      * @return $this
      */
@@ -47,7 +47,7 @@ class TextElement implements ITextElement
     }
 
     /**
-     * Get font.
+     * Get font. For this class, the return value is always null.
      *
      * @return null|\PhpOffice\PhpSpreadsheet\Style\Font
      */
@@ -68,19 +68,4 @@ class TextElement implements ITextElement
             __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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
index 03fa6ac2c..d8007fd00 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
@@ -5,7 +5,10 @@ namespace PhpOffice\PhpSpreadsheet;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Chart\Renderer\IRenderer;
 use PhpOffice\PhpSpreadsheet\Collection\Memory;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\SimpleCache\CacheInterface;
+use ReflectionClass;
 
 class Settings
 {
@@ -13,37 +16,36 @@ class Settings
      * Class name of the chart renderer used for rendering charts
      * eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph.
      *
-     * @var string
+     * @var ?string
      */
     private static $chartRenderer;
 
     /**
      * Default options for libxml loader.
      *
-     * @var int
+     * @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
-     *      7.1 < 7.1.13
-     *      7.0 < 7.0.27
-     * 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 $libXmlLoaderOptions;
 
     /**
      * The cache implementation to be used for cell collection.
      *
-     * @var CacheInterface
+     * @var ?CacheInterface
      */
     private static $cache;
 
+    /**
+     * The HTTP client implementation to be used for network request.
+     *
+     * @var null|ClientInterface
+     */
+    private static $httpClient;
+
+    /**
+     * @var null|RequestFactoryInterface
+     */
+    private static $requestFactory;
+
     /**
      * Set the locale code to use for formula translations and any special formatting.
      *
@@ -51,26 +53,29 @@ class Settings
      *
      * @return bool Success or failure
      */
-    public static function setLocale($locale)
+    public static function setLocale(string $locale)
     {
         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 string $rendererClassName Class name of the chart renderer
      *    eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph
-     *
-     * @throws Exception
      */
-    public static function setChartRenderer($rendererClass)
+    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;
     }
 
     /**
@@ -79,22 +84,29 @@ class Settings
      * @return null|string 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)
+    public static function setLibXmlLoaderOptions($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;
     }
 
     /**
@@ -103,65 +115,109 @@ class Settings
      *
      * @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 = true;
+        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
-     *      7.1 < 7.1.13
-     *      7.0 < 7.0.27
-     * 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.
+     * Deprecated, has no effect.
      *
      * @param bool $state
+     *
+     * @deprecated will be removed without replacement as it is no longer necessary on PHP 7.3.0+
+     *
+     * @codeCoverageIgnore
      */
-    public static function setLibXmlDisableEntityLoader($state)
+    public static function setLibXmlDisableEntityLoader(/** @scrutinizer ignore-unused */ $state): void
     {
-        self::$libXmlDisableEntityLoader = (bool) $state;
+        // noop
     }
 
     /**
-     * Return the state of the entity loader (disabled/enabled) for libxml loader.
+     * Deprecated, has no effect.
      *
      * @return bool $state
+     *
+     * @deprecated will be removed without replacement as it is no longer necessary on PHP 7.3.0+
+     *
+     * @codeCoverageIgnore
      */
-    public static function getLibXmlDisableEntityLoader()
+    public static function getLibXmlDisableEntityLoader(): bool
     {
-        return self::$libXmlDisableEntityLoader;
+        return true;
     }
 
     /**
      * Sets the implementation of cache that should be used for cell collection.
-     *
-     * @param CacheInterface $cache
      */
-    public static function setCache(CacheInterface $cache)
+    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
+            PHP_MAJOR_VERSION === 8 &&
+            (new ReflectionClass(CacheInterface::class))->getMethod('get')->getReturnType() !== null;
+    }
+
+    /**
+     * Set the HTTP client implementation to be used for network request.
+     */
+    public static function setHttpClient(ClientInterface $httpClient, RequestFactoryInterface $requestFactory): void
+    {
+        self::$httpClient = $httpClient;
+        self::$requestFactory = $requestFactory;
+    }
+
+    /**
+     * Unset the HTTP client configuration.
+     */
+    public static function unsetHttpClient(): void
+    {
+        self::$httpClient = null;
+        self::$requestFactory = null;
+    }
+
+    /**
+     * Get the HTTP client implementation to be used for network request.
+     */
+    public static function getHttpClient(): ClientInterface
+    {
+        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;
+    }
+
+    /**
+     * Get the HTTP request factory.
+     */
+    public static function getRequestFactory(): RequestFactoryInterface
+    {
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
index 4b5782420..8718a6135 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
@@ -6,133 +6,109 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
 class CodePage
 {
+    public const DEFAULT_CODE_PAGE = 'CP1252';
+
+    /** @var array */
+    private static $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
+        //720 => 'notsupported', //    OEM Arabic
+        737 => 'CP737', //    OEM Greek
+        775 => 'CP775', //    OEM Baltic
+        850 => 'CP850', //    OEM Latin I
+        852 => 'CP852', //    OEM Latin II (Central European)
+        855 => 'CP855', //    OEM Cyrillic
+        857 => 'CP857', //    OEM Turkish
+        858 => 'CP858', //    OEM Multilingual Latin I with Euro
+        860 => 'CP860', //    OEM Portugese
+        861 => 'CP861', //    OEM Icelandic
+        862 => 'CP862', //    OEM Hebrew
+        863 => 'CP863', //    OEM Canadian (French)
+        864 => 'CP864', //    OEM Arabic
+        865 => 'CP865', //    OEM Nordic
+        866 => 'CP866', //    OEM Cyrillic (Russian)
+        869 => 'CP869', //    OEM Greek (Modern)
+        874 => 'CP874', //    ANSI Thai
+        932 => 'CP932', //    ANSI Japanese Shift-JIS
+        936 => 'CP936', //    ANSI Chinese Simplified GBK
+        949 => 'CP949', //    ANSI Korean (Wansung)
+        950 => 'CP950', //    ANSI Chinese Traditional BIG5
+        1200 => 'UTF-16LE', //    UTF-16 (BIFF8)
+        1250 => 'CP1250', //    ANSI Latin II (Central European)
+        1251 => 'CP1251', //    ANSI Cyrillic
+        1252 => 'CP1252', //    ANSI Latin I (BIFF4-BIFF7)
+        1253 => 'CP1253', //    ANSI Greek
+        1254 => 'CP1254', //    ANSI Turkish
+        1255 => 'CP1255', //    ANSI Hebrew
+        1256 => 'CP1256', //    ANSI Arabic
+        1257 => 'CP1257', //    ANSI Baltic
+        1258 => 'CP1258', //    ANSI Vietnamese
+        1361 => 'CP1361', //    ANSI Korean (Johab)
+        10000 => 'MAC', //    Apple Roman
+        10001 => 'CP932', //    Macintosh Japanese
+        10002 => 'CP950', //    Macintosh Chinese Traditional
+        10003 => 'CP1361', //    Macintosh Korean
+        10004 => 'MACARABIC', //    Apple Arabic
+        10005 => 'MACHEBREW', //    Apple Hebrew
+        10006 => 'MACGREEK', //    Macintosh Greek
+        10007 => 'MACCYRILLIC', //    Macintosh Cyrillic
+        10008 => 'CP936', //    Macintosh - Simplified Chinese (GB 2312)
+        10010 => 'MACROMANIA', //    Macintosh Romania
+        10017 => 'MACUKRAINE', //    Macintosh Ukraine
+        10021 => 'MACTHAI', //    Macintosh Thai
+        10029 => ['MACCENTRALEUROPE', 'MAC-CENTRALEUROPE'], //    Macintosh Central Europe
+        10079 => 'MACICELAND', //    Macintosh Icelandic
+        10081 => 'MACTURKISH', //    Macintosh Turkish
+        10082 => 'MACCROATIAN', //    Macintosh Croatian
+        21010 => 'UTF-16LE', //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
+        32768 => 'MAC', //    Apple Roman
+        //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
+    {
+        return in_array($codePage, self::$pageArray, true);
+    }
+
     /**
      * Convert Microsoft Code Page Identifier to Code Page Name which iconv
      * and mbstring understands.
      *
      * @param int $codePage Microsoft Code Page Indentifier
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return string Code Page Name
      */
-    public static function numberToName($codePage)
+    public static function numberToName(int $codePage): string
     {
-        switch ($codePage) {
-            case 367:
-                return 'ASCII'; //    ASCII
-            case 437:
-                return 'CP437'; //    OEM US
-            case 720:
-                throw new PhpSpreadsheetException('Code page 720 not supported.'); //    OEM Arabic
-            case 737:
-                return 'CP737'; //    OEM Greek
-            case 775:
-                return 'CP775'; //    OEM Baltic
-            case 850:
-                return 'CP850'; //    OEM Latin I
-            case 852:
-                return 'CP852'; //    OEM Latin II (Central European)
-            case 855:
-                return 'CP855'; //    OEM Cyrillic
-            case 857:
-                return 'CP857'; //    OEM Turkish
-            case 858:
-                return 'CP858'; //    OEM Multilingual Latin I with Euro
-            case 860:
-                return 'CP860'; //    OEM Portugese
-            case 861:
-                return 'CP861'; //    OEM Icelandic
-            case 862:
-                return 'CP862'; //    OEM Hebrew
-            case 863:
-                return 'CP863'; //    OEM Canadian (French)
-            case 864:
-                return 'CP864'; //    OEM Arabic
-            case 865:
-                return 'CP865'; //    OEM Nordic
-            case 866:
-                return 'CP866'; //    OEM Cyrillic (Russian)
-            case 869:
-                return 'CP869'; //    OEM Greek (Modern)
-            case 874:
-                return 'CP874'; //    ANSI Thai
-            case 932:
-                return 'CP932'; //    ANSI Japanese Shift-JIS
-            case 936:
-                return 'CP936'; //    ANSI Chinese Simplified GBK
-            case 949:
-                return 'CP949'; //    ANSI Korean (Wansung)
-            case 950:
-                return 'CP950'; //    ANSI Chinese Traditional BIG5
-            case 1200:
-                return 'UTF-16LE'; //    UTF-16 (BIFF8)
-            case 1250:
-                return 'CP1250'; //    ANSI Latin II (Central European)
-            case 1251:
-                return 'CP1251'; //    ANSI Cyrillic
-            case 0:
-                //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-            case 1252:
-                return 'CP1252'; //    ANSI Latin I (BIFF4-BIFF7)
-            case 1253:
-                return 'CP1253'; //    ANSI Greek
-            case 1254:
-                return 'CP1254'; //    ANSI Turkish
-            case 1255:
-                return 'CP1255'; //    ANSI Hebrew
-            case 1256:
-                return 'CP1256'; //    ANSI Arabic
-            case 1257:
-                return 'CP1257'; //    ANSI Baltic
-            case 1258:
-                return 'CP1258'; //    ANSI Vietnamese
-            case 1361:
-                return 'CP1361'; //    ANSI Korean (Johab)
-            case 10000:
-                return 'MAC'; //    Apple Roman
-            case 10001:
-                return 'CP932'; //    Macintosh Japanese
-            case 10002:
-                return 'CP950'; //    Macintosh Chinese Traditional
-            case 10003:
-                return 'CP1361'; //    Macintosh Korean
-            case 10004:
-                return 'MACARABIC'; //    Apple Arabic
-            case 10005:
-                return 'MACHEBREW'; //    Apple Hebrew
-            case 10006:
-                return 'MACGREEK'; //    Macintosh Greek
-            case 10007:
-                return 'MACCYRILLIC'; //    Macintosh Cyrillic
-            case 10008:
-                return 'CP936'; //    Macintosh - Simplified Chinese (GB 2312)
-            case 10010:
-                return 'MACROMANIA'; //    Macintosh Romania
-            case 10017:
-                return 'MACUKRAINE'; //    Macintosh Ukraine
-            case 10021:
-                return 'MACTHAI'; //    Macintosh Thai
-            case 10029:
-                return 'MACCENTRALEUROPE'; //    Macintosh Central Europe
-            case 10079:
-                return 'MACICELAND'; //    Macintosh Icelandic
-            case 10081:
-                return 'MACTURKISH'; //    Macintosh Turkish
-            case 10082:
-                return 'MACCROATIAN'; //    Macintosh Croatian
-            case 21010:
-                return 'UTF-16LE'; //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
-            case 32768:
-                return 'MAC'; //    Apple Roman
-            case 32769:
-                throw new PhpSpreadsheetException('Code page 32769 not supported.'); //    ANSI Latin I (BIFF2-BIFF3)
-            case 65000:
-                return 'UTF-7'; //    Unicode (UTF-7)
-            case 65001:
-                return 'UTF-8'; //    Unicode (UTF-8)
+        if (array_key_exists($codePage, self::$pageArray)) {
+            $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
         }
 
         throw new PhpSpreadsheetException('Unknown codepage: ' . $codePage);
     }
+
+    public static function getEncodings(): array
+    {
+        return self::$pageArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
index 5d2deb32c..4f1967311 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use DateTime;
 use DateTimeInterface;
 use DateTimeZone;
-use PhpOffice\PhpSpreadsheet\Calculation\DateTime;
+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\Shared\Date as SharedDate;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
 class Date
@@ -57,22 +61,24 @@ class Date
     /**
      * Default timezone to use for DateTime objects.
      *
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     protected static $defaultTimeZone;
 
     /**
      * 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($baseYear)
     {
-        if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
-            ($baseDate == self::CALENDAR_MAC_1904)) {
-            self::$excelCalendar = $baseDate;
+        if (
+            ($baseYear == self::CALENDAR_WINDOWS_1900) ||
+            ($baseYear == self::CALENDAR_MAC_1904)
+        ) {
+            self::$excelCalendar = $baseYear;
 
             return true;
         }
@@ -93,57 +99,96 @@ class Date
     /**
      * Set the Default timezone to use for dates.
      *
-     * @param DateTimeZone|string $timeZone The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions
+     * @param null|DateTimeZone|string $timeZone The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions
      *
-     * @throws \Exception
-     *
-     * @return bool Success or failure
      * @return bool Success or failure
      */
     public static function setDefaultTimezone($timeZone)
     {
-        if ($timeZone = self::validateTimeZone($timeZone)) {
+        try {
+            $timeZone = self::validateTimeZone($timeZone);
             self::$defaultTimeZone = $timeZone;
-
-            return true;
+            $retval = true;
+        } catch (PhpSpreadsheetException $e) {
+            $retval = false;
         }
 
-        return false;
+        return $retval;
     }
 
     /**
-     * Return the Default timezone being used for dates.
-     *
-     * @return DateTimeZone The timezone being used as default for Excel timestamp to PHP DateTime object
+     * Return the Default timezone, or UTC if default not set.
      */
-    public static function getDefaultTimezone()
+    public static function getDefaultTimezone(): DateTimeZone
     {
-        if (self::$defaultTimeZone === null) {
-            self::$defaultTimeZone = new DateTimeZone('UTC');
-        }
+        return self::$defaultTimeZone ?? new DateTimeZone('UTC');
+    }
 
+    /**
+     * Return the Default timezone, or local timezone if default is not set.
+     */
+    public static function getDefaultOrLocalTimezone(): DateTimeZone
+    {
+        return self::$defaultTimeZone ?? new DateTimeZone(date_default_timezone_get());
+    }
+
+    /**
+     * Return the Default timezone even if null.
+     */
+    public static function getDefaultTimezoneOrNull(): ?DateTimeZone
+    {
         return self::$defaultTimeZone;
     }
 
     /**
      * Validate a timezone.
      *
-     * @param DateTimeZone|string $timeZone The timezone to validate, either as a timezone string or object
+     * @param null|DateTimeZone|string $timeZone The timezone to validate, either as a timezone string or object
      *
-     * @throws \Exception
-     *
-     * @return DateTimeZone The timezone as a timezone object
-     * @return DateTimeZone The timezone as a timezone object
+     * @return ?DateTimeZone The timezone as a timezone object
      */
-    protected static function validateTimeZone($timeZone)
+    private static function validateTimeZone($timeZone)
     {
-        if (is_object($timeZone) && $timeZone instanceof DateTimeZone) {
+        if ($timeZone instanceof DateTimeZone || $timeZone === null) {
             return $timeZone;
-        } elseif (is_string($timeZone)) {
+        }
+        if (in_array($timeZone, DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC))) {
             return new DateTimeZone($timeZone);
         }
 
-        throw new \Exception('Invalid 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.
+     *
+     * @return float|int
+     */
+    public static function convertIsoDate($value)
+    {
+        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 = SharedDate::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;
     }
 
     /**
@@ -151,31 +196,29 @@ class Date
      *
      * @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
      *
-     * @throws \Exception
-     *
-     * @return \DateTime PHP date/time object
+     * @return DateTime PHP date/time object
      */
     public static function excelToDateTimeObject($excelTimestamp, $timeZone = null)
     {
         $timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
-            if ($excelTimestamp < 1.0) {
+            if ($excelTimestamp < 1 && self::$excelCalendar === self::CALENDAR_WINDOWS_1900) {
                 // Unix timestamp base date
-                $baseDate = new \DateTime('1970-01-01', $timeZone);
+                $baseDate = new DateTime('1970-01-01', $timeZone);
             } else {
                 // MS Excel calendar base dates
                 if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
                     // Allow adjustment for 1900 Leap Year in MS Excel
-                    $baseDate = ($excelTimestamp < 60) ? new \DateTime('1899-12-31', $timeZone) : new \DateTime('1899-12-30', $timeZone);
+                    $baseDate = ($excelTimestamp < 60) ? new DateTime('1899-12-31', $timeZone) : new DateTime('1899-12-30', $timeZone);
                 } else {
-                    $baseDate = new \DateTime('1904-01-01', $timeZone);
+                    $baseDate = new DateTime('1904-01-01', $timeZone);
                 }
             }
         } else {
-            $baseDate = new \DateTime('1899-12-30', $timeZone);
+            $baseDate = new DateTime('1899-12-30', $timeZone);
         }
 
         $days = floor($excelTimestamp);
@@ -197,13 +240,13 @@ class Date
 
     /**
      * 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
-     *
-     * @throws \Exception
+     *                                               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
      */
@@ -216,9 +259,10 @@ class Date
     /**
      * 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)
@@ -255,18 +299,20 @@ class Date
 
     /**
      * 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 float MS Excel serialized date/time value
+     * @return false|float MS Excel serialized date/time value
      */
-    public static function timestampToExcel($dateValue)
+    public static function timestampToExcel($unixTimestamp)
     {
-        if (!is_numeric($dateValue)) {
+        if (!is_numeric($unixTimestamp)) {
             return false;
         }
 
-        return self::dateTimeToExcel(new \DateTime('@' . $dateValue));
+        return self::dateTimeToExcel(new DateTime('@' . $unixTimestamp));
     }
 
     /**
@@ -307,8 +353,8 @@ class Date
         }
 
         //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
-        $century = substr($year, 0, 2);
-        $decade = 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;
@@ -319,94 +365,96 @@ class Date
     /**
      * Is a given cell a date/time?
      *
-     * @param Cell $pCell
+     * @param mixed $value
      *
      * @return bool
      */
-    public static function isDateTime(Cell $pCell)
+    public static function isDateTime(Cell $cell, $value = null, bool $dateWithoutTimeOkay = true)
     {
-        return is_numeric($pCell->getValue()) &&
-            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 $e) {
+                // 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?
-     *
-     * @param NumberFormat $pFormat
+     * Is a given NumberFormat code a date/time format code?
      *
      * @return bool
      */
-    public static function isDateTimeFormat(NumberFormat $pFormat)
+    public static function isDateTimeFormat(NumberFormat $excelFormatCode, bool $dateWithoutTimeOkay = true)
     {
-        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
+     * @param string $excelFormatCode
      *
      * @return bool
      */
-    public static function isDateTimeFormatCode($pFormatCode)
+    public static function isDateTimeFormatCode($excelFormatCode, bool $dateWithoutTimeOkay = true)
     {
-        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;
+        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 ((substr($excelFormatCode, 0, 1) == '_') || (substr($excelFormatCode, 0, 2) == '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($excelFormatCode, '-00000') !== false) {
+            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 (strpos($excelFormatCode, '"') !== false) {
                 $segMatcher = false;
-                foreach (explode('"', $pFormatCode) as $subVal) {
+                foreach (explode('"', $excelFormatCode) as $subVal) {
                     //    Only test in alternate array entries (the non-quoted blocks)
-                    if (($segMatcher = !$segMatcher) &&
-                        (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))) {
+                    $segMatcher = $segMatcher === false;
+                    if (
+                        $segMatcher &&
+                        (preg_match('/(^|\])[^\[]*[' . $possibleFormatCharacters . ']/i', $subVal))
+                    ) {
                         return true;
                     }
                 }
@@ -437,15 +485,15 @@ class Date
             return false;
         }
 
-        $dateValueNew = DateTime::DATEVALUE($dateValue);
+        $dateValueNew = DateTimeExcel\DateValue::fromString($dateValue);
 
-        if ($dateValueNew === Functions::VALUE()) {
+        if (!is_float($dateValueNew)) {
             return false;
         }
 
         if (strpos($dateValue, ':') !== false) {
-            $timeValue = DateTime::TIMEVALUE($dateValue);
-            if ($timeValue === Functions::VALUE()) {
+            $timeValue = DateTimeExcel\TimeValue::fromString($dateValue);
+            if (!is_float($timeValue)) {
                 return false;
             }
             $dateValueNew += $timeValue;
@@ -457,21 +505,21 @@ class Date
     /**
      * 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($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;
     }
 
     /**
@@ -490,4 +538,19 @@ class Date
 
         return $day;
     }
+
+    public static function dateTimeFromTimestamp(string $date, ?DateTimeZone $timeZone = null): DateTime
+    {
+        $dtobj = DateTime::createFromFormat('U', $date) ?: new DateTime();
+        $dtobj->setTimeZone($timeZone ?? self::getDefaultOrLocalTimezone());
+
+        return $dtobj;
+    }
+
+    public static function formattedDateTimeFromTimestamp(string $date, string $format, ?DateTimeZone $timeZone = null): string
+    {
+        $dtobj = self::dateTimeFromTimestamp($date, $timeZone);
+
+        return $dtobj->format($format);
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
index 25d6910d3..f69310fc6 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
@@ -2,31 +2,36 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use GdImage;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+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
      */
-    public static function pixelsToEMU($pValue)
+    public static function pixelsToEMU($pixelValue)
     {
-        return round($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)
     {
-        if ($pValue != 0) {
-            return round($pValue / 9525);
+        $emuValue = (int) $emuValue;
+        if ($emuValue != 0) {
+            return (int) round($emuValue / 9525);
         }
 
         return 0;
@@ -37,50 +42,51 @@ class Drawing
      * 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($pixelValue, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont)
     {
         // Font name and size
-        $name = $pDefaultFont->getName();
-        $size = $pDefaultFont->getSize();
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
 
         if (isset(Font::$defaultColumnWidths[$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::$defaultColumnWidths[$name][$size]['width']
+                / Font::$defaultColumnWidths[$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::$defaultColumnWidths['Calibri'][11]['width']
+            / Font::$defaultColumnWidths['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($cellWidth, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont)
     {
         // Font name and size
-        $name = $pDefaultFont->getName();
-        $size = $pDefaultFont->getSize();
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
 
         if (isset(Font::$defaultColumnWidths[$name][$size])) {
             // Exact width can be determined
-            $colWidth = $pValue * Font::$defaultColumnWidths[$name][$size]['px'] / Font::$defaultColumnWidths[$name][$size]['width'];
+            $colWidth = $cellWidth * Font::$defaultColumnWidths[$name][$size]['px']
+                / Font::$defaultColumnWidths[$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::$defaultColumnWidths['Calibri'][11]['px']
+                / Font::$defaultColumnWidths['Calibri'][11]['width'] / 11;
         }
 
         // Round pixels to closest integer
@@ -92,26 +98,26 @@ class Drawing
     /**
      * 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($pixelValue)
     {
-        return $pValue * 0.67777777;
+        return $pixelValue * 0.75;
     }
 
     /**
      * Convert points to pixels.
      *
-     * @param int $pValue Value in points
+     * @param int $pointValue Value in points
      *
      * @return int Value in pixels
      */
-    public static function pointsToPixels($pValue)
+    public static function pointsToPixels($pointValue)
     {
-        if ($pValue != 0) {
-            return (int) ceil($pValue * 1.333333333);
+        if ($pointValue != 0) {
+            return (int) ceil($pointValue / 0.75);
         }
 
         return 0;
@@ -120,26 +126,27 @@ class Drawing
     /**
      * Convert degrees to angle.
      *
-     * @param int $pValue Degrees
+     * @param int $degrees Degrees
      *
      * @return int Angle
      */
-    public static function degreesToAngle($pValue)
+    public static function degreesToAngle($degrees)
     {
-        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)
     {
-        if ($pValue != 0) {
-            return round($pValue / 60000);
+        $angle = (int) $angle;
+        if ($angle != 0) {
+            return (int) round($angle / 60000);
         }
 
         return 0;
@@ -150,100 +157,21 @@ class Drawing
      *
      * @see http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
      *
-     * @param string $p_sFile Path to Windows DIB (BMP) image
+     * @param string $bmpFilename Path to Windows DIB (BMP) image
      *
-     * @return resource
+     * @return GdImage|resource
+     *
+     * @deprecated 1.26 use Php function imagecreatefrombmp instead
+     *
+     * @codeCoverageIgnore
      */
-    public static function imagecreatefrombmp($p_sFile)
+    public static function imagecreatefrombmp($bmpFilename)
     {
-        //    Load the image into a string
-        $file = fopen($p_sFile, 'rb');
-        $read = fread($file, 10);
-        while (!feof($file) && ($read != '')) {
-            $read .= fread($file, 1024);
+        $retVal = @imagecreatefrombmp($bmpFilename);
+        if ($retVal === false) {
+            throw new ReaderException("Unable to create image from $bmpFilename");
         }
 
-        $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
-        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;
+        return $retVal;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
index c6d0a6f81..466e7e825 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
@@ -7,21 +7,21 @@ class Escher
     /**
      * Drawing Group Container.
      *
-     * @var Escher\DggContainer
+     * @var ?Escher\DggContainer
      */
     private $dggContainer;
 
     /**
      * Drawing Container.
      *
-     * @var Escher\DgContainer
+     * @var ?Escher\DgContainer
      */
     private $dgContainer;
 
     /**
      * Get Drawing Group Container.
      *
-     * @return Escher\DggContainer
+     * @return ?Escher\DggContainer
      */
     public function getDggContainer()
     {
@@ -43,7 +43,7 @@ class Escher
     /**
      * Get Drawing Container.
      *
-     * @return Escher\DgContainer
+     * @return ?Escher\DgContainer
      */
     public function getDgContainer()
     {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
index e9d387daa..51c6860cb 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
@@ -2,50 +2,63 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Escher;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
 class DgContainer
 {
     /**
      * Drawing index, 1-based.
      *
-     * @var int
+     * @var ?int
      */
     private $dgId;
 
     /**
      * Last shape index in this drawing.
      *
-     * @var int
+     * @var ?int
      */
     private $lastSpId;
 
+    /** @var ?DgContainer\SpgrContainer */
     private $spgrContainer;
 
-    public function getDgId()
+    public function getDgId(): ?int
     {
         return $this->dgId;
     }
 
-    public function setDgId($value)
+    public function setDgId(int $value): void
     {
         $this->dgId = $value;
     }
 
-    public function getLastSpId()
+    public function getLastSpId(): ?int
     {
         return $this->lastSpId;
     }
 
-    public function setLastSpId($value)
+    public function setLastSpId(int $value): void
     {
         $this->lastSpId = $value;
     }
 
-    public function getSpgrContainer()
+    public function getSpgrContainer(): ?DgContainer\SpgrContainer
     {
         return $this->spgrContainer;
     }
 
-    public function setSpgrContainer($spgrContainer)
+    public function getSpgrContainerOrThrow(): DgContainer\SpgrContainer
+    {
+        if ($this->spgrContainer !== null) {
+            return $this->spgrContainer;
+        }
+
+        throw new SpreadsheetException('spgrContainer is unexpectedly null');
+    }
+
+    /** @param DgContainer\SpgrContainer $spgrContainer */
+    public function setSpgrContainer($spgrContainer): DgContainer\SpgrContainer
     {
         return $this->spgrContainer = $spgrContainer;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
index 7e2c34608..260df9cd4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
@@ -7,7 +7,7 @@ class SpgrContainer
     /**
      * Parent Shape Group Container.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer
+     * @var null|SpgrContainer
      */
     private $parent;
 
@@ -20,20 +20,16 @@ class SpgrContainer
 
     /**
      * Set parent Shape Group Container.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer $parent
      */
-    public function setParent($parent)
+    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;
     }
@@ -43,7 +39,7 @@ class SpgrContainer
      *
      * @param mixed $child
      */
-    public function addChild($child)
+    public function addChild($child): void
     {
         $this->children[] = $child;
         $child->setParent($this);
@@ -52,7 +48,7 @@ class SpgrContainer
     /**
      * Get collection of Shape Containers.
      */
-    public function getChildren()
+    public function getChildren(): array
     {
         return $this->children;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
index bbf51df18..8a81ff579 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
@@ -95,7 +95,7 @@ class SpContainer
      *
      * @param SpgrContainer $parent
      */
-    public function setParent($parent)
+    public function setParent($parent): void
     {
         $this->parent = $parent;
     }
@@ -115,7 +115,7 @@ class SpContainer
      *
      * @param bool $value
      */
-    public function setSpgr($value)
+    public function setSpgr($value): void
     {
         $this->spgr = $value;
     }
@@ -135,7 +135,7 @@ class SpContainer
      *
      * @param int $value
      */
-    public function setSpType($value)
+    public function setSpType($value): void
     {
         $this->spType = $value;
     }
@@ -155,7 +155,7 @@ class SpContainer
      *
      * @param int $value
      */
-    public function setSpFlag($value)
+    public function setSpFlag($value): void
     {
         $this->spFlag = $value;
     }
@@ -175,7 +175,7 @@ class SpContainer
      *
      * @param int $value
      */
-    public function setSpId($value)
+    public function setSpId($value): void
     {
         $this->spId = $value;
     }
@@ -196,7 +196,7 @@ class SpContainer
      * @param int $property The number specifies the option
      * @param mixed $value
      */
-    public function setOPT($property, $value)
+    public function setOPT($property, $value): void
     {
         $this->OPT[$property] = $value;
     }
@@ -232,7 +232,7 @@ class SpContainer
      *
      * @param string $value eg: 'A1'
      */
-    public function setStartCoordinates($value)
+    public function setStartCoordinates($value): void
     {
         $this->startCoordinates = $value;
     }
@@ -252,7 +252,7 @@ class SpContainer
      *
      * @param int $startOffsetX
      */
-    public function setStartOffsetX($startOffsetX)
+    public function setStartOffsetX($startOffsetX): void
     {
         $this->startOffsetX = $startOffsetX;
     }
@@ -272,7 +272,7 @@ class SpContainer
      *
      * @param int $startOffsetY
      */
-    public function setStartOffsetY($startOffsetY)
+    public function setStartOffsetY($startOffsetY): void
     {
         $this->startOffsetY = $startOffsetY;
     }
@@ -292,7 +292,7 @@ class SpContainer
      *
      * @param string $value eg: 'A1'
      */
-    public function setEndCoordinates($value)
+    public function setEndCoordinates($value): void
     {
         $this->endCoordinates = $value;
     }
@@ -312,7 +312,7 @@ class SpContainer
      *
      * @param int $endOffsetX
      */
-    public function setEndOffsetX($endOffsetX)
+    public function setEndOffsetX($endOffsetX): void
     {
         $this->endOffsetX = $endOffsetX;
     }
@@ -332,7 +332,7 @@ class SpContainer
      *
      * @param int $endOffsetY
      */
-    public function setEndOffsetY($endOffsetY)
+    public function setEndOffsetY($endOffsetY): void
     {
         $this->endOffsetY = $endOffsetY;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
index 96da32131..ba5e7980b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
@@ -28,7 +28,7 @@ class DggContainer
     /**
      * BLIP Store Container.
      *
-     * @var DggContainer\BstoreContainer
+     * @var ?DggContainer\BstoreContainer
      */
     private $bstoreContainer;
 
@@ -61,7 +61,7 @@ class DggContainer
      *
      * @param int $value
      */
-    public function setSpIdMax($value)
+    public function setSpIdMax($value): void
     {
         $this->spIdMax = $value;
     }
@@ -81,7 +81,7 @@ class DggContainer
      *
      * @param int $value
      */
-    public function setCDgSaved($value)
+    public function setCDgSaved($value): void
     {
         $this->cDgSaved = $value;
     }
@@ -101,7 +101,7 @@ class DggContainer
      *
      * @param int $value
      */
-    public function setCSpSaved($value)
+    public function setCSpSaved($value): void
     {
         $this->cSpSaved = $value;
     }
@@ -109,7 +109,7 @@ class DggContainer
     /**
      * Get BLIP Store Container.
      *
-     * @return DggContainer\BstoreContainer
+     * @return ?DggContainer\BstoreContainer
      */
     public function getBstoreContainer()
     {
@@ -121,7 +121,7 @@ class DggContainer
      *
      * @param DggContainer\BstoreContainer $bstoreContainer
      */
-    public function setBstoreContainer($bstoreContainer)
+    public function setBstoreContainer($bstoreContainer): void
     {
         $this->bstoreContainer = $bstoreContainer;
     }
@@ -132,7 +132,7 @@ class DggContainer
      * @param int $property The number specifies the option
      * @param mixed $value
      */
-    public function setOPT($property, $value)
+    public function setOPT($property, $value): void
     {
         $this->OPT[$property] = $value;
     }
@@ -166,10 +166,10 @@ class DggContainer
     /**
      * Set identifier clusters. [<drawingId> => <max shape id>, ...].
      *
-     * @param array $pValue
+     * @param array $IDCLs
      */
-    public function setIDCLs($pValue)
+    public function setIDCLs($IDCLs): void
     {
-        $this->IDCLs = $pValue;
+        $this->IDCLs = $IDCLs;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
index 9d1e68ec7..7203b66be 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
+++ b/libraries/phpspreadsheet/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 = [];
 
     /**
      * Add a BLIP Store Entry.
-     *
-     * @param BstoreContainer\BSE $BSE
      */
-    public function addBSE($BSE)
+    public function addBSE(BstoreContainer\BSE $BSE): void
     {
         $this->BSECollection[] = $BSE;
         $BSE->setParent($this);
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
index f83bdc7ee..328ac6b6c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ b/libraries/phpspreadsheet/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,15 +19,16 @@ class BSE
 
     /**
      * The parent BLIP Store Entry Container.
+     * Property is never currently read.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer
+     * @var BstoreContainer
      */
-    private $parent;
+    private $parent; // @phpstan-ignore-line
 
     /**
      * The BLIP (Big Large Image or Picture).
      *
-     * @var BSE\Blip
+     * @var ?BSE\Blip
      */
     private $blip;
 
@@ -38,10 +41,8 @@ class BSE
 
     /**
      * Set parent BLIP Store Entry Container.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer $parent
      */
-    public function setParent($parent)
+    public function setParent(BstoreContainer $parent): void
     {
         $this->parent = $parent;
     }
@@ -49,7 +50,7 @@ class BSE
     /**
      * Get the BLIP.
      *
-     * @return BSE\Blip
+     * @return ?BSE\Blip
      */
     public function getBlip()
     {
@@ -58,10 +59,8 @@ class BSE
 
     /**
      * Set the BLIP.
-     *
-     * @param BSE\Blip $blip
      */
-    public function setBlip($blip)
+    public function setBlip(BSE\Blip $blip): void
     {
         $this->blip = $blip;
         $blip->setParent($this);
@@ -82,7 +81,7 @@ class BSE
      *
      * @param int $blipType
      */
-    public function setBlipType($blipType)
+    public function setBlipType($blipType): void
     {
         $this->blipType = $blipType;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
index 88bc117a1..03b261f8f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
@@ -2,12 +2,14 @@
 
 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
+     * @var BSE
      */
     private $parent;
 
@@ -33,27 +35,23 @@ class Blip
      *
      * @param string $data
      */
-    public function setData($data)
+    public function setData($data): void
     {
         $this->data = $data;
     }
 
     /**
      * Set parent BSE.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE $parent
      */
-    public function setParent($parent)
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
index 239c8375a..737a6eb59 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
@@ -2,7 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
-use InvalidArgumentException;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use ZipArchive;
 
 class File
@@ -16,75 +17,81 @@ class File
 
     /**
      * 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)
+    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) {
@@ -104,41 +111,87 @@ class File
 
     /**
      * 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
+    {
+        $filename = tempnam(self::sysGetTempDir(), 'phpspreadsheet');
+        if ($filename === false) {
+            throw new Exception('Could not create temporary file');
+        }
+
+        return $filename;
     }
 
     /**
      * Assert that given path is an existing file and is readable, otherwise throw exception.
-     *
-     * @param string $filename
-     *
-     * @throws InvalidArgumentException
      */
-    public static function assertFile($filename)
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
index bee13e292..90c1992a3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
@@ -4,6 +4,8 @@ namespace PhpOffice\PhpSpreadsheet\Shared;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Font as FontStyle;
 
 class Font
 {
@@ -11,7 +13,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,
     ];
@@ -44,10 +46,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';
@@ -99,6 +101,122 @@ 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,
+        ],
+    ];
+
+    /**
+     * Array that can be used to supplement FONT_FILE_NAMES for calculating exact width.
+     *
+     * @var array
+     */
+    private static $extraFontArray = [];
+
+    public static function setExtraFontArray(array $extraFontArray): void
+    {
+        self::$extraFontArray = $extraFontArray;
+    }
+
+    public static function getExtraFontArray(): array
+    {
+        return self::$extraFontArray;
+    }
+
     /**
      * AutoSize method.
      *
@@ -111,68 +229,79 @@ class Font
      *
      * @var string
      */
-    private static $trueTypeFontPath = null;
+    private static $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],
         ],
     ];
 
+    /**
+     * List of column widths. Replaced by constant;
+     * previously it was public and updateable, allowing
+     * user to make inappropriate alterations.
+     *
+     * @deprecated 1.25.0 Use DEFAULT_COLUMN_WIDTHS constant instead.
+     *
+     * @var array
+     */
+    public static $defaultColumnWidths = self::DEFAULT_COLUMN_WIDTHS;
+
     /**
      * 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($method)
     {
-        if (!in_array($pValue, self::$autoSizeMethods)) {
+        if (!in_array($method, self::AUTOSIZE_METHODS)) {
             return false;
         }
-        self::$autoSizeMethod = $pValue;
+        self::$autoSizeMethod = $method;
 
         return true;
     }
@@ -196,11 +325,11 @@ class Font
      *        <li>~/.fonts/</li>
      * </ul>.
      *
-     * @param string $pValue
+     * @param string $folderPath
      */
-    public static function setTrueTypeFontPath($pValue)
+    public static function setTrueTypeFontPath($folderPath): void
     {
-        self::$trueTypeFontPath = $pValue;
+        self::$trueTypeFontPath = $folderPath;
     }
 
     /**
@@ -216,37 +345,50 @@ class Font
     /**
      * 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 = '',
+        $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")
+        $cellText = (string) $cellText;
         if (strpos($cellText, "\n") !== false) {
             $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;
@@ -256,40 +398,37 @@ class Font
         }
 
         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 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.
-     *
-     * @param string $text
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font
-     * @param int $rotation
-     *
-     * @throws PhpSpreadsheetException
-     *
-     * @return int
      */
-    public static function getTextWidthPixelsExact($text, \PhpOffice\PhpSpreadsheet\Style\Font $font, $rotation = 0)
+    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];
@@ -298,50 +437,50 @@ class Font
         $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 \PhpOffice\PhpSpreadsheet\Style\Font $font
      * @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($columnText, FontStyle $font, $rotation = 0)
     {
         $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;
         }
 
         // Calculate approximate rotated column width
         if ($rotation !== 0) {
-            if ($rotation == -165) {
+            if ($rotation == Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
                 // stacked text
                 $columnWidth = 4; // approximation
             } else {
@@ -394,183 +533,116 @@ class Font
     /**
      * 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)
     {
-        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();
+        $index = 'x';
+        if ($bold) {
+            $index .= 'b';
+        }
+        if ($italic) {
+            $index .= 'i';
+        }
+        $fontFile = $fontArray[$name][$index];
 
-        // 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;
+        $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::$trueTypeFontPath . $separator . $fontFile;
         }
 
-        $fontFile = self::$trueTypeFontPath . $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($fontName)
     {
-        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
      */
-    public static function getDefaultColumnWidthByFont(\PhpOffice\PhpSpreadsheet\Style\Font $font, $pPixels = false)
+    public static function getDefaultColumnWidthByFont(FontStyle $font, $returnAsPixels = false)
     {
-        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);
             }
         }
@@ -582,179 +654,20 @@ class Font
      * 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)
     {
-        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;
-                }
-
-                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;
-                }
-
-                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;
-                }
-
-                break;
-            default:
-                // just use Calibri as an approximation
-                $rowHeight = 15 * $font->getSize() / 11;
-
-                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;
         }
 
         return $rowHeight;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
new file mode 100644
index 000000000..060f09c88
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+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)
+    {
+        $iValue = (int) $value;
+
+        return ($value == $iValue) ? $iValue : $value;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT
deleted file mode 100644
index 1c18a5da3..000000000
--- a/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php
deleted file mode 100644
index 2b241d555..000000000
--- a/libraries/phpspreadsheet/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 $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->getArrayCopy();
-                $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
deleted file mode 100644
index ba59e0e5a..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
+++ /dev/null
@@ -1,861 +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;
-
-    /**
-     * Symmetric Householder reduction to tridiagonal form.
-     */
-    private function tred2()
-    {
-        //  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];
-        // 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 += pow($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()
-    {
-        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 = pow(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 += 1;
-                    // 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()
-    {
-        $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)
-    {
-        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()
-    {
-        //  Initialize
-        $nn = $this->n;
-        $n = $nn - 1;
-        $low = 0;
-        $high = $nn - 1;
-        $eps = pow(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) or ($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 mixed $Arg A Square matrix
-     */
-    public function __construct($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()
-    {
-        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
deleted file mode 100644
index bb2b4b040..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
+++ /dev/null
@@ -1,285 +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()
-    {
-        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()
-    {
-        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 array d matrix deterninat
-     */
-    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 mixed $B a Matrix with as many rows as A and any number of columns
-     *
-     * @throws CalculationException illegalArgumentException Matrix row dimensions must agree
-     * @throws CalculationException runtimeException  Matrix is singular
-     *
-     * @return Matrix X so that L*U*X = B(piv,:)
-     */
-    public function solve($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
deleted file mode 100644
index a67b6c2de..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ /dev/null
@@ -1,1233 +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 mixed Element (int/float/double)
-     */
-    public function get($i = null, $j = null)
-    {
-        return $this->A[$i][$j];
-    }
-
-    /**
-     * getMatrix.
-     *
-     *    Get a submatrix
-     *
-     * @param int $i0 Initial row index
-     * @param int $iF Final row index
-     * @param int $j0 Initial column index
-     * @param int $jF Final column index
-     *
-     * @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 mixed $c Int/float/double value
-     *
-     * @return mixed Element (int/float/double)
-     */
-    public function set($i = null, $j = null, $c = null)
-    {
-        // 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;
-    }
-
-    /**
-     * uminus.
-     *
-     *    Unary minus matrix -A
-     *
-     * @return Matrix Unary minus matrix
-     */
-    public function uminus()
-    {
-    }
-
-    /**
-     * plus.
-     *
-     *    A + B
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param Matrix $B Matrix 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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param Matrix $B Matrix 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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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
-     *
-     * @param mixed $n Matrix/Array/Scalar
-     *
-     * @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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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] = pow($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
-     *
-     * @param mixed $B Matrix/Array
-     *
-     * @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($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
deleted file mode 100644
index 3bb8a10ef..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
+++ /dev/null
@@ -1,249 +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($A)
-    {
-        if ($A instanceof Matrix) {
-            // 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;
-            }
-        } else {
-            throw new CalculationException(Matrix::ARGUMENT_TYPE_EXCEPTION);
-        }
-    }
-
-    //    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($B)
-    {
-        if ($B->getRowDimension() == $this->m) {
-            if ($this->isFullRank()) {
-                // Copy right hand side
-                $nx = $B->getColumnDimension();
-                $X = $B->getArrayCopy();
-                // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
deleted file mode 100644
index 3ca95619c..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
+++ /dev/null
@@ -1,528 +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->getArrayCopy();
-        $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 and ($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) and ($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) and ($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 = pow(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 and ($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 and ($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()
-    {
-        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 = pow(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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
deleted file mode 100644
index 68c386493..000000000
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
+++ /dev/null
@@ -1,30 +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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
index efa7522fa..c14afb2cd 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
@@ -21,6 +21,7 @@ namespace PhpOffice\PhpSpreadsheet\Shared;
 // +----------------------------------------------------------------------+
 //
 
+use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Shared\OLE\ChainedBlockStream;
 use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\Root;
@@ -38,8 +39,6 @@ $GLOBALS['_OLE_INSTANCES'] = [];
  *
  * @author   Xavier Noguer <xnoguer@php.net>
  * @author   Christian Schmidt <schmidt@php.net>
- *
- * @category   PhpSpreadsheet
  */
 class OLE
 {
@@ -111,17 +110,15 @@ class OLE
      *
      * @acces public
      *
-     * @param string $file
-     *
-     * @throws ReaderException
+     * @param string $filename
      *
      * @return bool true on success, PEAR_Error on failure
      */
-    public function read($file)
+    public function read($filename)
     {
-        $fh = fopen($file, 'r');
-        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;
 
@@ -135,55 +132,55 @@ class OLE
             throw new ReaderException('Only Little-Endian encoding is supported.');
         }
         // Size of blocks and short blocks in bytes
-        $this->bigBlockSize = pow(2, self::_readInt2($fh));
-        $this->smallBlockSize = pow(2, self::_readInt2($fh));
+        $this->bigBlockSize = 2 ** self::readInt2($fh);
+        $this->smallBlockSize = 2 ** self::readInt2($fh);
 
         // Skip UID, revision number and version number
         fseek($fh, 44);
         // Number of blocks in Big Block Allocation Table
-        $bbatBlockCount = self::_readInt4($fh);
+        $bbatBlockCount = self::readInt4($fh);
 
         // Root chain 1st block
-        $directoryFirstBlockId = self::_readInt4($fh);
+        $directoryFirstBlockId = self::readInt4($fh);
 
         // Skip unused bytes
         fseek($fh, 56);
         // Streams shorter than this are stored using small blocks
-        $this->bigBlockThreshold = self::_readInt4($fh);
+        $this->bigBlockThreshold = self::readInt4($fh);
         // Block id of first sector in Short Block Allocation Table
-        $sbatFirstBlockId = self::_readInt4($fh);
+        $sbatFirstBlockId = self::readInt4($fh);
         // Number of blocks in Short Block Allocation Table
-        $sbbatBlockCount = self::_readInt4($fh);
+        $sbbatBlockCount = self::readInt4($fh);
         // Block id of first sector in Master Block Allocation Table
-        $mbatFirstBlockId = self::_readInt4($fh);
+        $mbatFirstBlockId = self::readInt4($fh);
         // Number of blocks in Master Block Allocation Table
-        $mbbatBlockCount = self::_readInt4($fh);
+        $mbbatBlockCount = self::readInt4($fh);
         $this->bbat = [];
 
         // Remaining 4 * 109 bytes of current block is beginning of Master
         // Block Allocation Table
         $mbatBlocks = [];
         for ($i = 0; $i < 109; ++$i) {
-            $mbatBlocks[] = self::_readInt4($fh);
+            $mbatBlocks[] = self::readInt4($fh);
         }
 
         // Read rest of Master Block Allocation Table (if any is left)
-        $pos = $this->_getBlockOffset($mbatFirstBlockId);
+        $pos = $this->getBlockOffset($mbatFirstBlockId);
         for ($i = 0; $i < $mbbatBlockCount; ++$i) {
             fseek($fh, $pos);
             for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
-                $mbatBlocks[] = self::_readInt4($fh);
+                $mbatBlocks[] = self::readInt4($fh);
             }
             // Last block id in each block points to next block
-            $pos = $this->_getBlockOffset(self::_readInt4($fh));
+            $pos = $this->getBlockOffset(self::readInt4($fh));
         }
 
         // Read Big Block Allocation Table according to chain specified by $mbatBlocks
         for ($i = 0; $i < $bbatBlockCount; ++$i) {
-            $pos = $this->_getBlockOffset($mbatBlocks[$i]);
+            $pos = $this->getBlockOffset($mbatBlocks[$i]);
             fseek($fh, $pos);
             for ($j = 0; $j < $this->bigBlockSize / 4; ++$j) {
-                $this->bbat[] = self::_readInt4($fh);
+                $this->bbat[] = self::readInt4($fh);
             }
         }
 
@@ -192,11 +189,11 @@ class OLE
         $shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
         $sbatFh = $this->getStream($sbatFirstBlockId);
         for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
-            $this->sbat[$blockId] = self::_readInt4($sbatFh);
+            $this->sbat[$blockId] = self::readInt4($sbatFh);
         }
         fclose($sbatFh);
 
-        $this->_readPpsWks($directoryFirstBlockId);
+        $this->readPpsWks($directoryFirstBlockId);
 
         return true;
     }
@@ -206,7 +203,7 @@ class OLE
      *
      * @return int
      */
-    public function _getBlockOffset($blockId)
+    public function getBlockOffset($blockId)
     {
         return 512 + $blockId * $this->bigBlockSize;
     }
@@ -231,7 +228,8 @@ class OLE
         // in OLE_ChainedBlockStream::stream_open().
         // Object is removed from self::$instances in OLE_Stream::close().
         $GLOBALS['_OLE_INSTANCES'][] = $this;
-        $instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
+        $keys = array_keys($GLOBALS['_OLE_INSTANCES']);
+        $instanceId = end($keys);
 
         $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
         if ($blockIdOrPps instanceof OLE\PPS) {
@@ -241,19 +239,24 @@ class OLE
             $path .= '&blockId=' . $blockIdOrPps;
         }
 
-        return fopen($path, 'r');
+        $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
+     * @param resource $fileHandle file handle
      *
      * @return int
      */
-    private static function _readInt1($fh)
+    private static function readInt1($fileHandle)
     {
-        [, $tmp] = unpack('c', fread($fh, 1));
+        [, $tmp] = unpack('c', fread($fileHandle, 1) ?: '') ?: [0, 0];
 
         return $tmp;
     }
@@ -261,27 +264,34 @@ class OLE
     /**
      * Reads an unsigned short (2 octets).
      *
-     * @param resource $fh file handle
+     * @param resource $fileHandle file handle
      *
      * @return int
      */
-    private static function _readInt2($fh)
+    private static function readInt2($fileHandle)
     {
-        [, $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).
+     * Reads long (4 octets), interpreted as if signed on 32-bit system.
      *
-     * @param resource $fh file handle
+     * @param resource $fileHandle file handle
      *
      * @return int
      */
-    private static function _readInt4($fh)
+    private static function readInt4($fileHandle)
     {
-        [, $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;
     }
@@ -294,17 +304,17 @@ class OLE
      *
      * @return bool true on success, PEAR_Error on failure
      */
-    public function _readPpsWks($blockId)
+    public function readPpsWks($blockId)
     {
         $fh = $this->getStream($blockId);
         for ($pos = 0; true; $pos += 128) {
             fseek($fh, $pos, SEEK_SET);
-            $nameUtf16 = fread($fh, 64);
-            $nameLength = self::_readInt2($fh);
+            $nameUtf16 = (string) fread($fh, 64);
+            $nameLength = self::readInt2($fh);
             $nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
             // Simple conversion from UTF-16LE to ISO-8859-1
             $name = str_replace("\x00", '', $nameUtf16);
-            $type = self::_readInt1($fh);
+            $type = self::readInt1($fh);
             switch ($type) {
                 case self::OLE_PPS_TYPE_ROOT:
                     $pps = new OLE\PPS\Root(null, null, []);
@@ -320,24 +330,24 @@ class OLE
 
                     break;
                 default:
-                    break;
+                    throw new Exception('Unsupported PPS type');
             }
             fseek($fh, 1, SEEK_CUR);
             $pps->Type = $type;
             $pps->Name = $name;
-            $pps->PrevPps = self::_readInt4($fh);
-            $pps->NextPps = self::_readInt4($fh);
-            $pps->DirPps = self::_readInt4($fh);
+            $pps->PrevPps = self::readInt4($fh);
+            $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->startBlock = self::_readInt4($fh);
-            $pps->Size = self::_readInt4($fh);
+            $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);
             $this->_list[] = $pps;
 
             // check if the PPS tree (starting from root) is complete
-            if (isset($this->root) && $this->_ppsTreeComplete($this->root->No)) {
+            if (isset($this->root) && $this->ppsTreeComplete($this->root->No)) { //* @phpstan-ignore-line
                 break;
             }
         }
@@ -348,7 +358,7 @@ class OLE
             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];
@@ -371,16 +381,16 @@ class OLE
      *
      * @return bool Whether the PPS tree for the given PPS is complete
      */
-    public function _ppsTreeComplete($index)
+    private function ppsTreeComplete($index)
     {
         return isset($this->_list[$index]) &&
             ($pps = $this->_list[$index]) &&
             ($pps->PrevPps == -1 ||
-                $this->_ppsTreeComplete($pps->PrevPps)) &&
+                $this->ppsTreeComplete($pps->PrevPps)) &&
             ($pps->NextPps == -1 ||
-                $this->_ppsTreeComplete($pps->NextPps)) &&
+                $this->ppsTreeComplete($pps->NextPps)) &&
             ($pps->DirPps == -1 ||
-                $this->_ppsTreeComplete($pps->DirPps));
+                $this->ppsTreeComplete($pps->DirPps));
     }
 
     /**
@@ -447,7 +457,7 @@ class OLE
             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;
@@ -493,42 +503,33 @@ class OLE
      * Utility function
      * Returns a string for the OLE container with the date given.
      *
-     * @param int $date A timestamp
+     * @param float|int $date A timestamp
      *
      * @return string The string for the OLE container
      */
     public static function localDateToOLE($date)
     {
-        if (!isset($date)) {
+        if (!$date) {
             return "\x00\x00\x00\x00\x00\x00\x00\x00";
         }
-
-        // factor used for separating numbers into 4 bytes parts
-        $factor = pow(2, 32);
+        $dateTime = Date::dateTimeFromTimestamp("$date");
 
         // days from 1-1-1601 until the beggining of UNIX era
         $days = 134774;
         // calculate seconds
-        $big_date = $days * 24 * 3600 + gmmktime(date('H', $date), date('i', $date), date('s', $date), date('m', $date), date('d', $date), date('Y', $date));
+        $big_date = $days * 24 * 3600 + (float) $dateTime->format('U');
         // 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;
@@ -539,9 +540,7 @@ class OLE
      *
      * @param string $oleTimestamp A binary string with the encoded date
      *
-     * @throws ReaderException
-     *
-     * @return int The Unix timestamp corresponding to the string
+     * @return float|int The Unix timestamp corresponding to the string
      */
     public static function OLE2LocalDate($oleTimestamp)
     {
@@ -550,7 +549,7 @@ class OLE
         }
 
         // 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];
 
@@ -564,10 +563,6 @@ class OLE
         // translate to seconds since 1970:
         $unixTimestamp = floor(65536.0 * 65536.0 * $timestampHigh + $timestampLow - $days * 24 * 3600 + 0.5);
 
-        if ((int) $unixTimestamp == $unixTimestamp) {
-            return (int) $unixTimestamp;
-        }
-
-        return $unixTimestamp >= 0.0 ? PHP_INT_MAX : PHP_INT_MIN;
+        return IntOrFloat::evaluate($unixTimestamp);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
index e6ba72428..5d5babc3f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
@@ -6,10 +6,13 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE;
 
 class ChainedBlockStream
 {
+    /** @var mixed */
+    public $context;
+
     /**
      * The OLE container of the file that is being read.
      *
-     * @var OLE
+     * @var null|OLE
      */
     public $ole;
 
@@ -42,13 +45,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
     {
-        if ($mode != 'r') {
+        if ($mode[0] !== 'r') {
             if ($options & STREAM_REPORT_ERRORS) {
                 trigger_error('Only reading is supported', E_USER_WARNING);
             }
@@ -71,7 +74,7 @@ class ChainedBlockStream
         $this->data = '';
         if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->startBlock) {
             // Block id refers to small blocks
-            $rootPos = $this->ole->_getBlockOffset($this->ole->root->startBlock);
+            $rootPos = $this->ole->getBlockOffset($this->ole->root->startBlock);
             while ($blockId != -2) {
                 $pos = $rootPos + $blockId * $this->ole->bigBlockSize;
                 $blockId = $this->ole->sbat[$blockId];
@@ -81,7 +84,7 @@ class ChainedBlockStream
         } else {
             // Block id refers to big blocks
             while ($blockId != -2) {
-                $pos = $this->ole->_getBlockOffset($blockId);
+                $pos = $this->ole->getBlockOffset($blockId);
                 fseek($this->ole->_file_handle, $pos);
                 $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
                 $blockId = $this->ole->bbat[$blockId];
@@ -101,7 +104,7 @@ class ChainedBlockStream
     /**
      * Implements support for fclose().
      */
-    public function stream_close() // @codingStandardsIgnoreLine
+    public function stream_close(): void // @codingStandardsIgnoreLine
     {
         $this->ole = null;
         unset($GLOBALS['_OLE_INSTANCES']);
@@ -112,14 +115,14 @@ class ChainedBlockStream
      *
      * @param int $count maximum number of bytes to read
      *
-     * @return string
+     * @return false|string
      */
     public function stream_read($count) // @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;
@@ -160,7 +163,8 @@ class ChainedBlockStream
             $this->pos = $offset;
         } elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
             $this->pos += $offset;
-        } elseif ($whence == SEEK_END && -$offset <= count($this->data)) {
+            // @phpstan-ignore-next-line
+        } elseif ($whence == SEEK_END && -$offset <= count(/** @scrutinizer ignore-type */ $this->data)) {
             $this->pos = strlen($this->data) + $offset;
         } else {
             return false;
@@ -179,7 +183,7 @@ class ChainedBlockStream
     {
         return [
             'size' => strlen($this->data),
-            ];
+        ];
     }
 
     // Methods used by stream_wrapper_register() that are not implemented:
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
index e53f2575f..2740a1b6d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
@@ -26,8 +26,6 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE;
  * Class for creating PPS's for OLE containers.
  *
  * @author   Xavier Noguer <xnoguer@php.net>
- *
- * @category PhpSpreadsheet
  */
 class PPS
 {
@@ -76,21 +74,21 @@ class PPS
     /**
      * A timestamp.
      *
-     * @var int
+     * @var float|int
      */
     public $Time1st;
 
     /**
      * A timestamp.
      *
-     * @var int
+     * @var float|int
      */
     public $Time2nd;
 
     /**
      * Starting block (small or big) for this PPS's data  inside the container.
      *
-     * @var int
+     * @var ?int
      */
     public $startBlock;
 
@@ -106,7 +104,7 @@ class PPS
      *
      * @var string
      */
-    public $_data;
+    public $_data = '';
 
     /**
      * Array of child PPS's (only used by Root and Dir PPS's).
@@ -125,34 +123,30 @@ class PPS
     /**
      * 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 $time_1st A timestamp
-     * @param int $time_2nd A timestamp
-     * @param string $data The (usually binary) source data of the 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 array $children Array containing children PPS for this PPS
      */
     public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
     {
-        $this->No = $No;
-        $this->Name = $name;
-        $this->Type = $type;
-        $this->PrevPps = $prev;
-        $this->NextPps = $next;
-        $this->DirPps = $dir;
-        $this->Time1st = $time_1st;
-        $this->Time2nd = $time_2nd;
-        $this->_data = $data;
+        $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 = (string) $data;
         $this->children = $children;
-        if ($data != '') {
-            $this->Size = strlen($data);
-        } else {
-            $this->Size = 0;
-        }
+        $this->Size = strlen((string) $data);
     }
 
     /**
@@ -162,9 +156,9 @@ class PPS
      */
     public function getDataLen()
     {
-        if (!isset($this->_data)) {
-            return 0;
-        }
+        //if (!isset($this->_data)) {
+        //    return 0;
+        //}
 
         return strlen($this->_data);
     }
@@ -174,7 +168,7 @@ class PPS
      *
      * @return string The binary string
      */
-    public function _getPpsWk()
+    public function getPpsWk()
     {
         $ret = str_pad($this->Name, 64, "\x00");
 
@@ -191,9 +185,10 @@ class PPS
             . "\x00\x00\x00\x00"                  // 100
             . OLE::localDateToOLE($this->Time1st)          // 108
             . OLE::localDateToOLE($this->Time2nd)          // 116
-            . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
+            . pack('V', $this->startBlock ?? 0)  // 120
             . pack('V', $this->Size)               // 124
             . pack('V', 0); // 128
+
         return $ret;
     }
 
@@ -201,14 +196,14 @@ class PPS
      * Updates index and pointers to previous, next and children PPS's for this
      * PPS. I don't think it'll work with Dir PPS's.
      *
-     * @param array &$raList Reference to the array of PPS's for the whole OLE
+     * @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(&$raList, $to_save, $depth = 0)
     {
         if (!is_array($to_save) || (empty($to_save))) {
             return 0xFFFFFFFF;
@@ -219,18 +214,18 @@ class PPS
             $raList[$cnt]->No = $cnt;
             $raList[$cnt]->PrevPps = 0xFFFFFFFF;
             $raList[$cnt]->NextPps = 0xFFFFFFFF;
-            $raList[$cnt]->DirPps = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+            $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);
             // If the first entry, it's the root... Don't clone it!
             $raList[$cnt] = ($depth == 0) ? $to_save[$iPos] : clone $to_save[$iPos];
             $raList[$cnt]->No = $cnt;
-            $raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
-            $raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
-            $raList[$cnt]->DirPps = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+            $raList[$cnt]->PrevPps = self::savePpsSetPnt($raList, $aPrev, $depth++);
+            $raList[$cnt]->NextPps = self::savePpsSetPnt($raList, $aNext, $depth++);
+            $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
         }
 
         return $cnt;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
index 68f50a5c8..dd1cda2de 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
@@ -27,8 +27,6 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
  * Class for creating File PPS's for OLE containers.
  *
  * @author   Xavier Noguer <xnoguer@php.net>
- *
- * @category PhpSpreadsheet
  */
 class File extends PPS
 {
@@ -59,7 +57,7 @@ class File extends PPS
      *
      * @param string $data The data to append
      */
-    public function append($data)
+    public function append($data): void
     {
         $this->_data .= $data;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
index c52cea239..e1cbf8c90 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
@@ -22,53 +22,36 @@ namespace PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
 //
 use PhpOffice\PhpSpreadsheet\Shared\OLE;
 use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
-use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
 /**
  * Class for creating Root PPS's for OLE containers.
  *
  * @author   Xavier Noguer <xnoguer@php.net>
- *
- * @category PhpSpreadsheet
  */
 class Root extends PPS
 {
-    /**
-     * Directory for temporary files.
-     *
-     * @var string
-     */
-    protected $tempDirectory;
-
     /**
      * @var resource
      */
     private $fileHandle;
 
     /**
-     * @var string
-     */
-    private $tempFilename;
-
-    /**
-     * @var int
+     * @var ?int
      */
     private $smallBlockSize;
 
     /**
-     * @var int
+     * @var ?int
      */
     private $bigBlockSize;
 
     /**
-     * @param int $time_1st A timestamp
-     * @param int $time_2nd A timestamp
+     * @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)
     {
-        $this->tempDirectory = \PhpOffice\PhpSpreadsheet\Shared\File::sysGetTempDir();
-
         parent::__construct(null, OLE::ascToUcs('Root Entry'), OLE::OLE_PPS_TYPE_ROOT, null, null, null, $time_1st, $time_2nd, null, $raChild);
     }
 
@@ -79,62 +62,39 @@ class Root extends PPS
      * If a resource pointer to a stream created by fopen() is passed
      * it will be used, but you have to close such stream by yourself.
      *
-     * @param resource|string $filename the name of the file or stream where to save the OLE container
-     *
-     * @throws WriterException
+     * @param resource $fileHandle the name of the file or stream where to save the OLE container
      *
      * @return bool true on success
      */
-    public function save($filename)
+    public function save($fileHandle)
     {
-        // Initial Setting for saving
-        $this->bigBlockSize = pow(
-            2,
-            (isset($this->bigBlockSize)) ? self::adjust2($this->bigBlockSize) : 9
-        );
-        $this->smallBlockSize = pow(
-            2,
-            (isset($this->smallBlockSize)) ? self::adjust2($this->smallBlockSize) : 6
-        );
+        $this->fileHandle = $fileHandle;
+
+        // Initial Setting for saving
+        $this->bigBlockSize = (int) (2 ** (
+            (isset($this->bigBlockSize)) ? self::adjust2($this->bigBlockSize) : 9
+        ));
+        $this->smallBlockSize = (int) (2 ** (
+            (isset($this->smallBlockSize)) ? self::adjust2($this->smallBlockSize) : 6
+        ));
 
-        if (is_resource($filename)) {
-            $this->fileHandle = $filename;
-        } elseif ($filename == '-' || $filename == '') {
-            if ($this->tempDirectory === null) {
-                $this->tempDirectory = \PhpOffice\PhpSpreadsheet\Shared\File::sysGetTempDir();
-            }
-            $this->tempFilename = tempnam($this->tempDirectory, 'OLE_PPS_Root');
-            $this->fileHandle = fopen($this->tempFilename, 'w+b');
-            if ($this->fileHandle == false) {
-                throw new WriterException("Can't create temporary file.");
-            }
-        } else {
-            $this->fileHandle = fopen($filename, 'wb');
-        }
-        if ($this->fileHandle == false) {
-            throw new WriterException("Can't open $filename. It may be in use or protected.");
-        }
         // Make an array of PPS's (for Save)
         $aList = [];
-        PPS::_savePpsSetPnt($aList, [$this]);
+        PPS::savePpsSetPnt($aList, [$this]);
         // calculate values for header
-        [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->_calcSize($aList); //, $rhInfo);
+        [$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);
+        $this->_data = $this->makeSmallData($aList);
 
         // Write BB
-        $this->_saveBigData($iSBDcnt, $aList);
+        $this->saveBigData((int) $iSBDcnt, $aList);
         // Write PPS
-        $this->_savePps($aList);
+        $this->savePps($aList);
         // Write Big Block Depot and BDList and Adding Header informations
-        $this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
-
-        if (!is_resource($filename)) {
-            fclose($this->fileHandle);
-        }
+        $this->saveBbd((int) $iSBDcnt, (int) $iBBcnt, (int) $iPPScnt);
 
         return true;
     }
@@ -146,11 +106,10 @@ class Root extends PPS
      *
      * @return float[] The array of numbers
      */
-    public function _calcSize(&$raList)
+    private function calcSize(&$raList)
     {
         // Calculate Basic Setting
         [$iSBDcnt, $iBBcnt, $iPPScnt] = [0, 0, 0];
-        $iSmallLen = 0;
         $iSBcnt = 0;
         $iCount = count($raList);
         for ($i = 0; $i < $iCount; ++$i) {
@@ -158,7 +117,7 @@ class Root extends PPS
                 $raList[$i]->Size = $raList[$i]->getDataLen();
                 if ($raList[$i]->Size < OLE::OLE_DATA_SIZE_SMALL) {
                     $iSBcnt += floor($raList[$i]->Size / $this->smallBlockSize)
-                                  + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
+                        + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
                 } else {
                     $iBBcnt += (floor($raList[$i]->Size / $this->bigBlockSize) +
                         (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
@@ -169,7 +128,7 @@ class Root extends PPS
         $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));
+            (($iSmallLen % $this->bigBlockSize) ? 1 : 0));
         $iCnt = count($raList);
         $iBdCnt = $this->bigBlockSize / OLE::OLE_PPS_SIZE;
         $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
@@ -182,9 +141,9 @@ class Root extends PPS
      *
      * @param int $i2 The argument
      *
-     * @see save()
-     *
      * @return float
+     *
+     * @see save()
      */
     private static function adjust2($i2)
     {
@@ -200,7 +159,7 @@ class Root extends PPS
      * @param int $iBBcnt
      * @param int $iPPScnt
      */
-    public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
+    private function saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
     {
         $FILE = $this->fileHandle;
 
@@ -277,9 +236,9 @@ class Root extends PPS
      * 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
+     * @param array $raList Reference to array of PPS's
      */
-    public function _saveBigData($iStBlk, &$raList)
+    private function saveBigData($iStBlk, &$raList): void
     {
         $FILE = $this->fileHandle;
 
@@ -297,8 +256,8 @@ class Root extends PPS
                     // Set For PPS
                     $raList[$i]->startBlock = $iStBlk;
                     $iStBlk +=
-                            (floor($raList[$i]->Size / $this->bigBlockSize) +
-                                (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
+                        (floor($raList[$i]->Size / $this->bigBlockSize) +
+                            (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
                 }
             }
         }
@@ -307,11 +266,11 @@ class Root extends PPS
     /**
      * 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
+     * @param array $raList Reference to array of PPS's
      *
      * @return string
      */
-    public function _makeSmallData(&$raList)
+    private function makeSmallData(&$raList)
     {
         $sRes = '';
         $FILE = $this->fileHandle;
@@ -326,7 +285,7 @@ class Root extends PPS
                 }
                 if ($raList[$i]->Size < OLE::OLE_DATA_SIZE_SMALL) {
                     $iSmbCnt = floor($raList[$i]->Size / $this->smallBlockSize)
-                                  + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
+                        + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
                     // Add to SBD
                     $jB = $iSmbCnt - 1;
                     for ($j = 0; $j < $jB; ++$j) {
@@ -361,12 +320,12 @@ class Root extends PPS
      *
      * @param array $raList Reference to an array with all PPS's
      */
-    public function _savePps(&$raList)
+    private function savePps(&$raList): void
     {
         // Save each PPS WK
         $iC = count($raList);
         for ($i = 0; $i < $iC; ++$i) {
-            fwrite($this->fileHandle, $raList[$i]->_getPpsWk());
+            fwrite($this->fileHandle, $raList[$i]->getPpsWk());
         }
         // Adjust for Block
         $iCnt = count($raList);
@@ -383,7 +342,7 @@ class Root extends PPS
      * @param int $iBsize
      * @param int $iPpsCnt
      */
-    public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
+    private function saveBbd($iSbdSize, $iBsize, $iPpsCnt): void
     {
         $FILE = $this->fileHandle;
         // Calculate Basic Setting
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
index 3af397005..fcc963953 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
@@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 
 class OLERead
 {
+    /** @var string */
     private $data = '';
 
     // Size of a sector = 512 bytes
@@ -34,10 +35,13 @@ class OLERead
     const START_BLOCK_POS = 0x74;
     const SIZE_POS = 0x78;
 
+    /** @var int */
     public $wrkbook;
 
+    /** @var int */
     public $summaryInformation;
 
+    /** @var int */
     public $documentSummaryInformation;
 
     /**
@@ -92,27 +96,23 @@ class OLERead
 
     /**
      * Read the file.
-     *
-     * @param $pFilename string Filename
-     *
-     * @throws ReaderException
      */
-    public function read($pFilename)
+    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);
         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);
@@ -134,7 +134,7 @@ class OLERead
 
         $bbdBlocks = $this->numBigBlockDepotBlocks;
 
-        if ($this->numExtensionBlocks != 0) {
+        if ($this->numExtensionBlocks !== 0) {
             $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS) / 4;
         }
 
@@ -168,7 +168,6 @@ class OLERead
             $pos += 4 * $bbs;
         }
 
-        $pos = 0;
         $sbdBlock = $this->sbdStartBlock;
         $this->smallBlockChain = '';
         while ($sbdBlock != -2) {
@@ -182,7 +181,7 @@ class OLERead
 
         // read the directory stream
         $block = $this->rootStartBlock;
-        $this->entry = $this->_readData($block);
+        $this->entry = $this->readData($block);
 
         $this->readPropertySets();
     }
@@ -190,9 +189,9 @@ class OLERead
     /**
      * Extract binary stream data.
      *
-     * @param int $stream
+     * @param ?int $stream
      *
-     * @return string
+     * @return null|string
      */
     public function getStream($stream)
     {
@@ -203,7 +202,7 @@ class OLERead
         $streamData = '';
 
         if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
-            $rootdata = $this->_readData($this->props[$this->rootentry]['startBlock']);
+            $rootdata = $this->readData($this->props[$this->rootentry]['startBlock']);
 
             $block = $this->props[$stream]['startBlock'];
 
@@ -239,13 +238,12 @@ class OLERead
     /**
      * 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($block)
     {
-        $block = $bl;
         $data = '';
 
         while ($block != -2) {
@@ -260,7 +258,7 @@ class OLERead
     /**
      * Read entries in the directory stream.
      */
-    private function readPropertySets()
+    private function readPropertySets(): void
     {
         $offset = 0;
 
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
index 9b0080b9d..e9414f97e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
@@ -2,36 +2,108 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpException;
+use PhpOffice\PhpSpreadsheet\Worksheet\Protection;
+
 class PasswordHasher
 {
+    const MAX_PASSWORD_LENGTH = 255;
+
+    /**
+     * Get algorithm name for PHP.
+     */
+    private static function getAlgorithm(string $algorithmName): string
+    {
+        if (!$algorithmName) {
+            return '';
+        }
+
+        // Mapping between algorithm name in Excel and algorithm name in PHP
+        $mapping = [
+            Protection::ALGORITHM_MD2 => 'md2',
+            Protection::ALGORITHM_MD4 => 'md4',
+            Protection::ALGORITHM_MD5 => 'md5',
+            Protection::ALGORITHM_SHA_1 => 'sha1',
+            Protection::ALGORITHM_SHA_256 => 'sha256',
+            Protection::ALGORITHM_SHA_384 => 'sha384',
+            Protection::ALGORITHM_SHA_512 => 'sha512',
+            Protection::ALGORITHM_RIPEMD_128 => 'ripemd128',
+            Protection::ALGORITHM_RIPEMD_160 => 'ripemd160',
+            Protection::ALGORITHM_WHIRLPOOL => 'whirlpool',
+        ];
+
+        if (array_key_exists($algorithmName, $mapping)) {
+            return $mapping[$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
+     * Scrutinizer will squawk at the use of bitwise operations here,
+     * but it should ultimately pass.
+     *
+     * @param string $password Password to hash
+     */
+    private static function defaultHashPassword(string $password): string
+    {
+        $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;
+
+        return strtoupper(dechex($verifier));
+    }
+
+    /**
+     * Create a password hash from a given string by a specific algorithm.
+     *
+     * 2.4.2.4 ISO Write Protection Method
+     *
+     * @see https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-offcrypto/1357ea58-646e-4483-92ef-95d718079d6f
+     *
+     * @param string $password Password to hash
+     * @param string $algorithm Hash algorithm used to compute the password hash value
+     * @param string $salt Pseudorandom string
+     * @param int $spinCount Number of times to iterate on a hash of a password
      *
      * @return string Hashed password
      */
-    public static function hashPassword($pPassword)
+    public static function hashPassword(string $password, string $algorithm = '', string $salt = '', int $spinCount = 10000): 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);
+        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);
         }
 
-        $password ^= strlen($pPassword);
-        $password ^= 0xCE4B;
+        $saltValue = base64_decode($salt);
+        $encodedPassword = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
 
-        return strtoupper(dechex($password));
+        $hashValue = hash($phpAlgorithm, $saltValue . /** @scrutinizer ignore-type */ $encodedPassword, true);
+        for ($i = 0; $i < $spinCount; ++$i) {
+            $hashValue = hash($phpAlgorithm, $hashValue . pack('L', $i), true);
+        }
+
+        return base64_encode($hashValue);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
index d949203ba..c6c198e20 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -2,15 +2,8 @@
 
 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.
      *
@@ -28,14 +21,14 @@ class StringHelper
     /**
      * Decimal separator.
      *
-     * @var string
+     * @var ?string
      */
     private static $decimalSeparator;
 
     /**
      * Thousands separator.
      *
-     * @var string
+     * @var ?string
      */
     private static $thousandsSeparator;
 
@@ -49,7 +42,7 @@ class StringHelper
     /**
      * Is iconv extension avalable?
      *
-     * @var bool
+     * @var ?bool
      */
     private static $isIconvEnabled;
 
@@ -63,7 +56,7 @@ class StringHelper
     /**
      * Build control characters array.
      */
-    private static function buildControlCharacters()
+    private static function buildControlCharacters(): void
     {
         for ($i = 0; $i <= 31; ++$i) {
             if ($i != 9 && $i != 10 && $i != 13) {
@@ -77,7 +70,7 @@ class StringHelper
     /**
      * Build SYLK characters array.
      */
-    private static function buildSYLKCharacters()
+    private static function buildSYLKCharacters(): void
     {
         self::$SYLKCharacters = [
             "\x1B 0" => chr(0),
@@ -272,7 +265,7 @@ class StringHelper
         return self::$isIconvEnabled;
     }
 
-    private static function buildCharacterSets()
+    private static function buildCharacterSets(): void
     {
         if (empty(self::$controlCharacters)) {
             self::buildControlCharacters();
@@ -294,15 +287,15 @@ class StringHelper
      * 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
+     * @param string $textValue Value to unescape
      *
      * @return string
      */
-    public static function controlCharacterOOXML2PHP($value)
+    public static function controlCharacterOOXML2PHP($textValue)
     {
         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 +309,63 @@ class StringHelper
      * 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
+     * @param string $textValue Value to escape
      *
      * @return string
      */
-    public static function controlCharacterPHP2OOXML($value)
+    public static function controlCharacterPHP2OOXML($textValue)
     {
         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);
+        $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(/** @scrutinizer ignore-type */ $subst);
 
-            return $value;
-        }
+        return self::returnString($returnValue);
+    }
 
-        $value = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
-
-        return $value;
+    /**
+     * Strictly to satisfy Scrutinizer.
+     *
+     * @param mixed $value
+     */
+    private static function returnString($value): string
+    {
+        return is_string($value) ? $value : '';
     }
 
     /**
      * 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
+     * @param float|int|string $numericValue
      */
-    public static function formatNumber($value)
+    public static function formatNumber($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 +375,23 @@ class StringHelper
      * 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 string $textValue UTF-8 encoded string
      * @param mixed[] $arrcRuns Details of rich text runs in $value
-     *
-     * @return string
      */
-    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 +408,15 @@ class StringHelper
      * 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');
+        $ln = self::countCharacters($textValue, 'UTF-8');
 
         // characters
-        $chars = self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
+        $chars = self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
 
         return pack('vC', $ln, 0x0001) . $chars;
     }
@@ -436,111 +424,114 @@ class StringHelper
     /**
      * 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 self::returnString(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 character count using mb_strwidth rather than mb_strlen.
+     *
+     * @param string $encoding Encoding
+     *
+     * @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.
      *
-     * @param string $pValue UTF-8 encoded string
-     * @param int $pStart Start offset
-     * @param int $pLength Maximum number of characters in substring
-     *
-     * @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 +543,11 @@ class StringHelper
         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 +567,18 @@ class StringHelper
      * 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)
+    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 +598,18 @@ class StringHelper
      * 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)
+    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 +634,51 @@ class StringHelper
      * 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)
+    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 (strpos($textValue, '') === false) {
+            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
+     * @param string $textValue
      *
      * @return mixed string or only the leading numeric part of the string
      */
-    public static function testStringAsNumeric($value)
+    public static function testStringAsNumeric($textValue)
     {
-        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
index e5a99b9b6..324e3424d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
@@ -17,26 +17,26 @@ class TimeZone
     /**
      * 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());
+        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 +49,7 @@ class TimeZone
      *
      * @return string Timezone (e.g. 'Europe/London')
      */
-    public static function getTimeZone()
+    public static function getTimeZone(): string
     {
         return self::$timezone;
     }
@@ -58,30 +58,20 @@ class TimeZone
      *    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 int $timestamp PHP date/time value
-     *
-     * @throws PhpSpreadsheetException
+     * @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
     {
-        if ($timezone !== null) {
-            if (!self::validateTimezone($timezone)) {
-                throw new PhpSpreadsheetException('Invalid timezone ' . $timezone);
-            }
-        } else {
-            $timezone = self::$timezone;
+        $timezoneName = $timezoneName ?? self::$timezone;
+        $dtobj = Date::dateTimeFromTimestamp("$timestamp");
+        if (!self::validateTimeZone($timezoneName)) {
+            throw new PhpSpreadsheetException("Invalid timezone $timezoneName");
         }
+        $dtobj->setTimeZone(new DateTimeZone($timezoneName));
 
-        if ($timezone == 'UST') {
-            return 0;
-        }
-
-        $objTimezone = new DateTimeZone($timezone);
-        $transitions = $objTimezone->getTransitions($timestamp, $timestamp);
-
-        return (count($transitions) > 0) ? $transitions[0]['offset'] : 0;
+        return $dtobj->getOffset();
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
index d8e63d5e2..a8d7c93b7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
 
-class BestFit
+abstract class BestFit
 {
     /**
      * Indicator flag for a calculation error.
@@ -53,39 +53,55 @@ class BestFit
      */
     protected $yBestFitValues = [];
 
+    /** @var float */
     protected $goodnessOfFit = 1;
 
+    /** @var float */
     protected $stdevOfResiduals = 0;
 
+    /** @var float */
     protected $covariance = 0;
 
+    /** @var float */
     protected $correlation = 0;
 
+    /** @var float */
     protected $SSRegression = 0;
 
+    /** @var float */
     protected $SSResiduals = 0;
 
+    /** @var float */
     protected $DFResiduals = 0;
 
+    /** @var float */
     protected $f = 0;
 
+    /** @var float */
     protected $slope = 0;
 
+    /** @var float */
     protected $slopeSE = 0;
 
+    /** @var float */
     protected $intersect = 0;
 
+    /** @var float */
     protected $intersectSE = 0;
 
+    /** @var float */
     protected $xOffset = 0;
 
+    /** @var float */
     protected $yOffset = 0;
 
+    /** @return bool */
     public function getError()
     {
         return $this->error;
     }
 
+    /** @return string */
     public function getBestFitType()
     {
         return $this->bestFitType;
@@ -96,24 +112,18 @@ class BestFit
      *
      * @param float $xValue X-Value
      *
-     * @return bool Y-Value
+     * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
-    {
-        return false;
-    }
+    abstract public function getValueOfYForX($xValue);
 
     /**
      * Return the X-Value for a specified value of Y.
      *
      * @param float $yValue Y-Value
      *
-     * @return bool X-Value
+     * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
-    {
-        return false;
-    }
+    abstract public function getValueOfXForY($yValue);
 
     /**
      * Return the original set of X-Values.
@@ -130,12 +140,9 @@ class BestFit
      *
      * @param int $dp Number of places of decimal precision to display
      *
-     * @return bool
+     * @return string
      */
-    public function getEquation($dp = 0)
-    {
-        return false;
-    }
+    abstract public function getEquation($dp = 0);
 
     /**
      * Return the Slope of the line.
@@ -341,20 +348,42 @@ class BestFit
         return $this->yBestFitValues;
     }
 
-    protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const)
+    /** @var mixed */
+    private static $scrutinizerZeroPointZero = 0.0;
+
+    /**
+     * @param mixed $x
+     * @param mixed $y
+     */
+    private static function scrutinizerLooseCompare($x, $y): bool
     {
-        $SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
+        return $x == $y;
+    }
+
+    /**
+     * @param float $sumX
+     * @param float $sumY
+     * @param float $sumX2
+     * @param float $sumY2
+     * @param float $sumXY
+     * @param float $meanX
+     * @param float $meanY
+     * @param bool|int $const
+     */
+    protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const): void
+    {
+        $SSres = $SScov = $SStot = $SSsex = 0.0;
         foreach ($this->xValues as $xKey => $xValue) {
             $bestFitY = $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
 
             $SSres += ($this->yValues[$xKey] - $bestFitY) * ($this->yValues[$xKey] - $bestFitY);
-            if ($const) {
+            if ($const === true) {
                 $SStot += ($this->yValues[$xKey] - $meanY) * ($this->yValues[$xKey] - $meanY);
             } else {
                 $SStot += $this->yValues[$xKey] * $this->yValues[$xKey];
             }
             $SScov += ($this->xValues[$xKey] - $meanX) * ($this->yValues[$xKey] - $meanY);
-            if ($const) {
+            if ($const === true) {
                 $SSsex += ($this->xValues[$xKey] - $meanX) * ($this->xValues[$xKey] - $meanX);
             } else {
                 $SSsex += $this->xValues[$xKey] * $this->xValues[$xKey];
@@ -362,14 +391,15 @@ class BestFit
         }
 
         $this->SSResiduals = $SSres;
-        $this->DFResiduals = $this->valueCount - 1 - $const;
+        $this->DFResiduals = $this->valueCount - 1 - ($const === true ? 1 : 0);
 
         if ($this->DFResiduals == 0.0) {
             $this->stdevOfResiduals = 0.0;
         } else {
             $this->stdevOfResiduals = sqrt($SSres / $this->DFResiduals);
         }
-        if (($SStot == 0.0) || ($SSres == $SStot)) {
+        // Scrutinizer thinks $SSres == $SStot is always true. It is wrong.
+        if ($SStot == self::$scrutinizerZeroPointZero || self::scrutinizerLooseCompare($SSres, $SStot)) {
             $this->goodnessOfFit = 1;
         } else {
             $this->goodnessOfFit = 1 - ($SSres / $SStot);
@@ -377,7 +407,7 @@ class BestFit
 
         $this->SSRegression = $this->goodnessOfFit * $SStot;
         $this->covariance = $SScov / $this->valueCount;
-        $this->correlation = ($this->valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->valueCount * $sumX2 - pow($sumX, 2)) * ($this->valueCount * $sumY2 - pow($sumY, 2)));
+        $this->correlation = ($this->valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->valueCount * $sumX2 - $sumX ** 2) * ($this->valueCount * $sumY2 - $sumY ** 2));
         $this->slopeSE = $this->stdevOfResiduals / sqrt($SSsex);
         $this->intersectSE = $this->stdevOfResiduals * sqrt(1 / ($this->valueCount - ($sumX * $sumX) / $sumX2));
         if ($this->SSResiduals != 0.0) {
@@ -395,27 +425,40 @@ class BestFit
         }
     }
 
+    /** @return float|int */
+    private function sumSquares(array $values)
+    {
+        return array_sum(
+            array_map(
+                function ($value) {
+                    return $value ** 2;
+                },
+                $values
+            )
+        );
+    }
+
     /**
      * @param float[] $yValues
      * @param float[] $xValues
-     * @param bool $const
      */
-    protected function leastSquareFit(array $yValues, array $xValues, $const)
+    protected function leastSquareFit(array $yValues, array $xValues, bool $const): void
     {
         // calculate sums
-        $x_sum = array_sum($xValues);
-        $y_sum = array_sum($yValues);
-        $meanX = $x_sum / $this->valueCount;
-        $meanY = $y_sum / $this->valueCount;
-        $mBase = $mDivisor = $xx_sum = $xy_sum = $yy_sum = 0.0;
+        $sumValuesX = array_sum($xValues);
+        $sumValuesY = array_sum($yValues);
+        $meanValueX = $sumValuesX / $this->valueCount;
+        $meanValueY = $sumValuesY / $this->valueCount;
+        $sumSquaresX = $this->sumSquares($xValues);
+        $sumSquaresY = $this->sumSquares($yValues);
+        $mBase = $mDivisor = 0.0;
+        $xy_sum = 0.0;
         for ($i = 0; $i < $this->valueCount; ++$i) {
             $xy_sum += $xValues[$i] * $yValues[$i];
-            $xx_sum += $xValues[$i] * $xValues[$i];
-            $yy_sum += $yValues[$i] * $yValues[$i];
 
-            if ($const) {
-                $mBase += ($xValues[$i] - $meanX) * ($yValues[$i] - $meanY);
-                $mDivisor += ($xValues[$i] - $meanX) * ($xValues[$i] - $meanX);
+            if ($const === true) {
+                $mBase += ($xValues[$i] - $meanValueX) * ($yValues[$i] - $meanValueY);
+                $mDivisor += ($xValues[$i] - $meanValueX) * ($xValues[$i] - $meanValueX);
             } else {
                 $mBase += $xValues[$i] * $yValues[$i];
                 $mDivisor += $xValues[$i] * $xValues[$i];
@@ -426,13 +469,9 @@ class BestFit
         $this->slope = $mBase / $mDivisor;
 
         // calculate intersect
-        if ($const) {
-            $this->intersect = $meanY - ($this->slope * $meanX);
-        } else {
-            $this->intersect = 0;
-        }
+        $this->intersect = ($const === true) ? $meanValueY - ($this->slope * $meanValueX) : 0.0;
 
-        $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, $meanX, $meanY, $const);
+        $this->calculateGoodnessOfFit($sumValuesX, $sumValuesY, $sumSquaresX, $sumSquaresY, $xy_sum, $meanValueX, $meanValueY, $const);
     }
 
     /**
@@ -440,23 +479,22 @@ class BestFit
      *
      * @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($yValues, $xValues = [])
     {
         //    Calculate number of points
-        $nY = count($yValues);
-        $nX = count($xValues);
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
 
         //    Define X Values if necessary
-        if ($nX == 0) {
-            $xValues = range(1, $nY);
-        } elseif ($nY != $nX) {
+        if ($xValueCount === 0) {
+            $xValues = range(1, $yValueCount);
+        } elseif ($yValueCount !== $xValueCount) {
             //    Ensure both arrays of points are the same size
             $this->error = true;
         }
 
-        $this->valueCount = $nY;
+        $this->valueCount = $yValueCount;
         $this->xValues = $xValues;
         $this->yValues = $yValues;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
index 5b57f4b71..eb8cd746d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
@@ -21,7 +21,7 @@ class ExponentialBestFit extends BestFit
      */
     public function getValueOfYForX($xValue)
     {
-        return $this->getIntersect() * pow($this->getSlope(), ($xValue - $this->xOffset));
+        return $this->getIntersect() * $this->getSlope() ** ($xValue - $this->xOffset);
     }
 
     /**
@@ -88,20 +88,17 @@ class ExponentialBestFit extends BestFit
      *
      * @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
      */
-    private function exponentialRegression($yValues, $xValues, $const)
+    private function exponentialRegression(array $yValues, array $xValues, bool $const): void
     {
-        foreach ($yValues as &$value) {
-            if ($value < 0.0) {
-                $value = 0 - log(abs($value));
-            } elseif ($value > 0.0) {
-                $value = log($value);
-            }
-        }
-        unset($value);
+        $adjustedYValues = array_map(
+            function ($value) {
+                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
+            },
+            $yValues
+        );
 
-        $this->leastSquareFit($yValues, $xValues, $const);
+        $this->leastSquareFit($adjustedYValues, $xValues, $const);
     }
 
     /**
@@ -116,7 +113,7 @@ class ExponentialBestFit extends BestFit
         parent::__construct($yValues, $xValues);
 
         if (!$this->error) {
-            $this->exponentialRegression($yValues, $xValues, $const);
+            $this->exponentialRegression($yValues, $xValues, (bool) $const);
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
index 217f09647..65d6b4ff4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
@@ -56,9 +56,8 @@ class LinearBestFit extends BestFit
      *
      * @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
      */
-    private function linearRegression($yValues, $xValues, $const)
+    private function linearRegression(array $yValues, array $xValues, bool $const): void
     {
         $this->leastSquareFit($yValues, $xValues, $const);
     }
@@ -75,7 +74,7 @@ class LinearBestFit extends BestFit
         parent::__construct($yValues, $xValues);
 
         if (!$this->error) {
-            $this->linearRegression($yValues, $xValues, $const);
+            $this->linearRegression($yValues, $xValues, (bool) $const);
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
index 96ca2ed87..2366dc636 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
@@ -48,7 +48,7 @@ class LogarithmicBestFit extends BestFit
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
-        return 'Y = ' . $intersect . ' + ' . $slope . ' * log(X)';
+        return 'Y = ' . $slope . ' * log(' . $intersect . ' * X)';
     }
 
     /**
@@ -56,20 +56,17 @@ class LogarithmicBestFit extends BestFit
      *
      * @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
      */
-    private function logarithmicRegression($yValues, $xValues, $const)
+    private function logarithmicRegression(array $yValues, array $xValues, bool $const): void
     {
-        foreach ($xValues as &$value) {
-            if ($value < 0.0) {
-                $value = 0 - log(abs($value));
-            } elseif ($value > 0.0) {
-                $value = log($value);
-            }
-        }
-        unset($value);
+        $adjustedYValues = array_map(
+            function ($value) {
+                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
+            },
+            $yValues
+        );
 
-        $this->leastSquareFit($yValues, $xValues, $const);
+        $this->leastSquareFit($adjustedYValues, $xValues, $const);
     }
 
     /**
@@ -84,7 +81,7 @@ class LogarithmicBestFit extends BestFit
         parent::__construct($yValues, $xValues);
 
         if (!$this->error) {
-            $this->logarithmicRegression($yValues, $xValues, $const);
+            $this->logarithmicRegression($yValues, $xValues, (bool) $const);
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
index a1510491f..222a42300 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
@@ -2,8 +2,12 @@
 
 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
 {
     /**
@@ -42,9 +46,11 @@ class PolynomialBestFit extends BestFit
     {
         $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) {
-                $retVal += $value * pow($xValue, $key + 1);
+                $retVal += $value * $xValue ** ($key + 1);
             }
         }
 
@@ -76,6 +82,8 @@ class PolynomialBestFit extends BestFit
         $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) {
                 $equation .= ' + ' . $value . ' * X';
@@ -93,24 +101,34 @@ class PolynomialBestFit extends BestFit
      *
      * @param int $dp Number of places of decimal precision to display
      *
-     * @return string
+     * @return float
      */
     public function getSlope($dp = 0)
     {
         if ($dp != 0) {
             $coefficients = [];
+            // Scrutinizer is correct - $this->slope is float, not array.
+            //* @phpstan-ignore-next-line
             foreach ($this->slope as $coefficient) {
                 $coefficients[] = round($coefficient, $dp);
             }
 
+            // @phpstan-ignore-next-line
             return $coefficients;
         }
 
         return $this->slope;
     }
 
+    /**
+     * @param int $dp
+     *
+     * @return array
+     */
     public function getCoefficients($dp = 0)
     {
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
+        // @phpstan-ignore-next-line
         return array_merge([$this->getIntersect($dp)], $this->getSlope($dp));
     }
 
@@ -121,7 +139,7 @@ class PolynomialBestFit extends BestFit
      * @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)
+    private function polynomialRegression($order, $yValues, $xValues): void
     {
         // calculate sums
         $x_sum = array_sum($xValues);
@@ -144,7 +162,7 @@ class PolynomialBestFit extends BestFit
         $B = [];
         for ($i = 0; $i < $this->valueCount; ++$i) {
             for ($j = 0; $j <= $order; ++$j) {
-                $A[$i][$j] = pow($xValues[$i], $j);
+                $A[$i][$j] = $xValues[$i] ** $j;
             }
         }
         for ($i = 0; $i < $this->valueCount; ++$i) {
@@ -155,15 +173,17 @@ class PolynomialBestFit extends BestFit
         $C = $matrixA->solve($matrixB);
 
         $coefficients = [];
-        for ($i = 0; $i < $C->getRowDimension(); ++$i) {
-            $r = $C->get($i, 0);
-            if (abs($r) <= pow(10, -9)) {
+        for ($i = 0; $i < $C->rows; ++$i) {
+            $r = $C->getValue($i + 1, 1); // row and column are origin-1
+            if (abs($r) <= 10 ** (-9)) {
                 $r = 0;
             }
             $coefficients[] = $r;
         }
 
         $this->intersect = array_shift($coefficients);
+        // Phpstan (and maybe Scrutinizer) are correct
+        //* @phpstan-ignore-next-line
         $this->slope = $coefficients;
 
         $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, 0, 0, 0);
@@ -178,9 +198,8 @@ class PolynomialBestFit extends BestFit
      * @param int $order Order of Polynomial for this regression
      * @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($order, $yValues, $xValues = [], $const = true)
+    public function __construct($order, $yValues, $xValues = [])
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
index 4eefec826..cafd01158 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
@@ -21,7 +21,7 @@ class PowerBestFit extends BestFit
      */
     public function getValueOfYForX($xValue)
     {
-        return $this->getIntersect() * pow(($xValue - $this->xOffset), $this->getSlope());
+        return $this->getIntersect() * ($xValue - $this->xOffset) ** $this->getSlope();
     }
 
     /**
@@ -33,7 +33,7 @@ class PowerBestFit extends BestFit
      */
     public function getValueOfXForY($yValue)
     {
-        return pow((($yValue + $this->yOffset) / $this->getIntersect()), (1 / $this->getSlope()));
+        return (($yValue + $this->yOffset) / $this->getIntersect()) ** (1 / $this->getSlope());
     }
 
     /**
@@ -72,28 +72,23 @@ class PowerBestFit extends BestFit
      *
      * @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
      */
-    private function powerRegression($yValues, $xValues, $const)
+    private function powerRegression(array $yValues, array $xValues, bool $const): void
     {
-        foreach ($xValues as &$value) {
-            if ($value < 0.0) {
-                $value = 0 - log(abs($value));
-            } elseif ($value > 0.0) {
-                $value = log($value);
-            }
-        }
-        unset($value);
-        foreach ($yValues as &$value) {
-            if ($value < 0.0) {
-                $value = 0 - log(abs($value));
-            } elseif ($value > 0.0) {
-                $value = log($value);
-            }
-        }
-        unset($value);
+        $adjustedYValues = array_map(
+            function ($value) {
+                return ($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);
+            },
+            $xValues
+        );
 
-        $this->leastSquareFit($yValues, $xValues, $const);
+        $this->leastSquareFit($adjustedYValues, $adjustedXValues, $const);
     }
 
     /**
@@ -108,7 +103,7 @@ class PowerBestFit extends BestFit
         parent::__construct($yValues, $xValues);
 
         if (!$this->error) {
-            $this->powerRegression($yValues, $xValues, $const);
+            $this->powerRegression($yValues, $xValues, (bool) $const);
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
index 1b7b39010..117848c77 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
@@ -44,10 +44,18 @@ class Trend
     /**
      * Cached results for each method when trying to identify which provides the best fit.
      *
-     * @var bestFit[]
+     * @var BestFit[]
      */
     private static $trendCache = [];
 
+    /**
+     * @param string $trendType
+     * @param array $yValues
+     * @param array $xValues
+     * @param bool $const
+     *
+     * @return mixed
+     */
     public static function calculate($trendType = self::TREND_BEST_FIT, $yValues = [], $xValues = [], $const = true)
     {
         //    Calculate number of points in each dataset
@@ -55,10 +63,9 @@ class Trend
         $nX = count($xValues);
 
         //    Define X Values if necessary
-        if ($nX == 0) {
+        if ($nX === 0) {
             $xValues = range(1, $nY);
-            $nX = $nY;
-        } elseif ($nY != $nX) {
+        } elseif ($nY !== $nX) {
             //    Ensure both arrays of points are the same size
             trigger_error('Trend(): Number of elements in coordinate arrays do not match.', E_USER_ERROR);
         }
@@ -83,8 +90,8 @@ class Trend
             case self::TREND_POLYNOMIAL_5:
             case self::TREND_POLYNOMIAL_6:
                 if (!isset(self::$trendCache[$key])) {
-                    $order = substr($trendType, -1);
-                    self::$trendCache[$key] = new PolynomialBestFit($order, $yValues, $xValues, $const);
+                    $order = (int) substr($trendType, -1);
+                    self::$trendCache[$key] = new PolynomialBestFit($order, $yValues, $xValues);
                 }
 
                 return self::$trendCache[$key];
@@ -92,15 +99,18 @@ class Trend
             case self::TREND_BEST_FIT_NO_POLY:
                 //    If the request is to determine the best fit regression, then we test each Trend line in turn
                 //    Start by generating an instance of each available Trend method
+                $bestFit = [];
+                $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);
-                        $bestFit[$trendMethod] = new PolynomialBestFit($order, $yValues, $xValues, $const);
+                        $order = (int) substr($trendMethod, -1);
+                        $bestFit[$trendMethod] = new PolynomialBestFit($order, $yValues, $xValues);
                         if ($bestFit[$trendMethod]->getError()) {
                             unset($bestFit[$trendMethod]);
                         } else {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
index 4f7a6a06a..d9f403d7a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
@@ -2,8 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
 class XMLWriter extends \XMLWriter
 {
+    /** @var bool */
     public static $debugEnabled = false;
 
     /** Temporary storage method */
@@ -20,23 +23,23 @@ class XMLWriter extends \XMLWriter
     /**
      * 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($temporaryStorage = self::STORAGE_MEMORY, $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,11 +57,20 @@ class XMLWriter extends \XMLWriter
     public function __destruct()
     {
         // Unlink temporary files
+        // There is nothing reasonable to do if unlink fails.
         if ($this->tempFileName != '') {
+            /** @scrutinizer ignore-unhandled */
             @unlink($this->tempFileName);
         }
     }
 
+    public function __wakeup(): void
+    {
+        $this->tempFileName = '';
+
+        throw new SpreadsheetException('Unserialize not permitted');
+    }
+
     /**
      * Get written data.
      *
@@ -71,22 +83,22 @@ class XMLWriter extends \XMLWriter
         }
         $this->flush();
 
-        return file_get_contents($this->tempFileName);
+        return file_get_contents($this->tempFileName) ?: '';
     }
 
     /**
      * Wrapper method for writeRaw.
      *
-     * @param string|string[] $text
+     * @param null|string|string[] $rawTextData
      *
      * @return bool
      */
-    public function writeRawData($text)
+    public function writeRawData($rawTextData)
     {
-        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
index b8ce5e2da..a67583441 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
+++ b/libraries/phpspreadsheet/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,27 +13,27 @@ 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, $col = 'A')
     {
         // 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]) and $columnDimensions[$col]->getWidth() != -1) {
+        if (isset($columnDimensions[$col]) && $columnDimensions[$col]->getWidth() != -1) {
             // then we have column dimension with explicit width
             $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 {
@@ -41,7 +42,7 @@ class Xls
         }
 
         // now find the effective column width in pixels
-        if (isset($columnDimensions[$col]) and !$columnDimensions[$col]->getVisible()) {
+        if (isset($columnDimensions[$col]) && !$columnDimensions[$col]->getVisible()) {
             $effectivePixelWidth = 0;
         } else {
             $effectivePixelWidth = $pixelWidth;
@@ -55,50 +56,48 @@ class Xls
      * 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, $row = 1)
     {
         // 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]) and $rowDimensions[$row]->getRowHeight() != -1) {
+        if (isset($rowDimensions[$row]) && $rowDimensions[$row]->getRowHeight() != -1) {
             // then we have a row dimension
             $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
-        if (isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible()) {
+        if (isset($rowDimensions[$row]) && !$rowDimensions[$row]->getVisible()) {
             $effectivePixelRowHeight = 0;
         } else {
             $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 Worksheet $sheet
      * @param string $startColumn
      * @param int $startOffsetX Offset within start cell measured in 1/1024 of the cell width
      * @param string $endColumn
@@ -106,7 +105,7 @@ class Xls
      *
      * @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, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
     {
         $distanceX = 0;
 
@@ -114,14 +113,14 @@ class Xls
         $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,7 +129,6 @@ class Xls
      * Get the vertical distance in pixels between two anchors
      * The distanceY is found as sum of all the spanning rows minus two offsets.
      *
-     * @param Worksheet $sheet
      * @param int $startRow (1-based)
      * @param int $startOffsetY Offset within start cell measured in 1/256 of the cell height
      * @param int $endRow (1-based)
@@ -138,20 +136,20 @@ class Xls
      *
      * @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, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)
     {
         $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;
     }
@@ -200,19 +198,17 @@ class Xls
      *               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 array
+     * @return null|array
      */
-    public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height)
+    public static function oneAnchor2twoAnchor(Worksheet $worksheet, $coordinates, $offsetX, $offsetY, $width, $height)
     {
-        [$column, $row] = Coordinate::coordinateFromString($coordinates);
-        $col_start = Coordinate::columnIndexFromString($column);
+        [$col_start, $row] = Coordinate::indexesFromString($coordinates);
         $row_start = $row - 1;
 
         $x1 = $offsetX;
@@ -223,10 +219,10 @@ class Xls
         $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;
         }
 
@@ -234,37 +230,37 @@ class Xls
         $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) {
-            return;
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start)) == 0) {
+            return null;
         }
-        if (self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end)) == 0) {
-            return;
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end)) == 0) {
+            return null;
         }
-        if (self::sizeRow($sheet, $row_start + 1) == 0) {
-            return;
+        if (self::sizeRow($worksheet, $row_start + 1) == 0) {
+            return null;
         }
-        if (self::sizeRow($sheet, $row_end + 1) == 0) {
-            return;
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
index d33a98719..110908550 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
@@ -2,19 +2,27 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use JsonSerializable;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
 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';
     const VISIBILITY_HIDDEN = 'hidden';
     const VISIBILITY_VERY_HIDDEN = 'veryHidden';
 
-    private static $workbookViewVisibilityValues = [
+    private const DEFINED_NAME_IS_RANGE = false;
+    private const DEFINED_NAME_IS_FORMULA = true;
+
+    private const WORKBOOK_VIEW_VISIBILITY_VALUES = [
         self::VISIBILITY_VISIBLE,
         self::VISIBILITY_HIDDEN,
         self::VISIBILITY_VERY_HIDDEN,
@@ -51,7 +59,7 @@ class Spreadsheet
     /**
      * Calculation Engine.
      *
-     * @var Calculation
+     * @var null|Calculation
      */
     private $calculationEngine;
 
@@ -65,9 +73,9 @@ class Spreadsheet
     /**
      * Named ranges.
      *
-     * @var NamedRange[]
+     * @var DefinedName[]
      */
-    private $namedRanges = [];
+    private $definedNames = [];
 
     /**
      * CellXf supervisor.
@@ -100,21 +108,21 @@ class Spreadsheet
     /**
      * macrosCode : all macros code as binary data (the vbaProject.bin file, this include form, code,  etc.), null if no macro.
      *
-     * @var string
+     * @var null|string
      */
     private $macrosCode;
 
     /**
      * macrosCertificate : if macros are signed, contains binary data vbaProjectSignature.bin file, null if not signed.
      *
-     * @var string
+     * @var null|string
      */
     private $macrosCertificate;
 
     /**
      * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI.
      *
-     * @var null|string
+     * @var null|array{target: string, data: string}
      */
     private $ribbonXMLData;
 
@@ -195,6 +203,14 @@ class Spreadsheet
      */
     private $tabRatio = 600;
 
+    /** @var Theme */
+    private $theme;
+
+    public function getTheme(): Theme
+    {
+        return $this->theme;
+    }
+
     /**
      * The workbook has macros ?
      *
@@ -210,7 +226,7 @@ class Spreadsheet
      *
      * @param bool $hasMacros true|false
      */
-    public function setHasMacros($hasMacros)
+    public function setHasMacros($hasMacros): void
     {
         $this->hasMacros = (bool) $hasMacros;
     }
@@ -220,7 +236,7 @@ class Spreadsheet
      *
      * @param string $macroCode string|null
      */
-    public function setMacrosCode($macroCode)
+    public function setMacrosCode($macroCode): void
     {
         $this->macrosCode = $macroCode;
         $this->setHasMacros($macroCode !== null);
@@ -241,7 +257,7 @@ class Spreadsheet
      *
      * @param null|string $certificate
      */
-    public function setMacrosCertificate($certificate)
+    public function setMacrosCertificate($certificate): void
     {
         $this->macrosCertificate = $certificate;
     }
@@ -269,7 +285,7 @@ class Spreadsheet
     /**
      * Remove all macros, certificate from spreadsheet.
      */
-    public function discardMacros()
+    public function discardMacros(): void
     {
         $this->hasMacros = false;
         $this->macrosCode = null;
@@ -282,7 +298,7 @@ class Spreadsheet
      * @param null|mixed $target
      * @param null|mixed $xmlData
      */
-    public function setRibbonXMLData($target, $xmlData)
+    public function setRibbonXMLData($target, $xmlData): void
     {
         if ($target !== null && $xmlData !== null) {
             $this->ribbonXMLData = ['target' => $target, 'data' => $xmlData];
@@ -294,11 +310,9 @@ class Spreadsheet
     /**
      * retrieve ribbon XML Data.
      *
-     * return string|null|array
-     *
      * @param string $what
      *
-     * @return string
+     * @return null|array|string
      */
     public function getRibbonXMLData($what = 'all') //we need some constants here...
     {
@@ -311,7 +325,7 @@ class Spreadsheet
                 break;
             case 'target':
             case 'data':
-                if (is_array($this->ribbonXMLData) && isset($this->ribbonXMLData[$what])) {
+                if (is_array($this->ribbonXMLData)) {
                     $returnData = $this->ribbonXMLData[$what];
                 }
 
@@ -327,7 +341,7 @@ class Spreadsheet
      * @param null|mixed $BinObjectsNames
      * @param null|mixed $BinObjectsData
      */
-    public function setRibbonBinObjects($BinObjectsNames, $BinObjectsData)
+    public function setRibbonBinObjects($BinObjectsNames, $BinObjectsData): void
     {
         if ($BinObjectsNames !== null && $BinObjectsData !== null) {
             $this->ribbonBinObjects = ['names' => $BinObjectsNames, 'data' => $BinObjectsData];
@@ -354,10 +368,8 @@ class Spreadsheet
      * It has to be minimized when the library start to support currently unparsed data.
      *
      * @internal
-     *
-     * @param array $unparsedLoadedData
      */
-    public function setUnparsedLoadedData(array $unparsedLoadedData)
+    public function setUnparsedLoadedData(array $unparsedLoadedData): void
     {
         $this->unparsedLoadedData = $unparsedLoadedData;
     }
@@ -371,7 +383,9 @@ class Spreadsheet
      */
     private function getExtensionOnly($path)
     {
-        return pathinfo($path, PATHINFO_EXTENSION);
+        $extension = pathinfo($path, PATHINFO_EXTENSION);
+
+        return substr(/** @scrutinizer ignore-type */$extension, 0);
     }
 
     /**
@@ -388,8 +402,6 @@ class Spreadsheet
         switch ($what) {
             case 'all':
                 return $this->ribbonBinObjects;
-
-                break;
             case 'names':
             case 'data':
                 if (is_array($this->ribbonBinObjects) && isset($this->ribbonBinObjects[$what])) {
@@ -398,8 +410,10 @@ class Spreadsheet
 
                 break;
             case 'types':
-                if (is_array($this->ribbonBinObjects) &&
-                    isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])) {
+                if (
+                    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));
                 } else {
@@ -435,27 +449,27 @@ class Spreadsheet
     /**
      * Check if a sheet with a specified code name already exists.
      *
-     * @param string $pSheetCodeName Name of the worksheet to check
+     * @param string $codeName Name of the worksheet to check
      *
      * @return bool
      */
-    public function sheetCodeNameExists($pSheetCodeName)
+    public function sheetCodeNameExists($codeName)
     {
-        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
+     * @param string $codeName Sheet name
      *
-     * @return Worksheet
+     * @return null|Worksheet
      */
-    public function getSheetByCodeName($pName)
+    public function getSheetByCodeName($codeName)
     {
         $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];
             }
         }
@@ -470,6 +484,7 @@ class Spreadsheet
     {
         $this->uniqueID = uniqid('', true);
         $this->calculationEngine = new Calculation($this);
+        $this->theme = new Theme();
 
         // Initialise worksheet collection and add one worksheet
         $this->workSheetCollection = [];
@@ -482,8 +497,8 @@ class Spreadsheet
         // Create document security
         $this->security = new Document\Security();
 
-        // Set named ranges
-        $this->namedRanges = [];
+        // Set defined names
+        $this->definedNames = [];
 
         // Create the cellXf supervisor
         $this->cellXfSupervisor = new Style(true);
@@ -499,29 +514,29 @@ class Spreadsheet
      */
     public function __destruct()
     {
-        $this->calculationEngine = null;
         $this->disconnectWorksheets();
+        $this->calculationEngine = null;
+        $this->cellXfCollection = [];
+        $this->cellStyleXfCollection = [];
     }
 
     /**
      * Disconnect all worksheets from this PhpSpreadsheet workbook object,
      * typically so that the PhpSpreadsheet object can be unset.
      */
-    public function disconnectWorksheets()
+    public function disconnectWorksheets(): void
     {
-        $worksheet = null;
-        foreach ($this->workSheetCollection as $k => &$worksheet) {
+        foreach ($this->workSheetCollection as $worksheet) {
             $worksheet->disconnectCells();
-            $this->workSheetCollection[$k] = null;
+            unset($worksheet);
         }
-        unset($worksheet);
         $this->workSheetCollection = [];
     }
 
     /**
      * Return the calculation engine for this worksheet.
      *
-     * @return Calculation
+     * @return null|Calculation
      */
     public function getCalculationEngine()
     {
@@ -540,12 +555,10 @@ class Spreadsheet
 
     /**
      * Set properties.
-     *
-     * @param Document\Properties $pValue
      */
-    public function setProperties(Document\Properties $pValue)
+    public function setProperties(Document\Properties $documentProperties): void
     {
-        $this->properties = $pValue;
+        $this->properties = $documentProperties;
     }
 
     /**
@@ -560,19 +573,15 @@ class Spreadsheet
 
     /**
      * Set security.
-     *
-     * @param Document\Security $pValue
      */
-    public function setSecurity(Document\Security $pValue)
+    public function setSecurity(Document\Security $documentSecurity): void
     {
-        $this->security = $pValue;
+        $this->security = $documentSecurity;
     }
 
     /**
      * Get active sheet.
      *
-     * @throws Exception
-     *
      * @return Worksheet
      */
     public function getActiveSheet()
@@ -585,8 +594,6 @@ class Spreadsheet
      *
      * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
      *
-     * @throws Exception
-     *
      * @return Worksheet
      */
     public function createSheet($sheetIndex = null)
@@ -600,80 +607,78 @@ class Spreadsheet
     /**
      * Check if a sheet with a specified name already exists.
      *
-     * @param string $pSheetName Name of the worksheet to check
+     * @param string $worksheetName Name of the worksheet to check
      *
      * @return bool
      */
-    public function sheetNameExists($pSheetName)
+    public function sheetNameExists($worksheetName)
     {
-        return $this->getSheetByName($pSheetName) !== null;
+        return $this->getSheetByName($worksheetName) !== null;
     }
 
     /**
      * Add sheet.
      *
-     * @param Worksheet $pSheet
-     * @param null|int $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     *
-     * @throws Exception
+     * @param Worksheet $worksheet The worksheet to add
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
      *
      * @return Worksheet
      */
-    public function addSheet(Worksheet $pSheet, $iSheetIndex = null)
+    public function addSheet(Worksheet $worksheet, $sheetIndex = null)
     {
-        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 ($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
-     *
-     * @throws Exception
+     * @param int $sheetIndex Index position of the worksheet to remove
      */
-    public function removeSheetByIndex($pIndex)
+    public function removeSheetByIndex($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) &&
-            ($pIndex > count($this->workSheetCollection) - 1)) {
+        if (
+            ($this->activeSheetIndex >= $sheetIndex) &&
+            ($this->activeSheetIndex > 0 || $numSheets <= 1)
+        ) {
             --$this->activeSheetIndex;
         }
     }
@@ -681,23 +686,21 @@ class Spreadsheet
     /**
      * Get sheet by index.
      *
-     * @param int $pIndex Sheet index
-     *
-     * @throws Exception
+     * @param int $sheetIndex Sheet index
      *
      * @return Worksheet
      */
-    public function getSheet($pIndex)
+    public function getSheet($sheetIndex)
     {
-        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];
     }
 
     /**
@@ -713,15 +716,15 @@ class Spreadsheet
     /**
      * Get sheet by name.
      *
-     * @param string $pName Sheet name
+     * @param string $worksheetName Sheet name
      *
      * @return null|Worksheet
      */
-    public function getSheetByName($pName)
+    public function getSheetByName($worksheetName)
     {
         $worksheetCount = count($this->workSheetCollection);
         for ($i = 0; $i < $worksheetCount; ++$i) {
-            if ($this->workSheetCollection[$i]->getTitle() === trim($pName, "'")) {
+            if ($this->workSheetCollection[$i]->getTitle() === trim($worksheetName, "'")) {
                 return $this->workSheetCollection[$i];
             }
         }
@@ -729,19 +732,28 @@ class Spreadsheet
         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.
      *
-     * @param Worksheet $pSheet
-     *
-     * @throws Exception
-     *
      * @return int index
      */
-    public function getIndex(Worksheet $pSheet)
+    public function getIndex(Worksheet $worksheet)
     {
         foreach ($this->workSheetCollection as $key => $value) {
-            if ($value->getHashCode() == $pSheet->getHashCode()) {
+            if ($value->getHashCode() === $worksheet->getHashCode()) {
                 return $key;
             }
         }
@@ -752,29 +764,27 @@ class Spreadsheet
     /**
      * Set index for sheet by sheet name.
      *
-     * @param string $sheetName Sheet name to modify index for
-     * @param int $newIndex New index for the sheet
-     *
-     * @throws Exception
+     * @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($worksheetName, $newIndexPosition)
     {
-        $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;
     }
 
     /**
@@ -800,22 +810,20 @@ class Spreadsheet
     /**
      * Set active sheet index.
      *
-     * @param int $pIndex Active sheet index
-     *
-     * @throws Exception
+     * @param int $worksheetIndex Active sheet index
      *
      * @return Worksheet
      */
-    public function setActiveSheetIndex($pIndex)
+    public function setActiveSheetIndex($worksheetIndex)
     {
         $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();
     }
@@ -823,21 +831,19 @@ class Spreadsheet
     /**
      * Set active sheet index by name.
      *
-     * @param string $pValue Sheet title
-     *
-     * @throws Exception
+     * @param string $worksheetName Sheet title
      *
      * @return Worksheet
      */
-    public function setActiveSheetIndexByName($pValue)
+    public function setActiveSheetIndexByName($worksheetName)
     {
-        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);
     }
 
     /**
@@ -859,90 +865,204 @@ class Spreadsheet
     /**
      * 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)
-     *
-     * @throws Exception
+     * @param Worksheet $worksheet External sheet to add
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
      *
      * @return Worksheet
      */
-    public function addExternalSheet(Worksheet $pSheet, $iSheetIndex = null)
+    public function addExternalSheet(Worksheet $worksheet, $sheetIndex = null)
     {
-        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);
-    }
-
-    /**
-     * Get named ranges.
-     *
-     * @return NamedRange[]
-     */
-    public function getNamedRanges()
-    {
-        return $this->namedRanges;
-    }
-
-    /**
-     * Add named range.
-     *
-     * @param NamedRange $namedRange
-     *
-     * @return bool
-     */
-    public function addNamedRange(NamedRange $namedRange)
-    {
-        if ($namedRange->getScope() == null) {
-            // global scope
-            $this->namedRanges[$namedRange->getName()] = $namedRange;
-        } else {
-            // local scope
-            $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange;
+        // update the column dimensions Xfs
+        foreach ($worksheet->getColumnDimensions() as $columnDimension) {
+            $columnDimension->setXfIndex($columnDimension->getXfIndex() + $countCellXfs);
         }
 
-        return true;
+        // 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);
+    }
+
+    /**
+     * Get an array of all Named Ranges.
+     *
+     * @return DefinedName[]
+     */
+    public function getNamedRanges(): array
+    {
+        return array_filter(
+            $this->definedNames,
+            function (DefinedName $definedName) {
+                return $definedName->isFormula() === self::DEFINED_NAME_IS_RANGE;
+            }
+        );
+    }
+
+    /**
+     * Get an array of all Named Formulae.
+     *
+     * @return DefinedName[]
+     */
+    public function getNamedFormulae(): array
+    {
+        return array_filter(
+            $this->definedNames,
+            function (DefinedName $definedName) {
+                return $definedName->isFormula() === self::DEFINED_NAME_IS_FORMULA;
+            }
+        );
+    }
+
+    /**
+     * Get an array of all Defined Names (both named ranges and named formulae).
+     *
+     * @return DefinedName[]
+     */
+    public function getDefinedNames(): array
+    {
+        return $this->definedNames;
+    }
+
+    /**
+     * Add a named range.
+     * If a named range with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedRange(NamedRange $namedRange): void
+    {
+        $this->addDefinedName($namedRange);
+    }
+
+    /**
+     * Add a named formula.
+     * If a named formula with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedFormula(NamedFormula $namedFormula): void
+    {
+        $this->addDefinedName($namedFormula);
+    }
+
+    /**
+     * Add a defined name (either a named range or a named formula).
+     * If a defined named with this name already exists, then this will replace the existing value.
+     */
+    public function addDefinedName(DefinedName $definedName): void
+    {
+        $upperCaseName = StringHelper::strToUpper($definedName->getName());
+        if ($definedName->getScope() == null) {
+            // global scope
+            $this->definedNames[$upperCaseName] = $definedName;
+        } else {
+            // local scope
+            $this->definedNames[$definedName->getScope()->getTitle() . '!' . $upperCaseName] = $definedName;
+        }
     }
 
     /**
      * Get named range.
      *
-     * @param string $namedRange
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
-     *
-     * @return null|NamedRange
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
      */
-    public function getNamedRange($namedRange, Worksheet $pSheet = null)
+    public function getNamedRange(string $namedRange, ?Worksheet $worksheet = null): ?NamedRange
     {
         $returnValue = null;
 
-        if ($namedRange != '' && ($namedRange !== null)) {
+        if ($namedRange !== '') {
+            $namedRange = StringHelper::strToUpper($namedRange);
+            // 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, $worksheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedRange ? $returnValue : null;
+    }
+
+    /**
+     * Get named formula.
+     *
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
+     */
+    public function getNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): ?NamedFormula
+    {
+        $returnValue = null;
+
+        if ($namedFormula !== '') {
+            $namedFormula = StringHelper::strToUpper($namedFormula);
+            // 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, $worksheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedFormula ? $returnValue : null;
+    }
+
+    private function getGlobalDefinedNameByType(string $name, bool $type): ?DefinedName
+    {
+        if (isset($this->definedNames[$name]) && $this->definedNames[$name]->isFormula() === $type) {
+            return $this->definedNames[$name];
+        }
+
+        return null;
+    }
+
+    private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet $worksheet = null): ?DefinedName
+    {
+        if (
+            ($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $name])
+            && $this->definedNames[$worksheet->getTitle() . '!' . $name]->isFormula() === $type
+        ) {
+            return $this->definedNames[$worksheet->getTitle() . '!' . $name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get named range.
+     *
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
+     */
+    public function getDefinedName(string $definedName, ?Worksheet $worksheet = null): ?DefinedName
+    {
+        $returnValue = null;
+
+        if ($definedName !== '') {
+            $definedName = StringHelper::strToUpper($definedName);
             // first look for global defined name
-            if (isset($this->namedRanges[$namedRange])) {
-                $returnValue = $this->namedRanges[$namedRange];
+            if (isset($this->definedNames[$definedName])) {
+                $returnValue = $this->definedNames[$definedName];
             }
 
             // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange];
+            if (($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                $returnValue = $this->definedNames[$worksheet->getTitle() . '!' . $definedName];
             }
         }
 
@@ -952,20 +1072,55 @@ class Spreadsheet
     /**
      * Remove named range.
      *
-     * @param string $namedRange
-     * @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($namedRange, Worksheet $pSheet = null)
+    public function removeNamedRange(string $namedRange, ?Worksheet $worksheet = null): self
     {
-        if ($pSheet === null) {
-            if (isset($this->namedRanges[$namedRange])) {
-                unset($this->namedRanges[$namedRange]);
+        if ($this->getNamedRange($namedRange, $worksheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedRange, $worksheet);
+    }
+
+    /**
+     * Remove named formula.
+     *
+     * @param null|Worksheet $worksheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): self
+    {
+        if ($this->getNamedFormula($namedFormula, $worksheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedFormula, $worksheet);
+    }
+
+    /**
+     * Remove defined name.
+     *
+     * @param null|Worksheet $worksheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeDefinedName(string $definedName, ?Worksheet $worksheet = null): self
+    {
+        $definedName = StringHelper::strToUpper($definedName);
+
+        if ($worksheet === null) {
+            if (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
             }
         } else {
-            if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
+            if (isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                unset($this->definedNames[$worksheet->getTitle() . '!' . $definedName]);
+            } elseif (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
             }
         }
 
@@ -989,27 +1144,24 @@ class Spreadsheet
      */
     public function copy()
     {
-        $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()
     {
-        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.'
+        );
     }
 
     /**
@@ -1025,26 +1177,26 @@ class Spreadsheet
     /**
      * Get cellXf by index.
      *
-     * @param int $pIndex
+     * @param int $cellStyleIndex
      *
      * @return Style
      */
-    public function getCellXfByIndex($pIndex)
+    public function getCellXfByIndex($cellStyleIndex)
     {
-        return $this->cellXfCollection[$pIndex];
+        return $this->cellXfCollection[$cellStyleIndex];
     }
 
     /**
      * Get cellXf by hash code.
      *
-     * @param string $pValue
+     * @param string $hashcode
      *
      * @return false|Style
      */
-    public function getCellXfByHashCode($pValue)
+    public function getCellXfByHashCode($hashcode)
     {
         foreach ($this->cellXfCollection as $cellXf) {
-            if ($cellXf->getHashCode() == $pValue) {
+            if ($cellXf->getHashCode() === $hashcode) {
                 return $cellXf;
             }
         }
@@ -1055,20 +1207,16 @@ class Spreadsheet
     /**
      * Check if style exists in style collection.
      *
-     * @param Style $pCellStyle
-     *
      * @return bool
      */
-    public function cellXfExists($pCellStyle)
+    public function cellXfExists(Style $cellStyleIndex)
     {
-        return in_array($pCellStyle, $this->cellXfCollection, true);
+        return in_array($cellStyleIndex, $this->cellXfCollection, true);
     }
 
     /**
      * Get default style.
      *
-     * @throws Exception
-     *
      * @return Style
      */
     public function getDefaultStyle()
@@ -1082,10 +1230,8 @@ class Spreadsheet
 
     /**
      * Add a cellXf to the workbook.
-     *
-     * @param Style $style
      */
-    public function addCellXf(Style $style)
+    public function addCellXf(Style $style): void
     {
         $this->cellXfCollection[] = $style;
         $style->setIndex(count($this->cellXfCollection) - 1);
@@ -1094,28 +1240,26 @@ class Spreadsheet
     /**
      * Remove cellXf by index. It is ensured that all cells get their xf index updated.
      *
-     * @param int $pIndex Index to cellXf
-     *
-     * @throws Exception
+     * @param int $cellStyleIndex Index to cellXf
      */
-    public function removeCellXfByIndex($pIndex)
+    public function removeCellXfByIndex($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);
                 }
@@ -1146,26 +1290,26 @@ class Spreadsheet
     /**
      * Get cellStyleXf by index.
      *
-     * @param int $pIndex Index to cellXf
+     * @param int $cellStyleIndex Index to cellXf
      *
      * @return Style
      */
-    public function getCellStyleXfByIndex($pIndex)
+    public function getCellStyleXfByIndex($cellStyleIndex)
     {
-        return $this->cellStyleXfCollection[$pIndex];
+        return $this->cellStyleXfCollection[$cellStyleIndex];
     }
 
     /**
      * Get cellStyleXf by hash code.
      *
-     * @param string $pValue
+     * @param string $hashcode
      *
      * @return false|Style
      */
-    public function getCellStyleXfByHashCode($pValue)
+    public function getCellStyleXfByHashCode($hashcode)
     {
         foreach ($this->cellStyleXfCollection as $cellStyleXf) {
-            if ($cellStyleXf->getHashCode() == $pValue) {
+            if ($cellStyleXf->getHashCode() === $hashcode) {
                 return $cellStyleXf;
             }
         }
@@ -1175,35 +1319,31 @@ class Spreadsheet
 
     /**
      * Add a cellStyleXf to the workbook.
-     *
-     * @param Style $pStyle
      */
-    public function addCellStyleXf(Style $pStyle)
+    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
-     *
-     * @throws Exception
+     * @param int $cellStyleIndex Index to cellXf
      */
-    public function removeCellStyleXfByIndex($pIndex)
+    public function removeCellStyleXfByIndex($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);
     }
 
     /**
      * Eliminate all unneeded cellXf and afterwards update the xfIndex for all cells
      * and columns in the workbook.
      */
-    public function garbageCollect()
+    public function garbageCollect(): void
     {
         // how many references are there to each cellXf ?
         $countReferencesCellXf = [];
@@ -1234,6 +1374,7 @@ class Spreadsheet
         // remove cellXfs without references and create mapping so we can update xfIndex
         // for all cells and columns
         $countNeededCellXfs = 0;
+        $map = [];
         foreach ($this->cellXfCollection as $index => $cellXf) {
             if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we must never remove the first cellXf
                 ++$countNeededCellXfs;
@@ -1304,7 +1445,7 @@ class Spreadsheet
      *
      * @param bool $showHorizontalScroll True if horizonal scroll bar is visible
      */
-    public function setShowHorizontalScroll($showHorizontalScroll)
+    public function setShowHorizontalScroll($showHorizontalScroll): void
     {
         $this->showHorizontalScroll = (bool) $showHorizontalScroll;
     }
@@ -1324,7 +1465,7 @@ class Spreadsheet
      *
      * @param bool $showVerticalScroll True if vertical scroll bar is visible
      */
-    public function setShowVerticalScroll($showVerticalScroll)
+    public function setShowVerticalScroll($showVerticalScroll): void
     {
         $this->showVerticalScroll = (bool) $showVerticalScroll;
     }
@@ -1344,7 +1485,7 @@ class Spreadsheet
      *
      * @param bool $showSheetTabs True if sheet tabs are visible
      */
-    public function setShowSheetTabs($showSheetTabs)
+    public function setShowSheetTabs($showSheetTabs): void
     {
         $this->showSheetTabs = (bool) $showSheetTabs;
     }
@@ -1364,7 +1505,7 @@ class Spreadsheet
      *
      * @param bool $minimized true if workbook window is minimized
      */
-    public function setMinimized($minimized)
+    public function setMinimized($minimized): void
     {
         $this->minimized = (bool) $minimized;
     }
@@ -1386,7 +1527,7 @@ class Spreadsheet
      *
      * @param bool $autoFilterDateGrouping true if workbook window is minimized
      */
-    public function setAutoFilterDateGrouping($autoFilterDateGrouping)
+    public function setAutoFilterDateGrouping($autoFilterDateGrouping): void
     {
         $this->autoFilterDateGrouping = (bool) $autoFilterDateGrouping;
     }
@@ -1405,10 +1546,8 @@ class Spreadsheet
      * Set the first sheet in the book view.
      *
      * @param int $firstSheetIndex First sheet in book view
-     *
-     * @throws Exception  if the given value is invalid
      */
-    public function setFirstSheetIndex($firstSheetIndex)
+    public function setFirstSheetIndex($firstSheetIndex): void
     {
         if ($firstSheetIndex >= 0) {
             $this->firstSheetIndex = (int) $firstSheetIndex;
@@ -1443,17 +1582,15 @@ class Spreadsheet
      *       Workbook window is hidden and cannot be shown in the
      *       user interface.
      *
-     * @param string $visibility visibility status of the workbook
-     *
-     * @throws Exception  if the given value is invalid
+     * @param null|string $visibility visibility status of the workbook
      */
-    public function setVisibility($visibility)
+    public function setVisibility($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.');
@@ -1476,15 +1613,76 @@ class Spreadsheet
      * TabRatio is assumed to be out of 1000 of the horizontal window width.
      *
      * @param int $tabRatio Ratio between the tabs bar and the horizontal scroll bar
-     *
-     * @throws Exception  if the given value is invalid
      */
-    public function setTabRatio($tabRatio)
+    public function setTabRatio($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();
+            }
+        }
+    }
+
+    /**
+     * Silliness to mollify Scrutinizer.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getSharedComponent(): Style
+    {
+        return new Style();
+    }
+
+    /**
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function __serialize()
+    {
+        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);
+            }
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
index 5eb7c2b0f..68edfaca4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
+++ b/libraries/phpspreadsheet/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,30 +43,73 @@ 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;
     const READORDER_LTR = 1;
     const READORDER_RTL = 2;
 
+    // Special value for Text Rotation
+    const TEXTROTATION_STACK_EXCEL = 255;
+    const TEXTROTATION_STACK_PHPSPREADSHEET = -165; // 90 - 255
+
     /**
      * Horizontal alignment.
      *
-     * @var string
+     * @var null|string
      */
     protected $horizontal = self::HORIZONTAL_GENERAL;
 
     /**
      * Vertical alignment.
      *
-     * @var string
+     * @var null|string
      */
     protected $vertical = self::VERTICAL_BOTTOM;
 
     /**
      * Text rotation.
      *
-     * @var int
+     * @var null|int
      */
     protected $textRotation = 0;
 
@@ -107,7 +171,10 @@ class Alignment extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getAlignment();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getAlignment();
     }
 
     /**
@@ -136,38 +203,36 @@ class Alignment extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -177,7 +242,7 @@ class Alignment extends Supervisor
     /**
      * Get Horizontal.
      *
-     * @return string
+     * @return null|string
      */
     public function getHorizontal()
     {
@@ -191,21 +256,22 @@ class Alignment extends Supervisor
     /**
      * 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)
     {
-        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;
@@ -214,7 +280,7 @@ class Alignment extends Supervisor
     /**
      * Get Vertical.
      *
-     * @return string
+     * @return null|string
      */
     public function getVertical()
     {
@@ -228,21 +294,19 @@ class Alignment extends Supervisor
     /**
      * Set Vertical.
      *
-     * @param string $pValue see self::VERTICAL_*
+     * @param string $verticalAlignment see self::VERTICAL_*
      *
      * @return $this
      */
-    public function setVertical($pValue)
+    public function setVertical($verticalAlignment)
     {
-        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;
@@ -251,7 +315,7 @@ class Alignment extends Supervisor
     /**
      * Get TextRotation.
      *
-     * @return int
+     * @return null|int
      */
     public function getTextRotation()
     {
@@ -265,26 +329,24 @@ class Alignment extends Supervisor
     /**
      * Set TextRotation.
      *
-     * @param int $pValue
-     *
-     * @throws PhpSpreadsheetException
+     * @param int $angleInDegrees
      *
      * @return $this
      */
-    public function setTextRotation($pValue)
+    public function setTextRotation($angleInDegrees)
     {
         // Excel2007 value 255 => PhpSpreadsheet value -165
-        if ($pValue == 255) {
-            $pValue = -165;
+        if ($angleInDegrees == self::TEXTROTATION_STACK_EXCEL) {
+            $angleInDegrees = self::TEXTROTATION_STACK_PHPSPREADSHEET;
         }
 
         // Set rotation
-        if (($pValue >= -90 && $pValue <= 90) || $pValue == -165) {
+        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.');
@@ -310,20 +372,20 @@ class Alignment extends Supervisor
     /**
      * Set Wrap Text.
      *
-     * @param bool $pValue
+     * @param bool $wrapped
      *
      * @return $this
      */
-    public function setWrapText($pValue)
+    public function setWrapText($wrapped)
     {
-        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;
@@ -346,20 +408,20 @@ class Alignment extends Supervisor
     /**
      * Set Shrink to fit.
      *
-     * @param bool $pValue
+     * @param bool $shrink
      *
      * @return $this
      */
-    public function setShrinkToFit($pValue)
+    public function setShrinkToFit($shrink)
     {
-        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;
@@ -382,24 +444,27 @@ class Alignment extends Supervisor
     /**
      * Set indent.
      *
-     * @param int $pValue
+     * @param int $indent
      *
      * @return $this
      */
-    public function setIndent($pValue)
+    public function setIndent($indent)
     {
-        if ($pValue > 0) {
-            if ($this->getHorizontal() != self::HORIZONTAL_GENERAL &&
+        if ($indent > 0) {
+            if (
+                $this->getHorizontal() != self::HORIZONTAL_GENERAL &&
                 $this->getHorizontal() != self::HORIZONTAL_LEFT &&
-                $this->getHorizontal() != self::HORIZONTAL_RIGHT) {
-                $pValue = 0; // indent not supported
+                $this->getHorizontal() != self::HORIZONTAL_RIGHT &&
+                $this->getHorizontal() != self::HORIZONTAL_DISTRIBUTED
+            ) {
+                $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;
@@ -422,20 +487,20 @@ class Alignment extends Supervisor
     /**
      * Set read order.
      *
-     * @param int $pValue
+     * @param int $readOrder
      *
      * @return $this
      */
-    public function setReadOrder($pValue)
+    public function setReadOrder($readOrder)
     {
-        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;
@@ -463,4 +528,18 @@ class Alignment extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'horizontal', $this->getHorizontal());
+        $this->exportArray2($exportedArray, 'indent', $this->getIndent());
+        $this->exportArray2($exportedArray, 'readOrder', $this->getReadOrder());
+        $this->exportArray2($exportedArray, 'shrinkToFit', $this->getShrinkToFit());
+        $this->exportArray2($exportedArray, 'textRotation', $this->getTextRotation());
+        $this->exportArray2($exportedArray, 'vertical', $this->getVertical());
+        $this->exportArray2($exportedArray, 'wrapText', $this->getWrapText());
+
+        return $exportedArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
index 5fa0cae70..568e1e006 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
@@ -21,6 +21,7 @@ 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.
@@ -37,7 +38,7 @@ class Border extends Supervisor
     protected $color;
 
     /**
-     * @var int
+     * @var null|int
      */
     public $colorIndex;
 
@@ -47,11 +48,8 @@ class Border extends Supervisor
      * @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
-     * @param bool $isConditional Flag indicating if this is a conditional style or not
-     *                                    Leave this value at default unless you understand exactly what
-     *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct($isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -63,38 +61,38 @@ class Border extends Supervisor
         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.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getSharedComponent()
     {
-        switch ($this->parentPropertyName) {
-            case 'allBorders':
-            case 'horizontal':
-            case 'inside':
-            case 'outline':
-            case 'vertical':
-                throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.');
+        /** @var Style */
+        $parent = $this->parent;
 
-                break;
+        /** @var Borders $sharedComponent */
+        $sharedComponent = $parent->getSharedComponent();
+        switch ($this->parentPropertyName) {
             case 'bottom':
-                return $this->parent->getSharedComponent()->getBottom();
+                return $sharedComponent->getBottom();
             case 'diagonal':
-                return $this->parent->getSharedComponent()->getDiagonal();
+                return $sharedComponent->getDiagonal();
             case 'left':
-                return $this->parent->getSharedComponent()->getLeft();
+                return $sharedComponent->getLeft();
             case 'right':
-                return $this->parent->getSharedComponent()->getRight();
+                return $sharedComponent->getRight();
             case 'top':
-                return $this->parent->getSharedComponent()->getTop();
+                return $sharedComponent->getTop();
         }
+
+        throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.');
     }
 
     /**
@@ -106,7 +104,10 @@ class Border extends Supervisor
      */
     public function getStyleArray($array)
     {
-        return $this->parent->getStyleArray([$this->parentPropertyName => $array]);
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->/** @scrutinizer ignore-call */ getStyleArray([$this->parentPropertyName => $array]);
     }
 
     /**
@@ -123,22 +124,20 @@ class Border extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -162,24 +161,25 @@ class Border extends Supervisor
     /**
      * Set Border style.
      *
-     * @param bool|string $pValue
+     * @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($style)
     {
-        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;
@@ -198,16 +198,12 @@ class Border extends Supervisor
     /**
      * Set Border Color.
      *
-     * @param Color $pValue
-     *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setColor(Color $pValue)
+    public function setColor(Color $color)
     {
         // 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()]);
@@ -236,4 +232,13 @@ class Border extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'borderStyle', $this->getBorderStyle());
+        $this->exportArray2($exportedArray, 'color', $this->getColor());
+
+        return $exportedArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
index 8f005a998..a1247e859 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
@@ -95,11 +95,8 @@ class Borders extends Supervisor
      * @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
-     * @param bool $isConditional Flag indicating if this is a conditional style or not
-     *                                    Leave this value at default unless you understand exactly what
-     *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct($isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -115,11 +112,11 @@ class Borders extends Supervisor
         // 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');
@@ -143,7 +140,10 @@ class Borders extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getBorders();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getBorders();
     }
 
     /**
@@ -193,40 +193,38 @@ class Borders extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -286,8 +284,6 @@ class Borders extends Supervisor
     /**
      * Get AllBorders (pseudo-border). Only applies to supervisor.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getAllBorders()
@@ -302,8 +298,6 @@ class Borders extends Supervisor
     /**
      * Get Outline (pseudo-border). Only applies to supervisor.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getOutline()
@@ -318,8 +312,6 @@ class Borders extends Supervisor
     /**
      * Get Inside (pseudo-border). Only applies to supervisor.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getInside()
@@ -334,8 +326,6 @@ class Borders extends Supervisor
     /**
      * Get Vertical (pseudo-border). Only applies to supervisor.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getVertical()
@@ -350,8 +340,6 @@ class Borders extends Supervisor
     /**
      * Get Horizontal (pseudo-border). Only applies to supervisor.
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return Border
      */
     public function getHorizontal()
@@ -380,20 +368,20 @@ class Borders extends Supervisor
     /**
      * Set DiagonalDirection.
      *
-     * @param int $pValue see self::DIAGONAL_*
+     * @param int $direction see self::DIAGONAL_*
      *
      * @return $this
      */
-    public function setDiagonalDirection($pValue)
+    public function setDiagonalDirection($direction)
     {
-        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;
@@ -420,4 +408,17 @@ class Borders extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'bottom', $this->getBottom());
+        $this->exportArray2($exportedArray, 'diagonal', $this->getDiagonal());
+        $this->exportArray2($exportedArray, 'diagonalDirection', $this->getDiagonalDirection());
+        $this->exportArray2($exportedArray, 'left', $this->getLeft());
+        $this->exportArray2($exportedArray, 'right', $this->getRight());
+        $this->exportArray2($exportedArray, 'top', $this->getTop());
+
+        return $exportedArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
index ab22cbe32..282defc0c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
@@ -2,8 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-
 class Color extends Supervisor
 {
     const NAMED_COLORS = [
@@ -28,25 +26,98 @@ class Color extends Supervisor
     const COLOR_DARKGREEN = 'FF008000';
     const COLOR_YELLOW = 'FFFFFF00';
     const COLOR_DARKYELLOW = 'FF808000';
+    const COLOR_MAGENTA = 'FFFF00FF';
+    const COLOR_CYAN = 'FF00FFFF';
 
-    /**
-     * Indexed colors array.
-     *
-     * @var array
-     */
-    protected static $indexedColors;
+    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,
+    ];
+
+    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
+     * @var null|string
      */
     protected $argb;
 
+    /** @var bool */
+    private $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
@@ -54,14 +125,14 @@ 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($colorValue = self::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
     {
         //    Supervisor?
         parent::__construct($isSupervisor);
 
         //    Initialise values
         if (!$isConditional) {
-            $this->argb = $pARGB;
+            $this->argb = $this->validateColor($colorValue) ?: self::COLOR_BLACK;
         }
     }
 
@@ -73,14 +144,19 @@ class Color extends Supervisor
      */
     public function getSharedComponent()
     {
-        switch ($this->parentPropertyName) {
-            case 'endColor':
-                return $this->parent->getSharedComponent()->getEndColor();
-            case 'color':
-                return $this->parent->getSharedComponent()->getColor();
-            case 'startColor':
-                return $this->parent->getSharedComponent()->getStartColor();
+        /** @var Style */
+        $parent = $this->parent;
+        /** @var Border|Fill $sharedComponent */
+        $sharedComponent = $parent->getSharedComponent();
+        if ($sharedComponent instanceof Fill) {
+            if ($this->parentPropertyName === 'endColor') {
+                return $sharedComponent->getEndColor();
+            }
+
+            return $sharedComponent->getStartColor();
         }
+
+        return $sharedComponent->getColor();
     }
 
     /**
@@ -92,7 +168,10 @@ class Color extends Supervisor
      */
     public function getStyleArray($array)
     {
-        return $this->parent->getStyleArray([$this->parentPropertyName => $array]);
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->/** @scrutinizer ignore-call */ getStyleArray([$this->parentPropertyName => $array]);
     }
 
     /**
@@ -102,34 +181,49 @@ class Color extends Supervisor
      * $spreadsheet->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray(['rgb' => '808080']);
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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();
@@ -141,20 +235,23 @@ class Color extends Supervisor
     /**
      * 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)
     {
-        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;
@@ -162,234 +259,136 @@ class Color extends Supervisor
 
     /**
      * Get RGB.
-     *
-     * @return string
      */
-    public function getRGB()
+    public function getRGB(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getRGB();
         }
 
-        return substr($this->argb, 2);
+        return substr($this->argb ?? '', 2);
     }
 
     /**
      * 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)
     {
-        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 string The extracted colour component
+     * @return int|string The extracted colour component
      */
-    private static function getColourComponent($RGB, $offset, $hex = true)
+    private static function getColourComponent($rgbValue, $offset, $hex = true)
     {
-        $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 string The red colour component
+     * @return int|string The red colour component
      */
-    public static function getRed($RGB, $hex = true)
+    public static function getRed($rgbValue, $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 string The green colour component
+     * @return int|string The green colour component
      */
-    public static function getGreen($RGB, $hex = true)
+    public static function getGreen($rgbValue, $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 string The blue colour component
+     * @return int|string The blue colour component
      */
-    public static function getBlue($RGB, $hex = true)
+    public static function getBlue($rgbValue, $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($hexColourValue, $adjustPercentage)
     {
-        $rgba = (strlen($hex) === 8);
+        $rgba = (strlen($hexColourValue) === 8);
+        $adjustPercentage = max(-1.0, min(1.0, $adjustPercentage));
 
-        $red = self::getRed($hex, false);
-        $green = self::getGreen($hex, false);
-        $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;
-        }
+        /** @var int $red */
+        $red = self::getRed($hexColourValue, false);
+        /** @var int $green */
+        $green = self::getGreen($hexColourValue, false);
+        /** @var int $blue */
+        $blue = self::getBlue($hexColourValue, false);
 
-        if ($red < 0) {
-            $red = 0;
-        } elseif ($red > 255) {
-            $red = 255;
-        }
-        if ($green < 0) {
-            $green = 0;
-        } elseif ($green > 255) {
-            $green = 255;
-        }
-        if ($blue < 0) {
-            $blue = 0;
-        } elseif ($blue > 255) {
-            $blue = 255;
-        }
-
-        $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($colorIndex, $background = false, ?array $palette = null): self
     {
         // Clean parameter
-        $pIndex = (int) $pIndex;
+        $colorIndex = (int) $colorIndex;
 
-        // 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 (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]);
+            }
         }
 
-        if (isset(self::$indexedColors[$pIndex])) {
-            return new self(self::$indexedColors[$pIndex]);
-        }
-
-        if ($background) {
-            return new self(self::COLOR_WHITE);
-        }
-
-        return new self(self::COLOR_BLACK);
+        return ($background) ? new self(self::COLOR_WHITE) : new self(self::COLOR_BLACK);
     }
 
     /**
@@ -397,7 +396,7 @@ class Color extends Supervisor
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
@@ -408,4 +407,21 @@ class Color extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'argb', $this->getARGB());
+
+        return $exportedArray;
+    }
+
+    public function getHasChanged(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->hasChanged;
+        }
+
+        return $this->hasChanged;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
index ec8c858b0..36069b00c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
@@ -3,16 +3,44 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\IComparable;
+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_CONTAINSTEXT = 'containsText';
-    const CONDITION_EXPRESSION = 'expression';
     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_NOTCONTAINSBLANKS = 'notContainsBlanks';
+    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_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
     const OPERATOR_NONE = '';
@@ -27,6 +55,18 @@ class Conditional implements IComparable
     const OPERATOR_CONTAINSTEXT = 'containsText';
     const OPERATOR_NOTCONTAINS = 'notContains';
     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.
@@ -59,10 +99,15 @@ class Conditional implements IComparable
     /**
      * Condition.
      *
-     * @var string[]
+     * @var (bool|float|int|string)[]
      */
     private $condition = [];
 
+    /**
+     * @var ConditionalDataBar
+     */
+    private $dataBar;
+
     /**
      * Style.
      *
@@ -70,6 +115,9 @@ class Conditional implements IComparable
      */
     private $style;
 
+    /** @var bool */
+    private $noFormatSet = false;
+
     /**
      * Create a new Conditional.
      */
@@ -79,6 +127,18 @@ class Conditional implements IComparable
         $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.
      *
@@ -92,13 +152,13 @@ class Conditional implements IComparable
     /**
      * 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($type)
     {
-        $this->conditionType = $pValue;
+        $this->conditionType = $type;
 
         return $this;
     }
@@ -116,13 +176,13 @@ class Conditional implements IComparable
     /**
      * 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($type)
     {
-        $this->operatorType = $pValue;
+        $this->operatorType = $type;
 
         return $this;
     }
@@ -140,13 +200,13 @@ class Conditional implements IComparable
     /**
      * Set text.
      *
-     * @param string $value
+     * @param string $text
      *
      * @return $this
      */
-    public function setText($value)
+    public function setText($text)
     {
-        $this->text = $value;
+        $this->text = $text;
 
         return $this;
     }
@@ -164,13 +224,13 @@ class Conditional implements IComparable
     /**
      * Set StopIfTrue.
      *
-     * @param bool $value
+     * @param bool $stopIfTrue
      *
      * @return $this
      */
-    public function setStopIfTrue($value)
+    public function setStopIfTrue($stopIfTrue)
     {
-        $this->stopIfTrue = $value;
+        $this->stopIfTrue = $stopIfTrue;
 
         return $this;
     }
@@ -178,7 +238,7 @@ class Conditional implements IComparable
     /**
      * Get Conditions.
      *
-     * @return string[]
+     * @return (bool|float|int|string)[]
      */
     public function getConditions()
     {
@@ -188,16 +248,16 @@ class Conditional implements IComparable
     /**
      * Set Conditions.
      *
-     * @param string[] $pValue Condition
+     * @param (bool|float|int|string)[]|bool|float|int|string $conditions Condition
      *
      * @return $this
      */
-    public function setConditions($pValue)
+    public function setConditions($conditions)
     {
-        if (!is_array($pValue)) {
-            $pValue = [$pValue];
+        if (!is_array($conditions)) {
+            $conditions = [$conditions];
         }
-        $this->condition = $pValue;
+        $this->condition = $conditions;
 
         return $this;
     }
@@ -205,13 +265,13 @@ class Conditional implements IComparable
     /**
      * Add Condition.
      *
-     * @param string $pValue Condition
+     * @param bool|float|int|string $condition Condition
      *
      * @return $this
      */
-    public function addCondition($pValue)
+    public function addCondition($condition)
     {
-        $this->condition[] = $pValue;
+        $this->condition[] = $condition;
 
         return $this;
     }
@@ -229,13 +289,33 @@ class Conditional implements IComparable
     /**
      * Set Style.
      *
-     * @param Style $pValue
+     * @return $this
+     */
+    public function setStyle(Style $style)
+    {
+        $this->style = $style;
+
+        return $this;
+    }
+
+    /**
+     * get DataBar.
+     *
+     * @return null|ConditionalDataBar
+     */
+    public function getDataBar()
+    {
+        return $this->dataBar;
+    }
+
+    /**
+     * set DataBar.
      *
      * @return $this
      */
-    public function setStyle(Style $pValue = null)
+    public function setDataBar(ConditionalDataBar $dataBar)
     {
-        $this->style = $pValue;
+        $this->dataBar = $dataBar;
 
         return $this;
     }
@@ -270,4 +350,12 @@ class Conditional implements IComparable
             }
         }
     }
+
+    /**
+     * Verify if param is valid condition type.
+     */
+    public static function isValidConditionType(string $type): bool
+    {
+        return in_array($type, self::CONDITION_TYPES);
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
new file mode 100644
index 000000000..3e5f76049
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
@@ -0,0 +1,313 @@
+<?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",
+    ];
+
+    /**
+     * @var Cell
+     */
+    protected $cell;
+
+    /**
+     * @var int
+     */
+    protected $cellRow;
+
+    /**
+     * @var Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var int
+     */
+    protected $cellColumn;
+
+    /**
+     * @var string
+     */
+    protected $conditionalRange;
+
+    /**
+     * @var string
+     */
+    protected $referenceCell;
+
+    /**
+     * @var int
+     */
+    protected $referenceRow;
+
+    /**
+     * @var int
+     */
+    protected $referenceColumn;
+
+    /**
+     * @var Calculation
+     */
+    protected $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);
+
+        switch ($conditional->getConditionType()) {
+            case Conditional::CONDITION_CELLIS:
+                return $this->processOperatorComparison($conditional);
+            case Conditional::CONDITION_DUPLICATES:
+            case Conditional::CONDITION_UNIQUE:
+                return $this->processDuplicatesComparison($conditional);
+            case Conditional::CONDITION_CONTAINSTEXT:
+                // Expression is NOT(ISERROR(SEARCH("<TEXT>",<Cell Reference>)))
+            case Conditional::CONDITION_NOTCONTAINSTEXT:
+                // Expression is ISERROR(SEARCH("<TEXT>",<Cell Reference>))
+            case Conditional::CONDITION_BEGINSWITH:
+                // Expression is LEFT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            case Conditional::CONDITION_ENDSWITH:
+                // Expression is RIGHT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            case Conditional::CONDITION_CONTAINSBLANKS:
+                // Expression is LEN(TRIM(<Cell Reference>))=0
+            case Conditional::CONDITION_NOTCONTAINSBLANKS:
+                // Expression is LEN(TRIM(<Cell Reference>))>0
+            case Conditional::CONDITION_CONTAINSERRORS:
+                // Expression is ISERROR(<Cell Reference>)
+            case Conditional::CONDITION_NOTCONTAINSERRORS:
+                // Expression is NOT(ISERROR(<Cell Reference>))
+            case Conditional::CONDITION_TIMEPERIOD:
+                // 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())
+            case Conditional::CONDITION_EXPRESSION:
+                return $this->processExpression($conditional);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return float|int|string
+     */
+    protected function wrapValue($value)
+    {
+        if (!is_numeric($value)) {
+            if (is_bool($value)) {
+                return $value ? 'TRUE' : 'FALSE';
+            } elseif ($value === null) {
+                return 'NULL';
+            }
+
+            return '"' . $value . '"';
+        }
+
+        return $value;
+    }
+
+    /**
+     * @return float|int|string
+     */
+    protected function wrapCellValue()
+    {
+        return $this->wrapValue($this->cell->getCalculatedValue());
+    }
+
+    /**
+     * @return float|int|string
+     */
+    protected function conditionCellAdjustment(array $matches)
+    {
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (strpos($column, '$') === false) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->cellColumn - $this->referenceColumn;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (strpos($row, '$') === false) {
+            $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->getCalculatedValue())
+        );
+
+        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 $e) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
new file mode 100644
index 000000000..4c000db32
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class CellStyleAssessor
+{
+    /**
+     * @var CellMatcher
+     */
+    protected $cellMatcher;
+
+    /**
+     * @var StyleMerger
+     */
+    protected $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) {
+            /** @var Conditional $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
new file mode 100644
index 000000000..c5c36aeb3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalDataBar
+{
+    /** <dataBar> attribute  */
+
+    /** @var null|bool */
+    private $showValue;
+
+    /** <dataBar> children */
+
+    /** @var ?ConditionalFormatValueObject */
+    private $minimumConditionalFormatValueObject;
+
+    /** @var ?ConditionalFormatValueObject */
+    private $maximumConditionalFormatValueObject;
+
+    /** @var string */
+    private $color;
+
+    /** <extLst> */
+
+    /** @var ?ConditionalFormattingRuleExtension */
+    private $conditionalFormattingRuleExt;
+
+    /**
+     * @return null|bool
+     */
+    public function getShowValue()
+    {
+        return $this->showValue;
+    }
+
+    /**
+     * @param bool $showValue
+     */
+    public function setShowValue($showValue): self
+    {
+        $this->showValue = $showValue;
+
+        return $this;
+    }
+
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getColor(): string
+    {
+        return $this->color;
+    }
+
+    public function setColor(string $color): self
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
+    public function getConditionalFormattingRuleExt(): ?ConditionalFormattingRuleExtension
+    {
+        return $this->conditionalFormattingRuleExt;
+    }
+
+    public function setConditionalFormattingRuleExt(ConditionalFormattingRuleExtension $conditionalFormattingRuleExt): self
+    {
+        $this->conditionalFormattingRuleExt = $conditionalFormattingRuleExt;
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
new file mode 100644
index 000000000..780713866
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
@@ -0,0 +1,290 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalDataBarExtension
+{
+    /** <dataBar> attributes */
+
+    /** @var int */
+    private $minLength;
+
+    /** @var int */
+    private $maxLength;
+
+    /** @var null|bool */
+    private $border;
+
+    /** @var null|bool */
+    private $gradient;
+
+    /** @var string */
+    private $direction;
+
+    /** @var null|bool */
+    private $negativeBarBorderColorSameAsPositive;
+
+    /** @var string */
+    private $axisPosition;
+
+    // <dataBar> children
+
+    /** @var ConditionalFormatValueObject */
+    private $maximumConditionalFormatValueObject;
+
+    /** @var ConditionalFormatValueObject */
+    private $minimumConditionalFormatValueObject;
+
+    /** @var string */
+    private $borderColor;
+
+    /** @var string */
+    private $negativeFillColor;
+
+    /** @var string */
+    private $negativeBorderColor;
+
+    /** @var array */
+    private $axisColor = [
+        'rgb' => null,
+        'theme' => null,
+        'tint' => null,
+    ];
+
+    public function getXmlAttributes(): array
+    {
+        $ret = [];
+        foreach (['minLength', 'maxLength', 'direction', 'axisPosition'] as $attrKey) {
+            if (null !== $this->{$attrKey}) {
+                $ret[$attrKey] = $this->{$attrKey};
+            }
+        }
+        foreach (['border', 'gradient', 'negativeBarBorderColorSameAsPositive'] as $attrKey) {
+            if (null !== $this->{$attrKey}) {
+                $ret[$attrKey] = $this->{$attrKey} ? '1' : '0';
+            }
+        }
+
+        return $ret;
+    }
+
+    public function getXmlElements(): array
+    {
+        $ret = [];
+        $elms = ['borderColor', 'negativeFillColor', 'negativeBorderColor'];
+        foreach ($elms as $elmKey) {
+            if (null !== $this->{$elmKey}) {
+                $ret[$elmKey] = ['rgb' => $this->{$elmKey}];
+            }
+        }
+        foreach (array_filter($this->axisColor) as $attrKey => $axisColorAttr) {
+            if (!isset($ret['axisColor'])) {
+                $ret['axisColor'] = [];
+            }
+            $ret['axisColor'][$attrKey] = $axisColorAttr;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMinLength()
+    {
+        return $this->minLength;
+    }
+
+    public function setMinLength(int $minLength): self
+    {
+        $this->minLength = $minLength;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMaxLength()
+    {
+        return $this->maxLength;
+    }
+
+    public function setMaxLength(int $maxLength): self
+    {
+        $this->maxLength = $maxLength;
+
+        return $this;
+    }
+
+    /**
+     * @return null|bool
+     */
+    public function getBorder()
+    {
+        return $this->border;
+    }
+
+    public function setBorder(bool $border): self
+    {
+        $this->border = $border;
+
+        return $this;
+    }
+
+    /**
+     * @return null|bool
+     */
+    public function getGradient()
+    {
+        return $this->gradient;
+    }
+
+    public function setGradient(bool $gradient): self
+    {
+        $this->gradient = $gradient;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDirection()
+    {
+        return $this->direction;
+    }
+
+    public function setDirection(string $direction): self
+    {
+        $this->direction = $direction;
+
+        return $this;
+    }
+
+    /**
+     * @return null|bool
+     */
+    public function getNegativeBarBorderColorSameAsPositive()
+    {
+        return $this->negativeBarBorderColorSameAsPositive;
+    }
+
+    public function setNegativeBarBorderColorSameAsPositive(bool $negativeBarBorderColorSameAsPositive): self
+    {
+        $this->negativeBarBorderColorSameAsPositive = $negativeBarBorderColorSameAsPositive;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAxisPosition()
+    {
+        return $this->axisPosition;
+    }
+
+    public function setAxisPosition(string $axisPosition): self
+    {
+        $this->axisPosition = $axisPosition;
+
+        return $this;
+    }
+
+    /**
+     * @return ConditionalFormatValueObject
+     */
+    public function getMaximumConditionalFormatValueObject()
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    /**
+     * @return ConditionalFormatValueObject
+     */
+    public function getMinimumConditionalFormatValueObject()
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBorderColor()
+    {
+        return $this->borderColor;
+    }
+
+    public function setBorderColor(string $borderColor): self
+    {
+        $this->borderColor = $borderColor;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNegativeFillColor()
+    {
+        return $this->negativeFillColor;
+    }
+
+    public function setNegativeFillColor(string $negativeFillColor): self
+    {
+        $this->negativeFillColor = $negativeFillColor;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNegativeBorderColor()
+    {
+        return $this->negativeBorderColor;
+    }
+
+    public function setNegativeBorderColor(string $negativeBorderColor): self
+    {
+        $this->negativeBorderColor = $negativeBorderColor;
+
+        return $this;
+    }
+
+    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
+    {
+        $this->axisColor = [
+            'rgb' => $rgb,
+            'theme' => $theme,
+            'tint' => $tint,
+        ];
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
new file mode 100644
index 000000000..4c1344462
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalFormatValueObject
+{
+    /** @var mixed */
+    private $type;
+
+    /** @var mixed */
+    private $value;
+
+    /** @var mixed */
+    private $cellFormula;
+
+    /**
+     * ConditionalFormatValueObject constructor.
+     *
+     * @param mixed $type
+     * @param mixed $value
+     * @param null|mixed $cellFormula
+     */
+    public function __construct($type, $value = null, $cellFormula = null)
+    {
+        $this->type = $type;
+        $this->value = $value;
+        $this->cellFormula = $cellFormula;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param mixed $type
+     */
+    public function setType($type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public function setValue($value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCellFormula()
+    {
+        return $this->cellFormula;
+    }
+
+    /**
+     * @param mixed $cellFormula
+     */
+    public function setCellFormula($cellFormula): self
+    {
+        $this->cellFormula = $cellFormula;
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
new file mode 100644
index 000000000..0cdbc3685
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use SimpleXMLElement;
+
+class ConditionalFormattingRuleExtension
+{
+    const CONDITION_EXTENSION_DATABAR = 'dataBar';
+
+    /** <conditionalFormatting> attributes */
+
+    /** @var string */
+    private $id;
+
+    /** @var string Conditional Formatting Rule */
+    private $cfRule;
+
+    /** <conditionalFormatting> children */
+
+    /** @var ConditionalDataBarExtension */
+    private $dataBar;
+
+    /** @var string Sequence of References */
+    private $sqref;
+
+    /**
+     * ConditionalFormattingRuleExtension constructor.
+     */
+    public function __construct(?string $id = null, string $cfRule = self::CONDITION_EXTENSION_DATABAR)
+    {
+        if (null === $id) {
+            $this->id = '{' . $this->generateUuid() . '}';
+        } else {
+            $this->id = $id;
+        }
+        $this->cfRule = $cfRule;
+    }
+
+    private function generateUuid(): string
+    {
+        $chars = str_split('xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx');
+
+        foreach ($chars as $i => $char) {
+            if ($char === 'x') {
+                $chars[$i] = dechex(random_int(0, 15));
+            } elseif ($char === 'y') {
+                $chars[$i] = dechex(random_int(8, 11));
+            }
+        }
+
+        return implode('', /** @scrutinizer ignore-type */ $chars);
+    }
+
+    public static function parseExtLstXml(?SimpleXMLElement $extLstXml): array
+    {
+        $conditionalFormattingRuleExtensions = [];
+        $conditionalFormattingRuleExtensionXml = null;
+        if ($extLstXml instanceof SimpleXMLElement) {
+            foreach ((count($extLstXml) > 0 ? $extLstXml : [$extLstXml]) as $extLst) {
+                //this uri is conditionalFormattings
+                //https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
+                if (isset($extLst->ext['uri']) && (string) $extLst->ext['uri'] === '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+                    $conditionalFormattingRuleExtensionXml = $extLst->ext;
+                }
+            }
+
+            if ($conditionalFormattingRuleExtensionXml) {
+                $ns = $conditionalFormattingRuleExtensionXml->getNamespaces(true);
+                $extFormattingsXml = $conditionalFormattingRuleExtensionXml->children($ns['x14']);
+
+                foreach ($extFormattingsXml->children($ns['x14']) as $extFormattingXml) {
+                    $extCfRuleXml = $extFormattingXml->cfRule;
+                    $attributes = $extCfRuleXml->attributes();
+                    if (!$attributes || ((string) $attributes->type) !== Conditional::CONDITION_DATABAR) {
+                        continue;
+                    }
+
+                    $extFormattingRuleObj = new self((string) $attributes->id);
+                    $extFormattingRuleObj->setSqref((string) $extFormattingXml->children($ns['xm'])->sqref);
+                    $conditionalFormattingRuleExtensions[$extFormattingRuleObj->getId()] = $extFormattingRuleObj;
+
+                    $extDataBarObj = new ConditionalDataBarExtension();
+                    $extFormattingRuleObj->setDataBarExt($extDataBarObj);
+                    $dataBarXml = $extCfRuleXml->dataBar;
+                    self::parseExtDataBarAttributesFromXml($extDataBarObj, $dataBarXml);
+                    self::parseExtDataBarElementChildrenFromXml($extDataBarObj, $dataBarXml, $ns);
+                }
+            }
+        }
+
+        return $conditionalFormattingRuleExtensions;
+    }
+
+    private static function parseExtDataBarAttributesFromXml(
+        ConditionalDataBarExtension $extDataBarObj,
+        SimpleXMLElement $dataBarXml
+    ): void {
+        $dataBarAttribute = $dataBarXml->attributes();
+        if ($dataBarAttribute === null) {
+            return;
+        }
+        if ($dataBarAttribute->minLength) {
+            $extDataBarObj->setMinLength((int) $dataBarAttribute->minLength);
+        }
+        if ($dataBarAttribute->maxLength) {
+            $extDataBarObj->setMaxLength((int) $dataBarAttribute->maxLength);
+        }
+        if ($dataBarAttribute->border) {
+            $extDataBarObj->setBorder((bool) (string) $dataBarAttribute->border);
+        }
+        if ($dataBarAttribute->gradient) {
+            $extDataBarObj->setGradient((bool) (string) $dataBarAttribute->gradient);
+        }
+        if ($dataBarAttribute->direction) {
+            $extDataBarObj->setDirection((string) $dataBarAttribute->direction);
+        }
+        if ($dataBarAttribute->negativeBarBorderColorSameAsPositive) {
+            $extDataBarObj->setNegativeBarBorderColorSameAsPositive((bool) (string) $dataBarAttribute->negativeBarBorderColorSameAsPositive);
+        }
+        if ($dataBarAttribute->axisPosition) {
+            $extDataBarObj->setAxisPosition((string) $dataBarAttribute->axisPosition);
+        }
+    }
+
+    /** @param array|SimpleXMLElement $ns */
+    private static function parseExtDataBarElementChildrenFromXml(ConditionalDataBarExtension $extDataBarObj, SimpleXMLElement $dataBarXml, $ns): void
+    {
+        if ($dataBarXml->borderColor) {
+            $attributes = $dataBarXml->borderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setBorderColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->negativeFillColor) {
+            $attributes = $dataBarXml->negativeFillColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeFillColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->negativeBorderColor) {
+            $attributes = $dataBarXml->negativeBorderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeBorderColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->axisColor) {
+            $axisColorAttr = $dataBarXml->axisColor->attributes();
+            if ($axisColorAttr !== null) {
+                $extDataBarObj->setAxisColor((string) $axisColorAttr['rgb'], (string) $axisColorAttr['theme'], (string) $axisColorAttr['tint']);
+            }
+        }
+        $cfvoIndex = 0;
+        foreach ($dataBarXml->cfvo as $cfvo) {
+            $f = (string) $cfvo->/** @scrutinizer ignore-call */ children($ns['xm'])->f;
+            /** @scrutinizer ignore-call */
+            $attributes = $cfvo->attributes();
+            if (!($attributes)) {
+                continue;
+            }
+
+            if ($cfvoIndex === 0) {
+                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
+            }
+            if ($cfvoIndex === 1) {
+                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
+            }
+            ++$cfvoIndex;
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     */
+    public function setId($id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getCfRule(): string
+    {
+        return $this->cfRule;
+    }
+
+    public function setCfRule(string $cfRule): self
+    {
+        $this->cfRule = $cfRule;
+
+        return $this;
+    }
+
+    public function getDataBarExt(): ConditionalDataBarExtension
+    {
+        return $this->dataBar;
+    }
+
+    public function setDataBarExt(ConditionalDataBarExtension $dataBar): self
+    {
+        $this->dataBar = $dataBar;
+
+        return $this;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(string $sqref): self
+    {
+        $this->sqref = $sqref;
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
new file mode 100644
index 000000000..0ddc07f2a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
@@ -0,0 +1,118 @@
+<?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
+{
+    /**
+     * @var Style
+     */
+    protected $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
new file mode 100644
index 000000000..d5d56a9a3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
@@ -0,0 +1,95 @@
+<?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';
+
+    /**
+     * @var string
+     */
+    protected $cellRange;
+
+    public function __construct(string $cellRange)
+    {
+        $this->cellRange = $cellRange;
+    }
+
+    public function newRule(string $ruleType): WizardInterface
+    {
+        switch ($ruleType) {
+            case self::CELL_VALUE:
+                return new Wizard\CellValue($this->cellRange);
+            case self::TEXT_VALUE:
+                return new Wizard\TextValue($this->cellRange);
+            case self::BLANKS:
+                return new Wizard\Blanks($this->cellRange, true);
+            case self::NOT_BLANKS:
+                return new Wizard\Blanks($this->cellRange, false);
+            case self::ERRORS:
+                return new Wizard\Errors($this->cellRange, true);
+            case self::NOT_ERRORS:
+                return new Wizard\Errors($this->cellRange, false);
+            case self::EXPRESSION:
+            case self::FORMULA:
+                return new Wizard\Expression($this->cellRange);
+            case self::DATES_OCCURRING:
+                return new Wizard\DateValue($this->cellRange);
+            case self::DUPLICATES:
+                return new Wizard\Duplicates($this->cellRange, false);
+            case self::UNIQUE:
+                return 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();
+
+        switch ($conditionalType) {
+            case Conditional::CONDITION_CELLIS:
+                return Wizard\CellValue::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_CONTAINSTEXT:
+            case Conditional::CONDITION_NOTCONTAINSTEXT:
+            case Conditional::CONDITION_BEGINSWITH:
+            case Conditional::CONDITION_ENDSWITH:
+                return Wizard\TextValue::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_CONTAINSBLANKS:
+            case Conditional::CONDITION_NOTCONTAINSBLANKS:
+                return Wizard\Blanks::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_CONTAINSERRORS:
+            case Conditional::CONDITION_NOTCONTAINSERRORS:
+                return Wizard\Errors::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_TIMEPERIOD:
+                return Wizard\DateValue::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_EXPRESSION:
+                return Wizard\Expression::fromConditional($conditional, $cellRange);
+            case Conditional::CONDITION_DUPLICATES:
+            case Conditional::CONDITION_UNIQUE:
+                return Wizard\Duplicates::fromConditional($conditional, $cellRange);
+            default:
+                throw new Exception('No wizard exists for this CF rule type');
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
new file mode 100644
index 000000000..14f30d39e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
@@ -0,0 +1,99 @@
+<?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',
+    ];
+
+    /**
+     * @var bool
+     */
+    protected $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
new file mode 100644
index 000000000..265b2419b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
@@ -0,0 +1,200 @@
+<?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;
+
+    /** @var string */
+    protected $operator = Conditional::OPERATOR_EQUAL;
+
+    /** @var array */
+    protected $operand = [0];
+
+    /**
+     * @var string[]
+     */
+    protected $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;
+    }
+
+    /**
+     * @param mixed $operand
+     */
+    protected function operand(int $index, $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 mixed $value
+     *
+     * @return float|int|string
+     */
+    protected function wrapValue($value, string $operandValueType)
+    {
+        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 ((strpos($condition, '"') === 0) && (strpos(strrev($condition), '"') === 0)) {
+            $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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');
+            }
+
+            // Scrutinizer ignores its own suggested workaround.
+            //$this->operand(1, /** @scrutinizer ignore-type */ ...$arguments);
+            if (count($arguments) < 2) {
+                $this->operand(1, $arguments[0]);
+            } else {
+                $this->operand(1, $arguments[0], $arguments[1]);
+            }
+
+            return $this;
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+        //$this->operand(0, ...$arguments);
+        if (count($arguments) < 2) {
+            $this->operand(0, $arguments[0]);
+        } else {
+            $this->operand(0, $arguments[0], $arguments[1]);
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
new file mode 100644
index 000000000..453dcdf91
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
@@ -0,0 +1,111 @@
+<?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)))',
+    ];
+
+    /** @var string */
+    protected $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
new file mode 100644
index 000000000..3f063fefd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
@@ -0,0 +1,78 @@
+<?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,
+    ];
+
+    /**
+     * @var bool
+     */
+    protected $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php
new file mode 100644
index 000000000..56b9086c8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.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 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)',
+    ];
+
+    /**
+     * @var bool
+     */
+    protected $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
new file mode 100644
index 000000000..e6d29f7be
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
@@ -0,0 +1,75 @@
+<?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
+{
+    /**
+     * @var string
+     */
+    protected $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 $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $arguments): self
+    {
+        if ($methodName !== 'formula') {
+            throw new Exception('Invalid Operation for Expression CF Rule Wizard');
+        }
+
+        // Scrutinizer ignores its own recommendation
+        //$this->expression(/** @scrutinizer ignore-type */ ...$arguments);
+        $this->expression($arguments[0]);
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
new file mode 100644
index 000000000..987cfbf8b
--- /dev/null
+++ b/libraries/phpspreadsheet/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',
+    ];
+
+    /** @var string */
+    protected $operator;
+
+    /** @var string */
+    protected $operand;
+
+    /**
+     * @var string
+     */
+    protected $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 string $methodName
+     * @param mixed[] $arguments
+     */
+    public function __call($methodName, $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) {
+            $this->operand($arguments[0]);
+        } else {
+            $this->operand($arguments[0], $arguments[1]);
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
new file mode 100644
index 000000000..5644aab45
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
@@ -0,0 +1,199 @@
+<?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
+{
+    /**
+     * @var ?Style
+     */
+    protected $style;
+
+    /**
+     * @var string
+     */
+    protected $expression;
+
+    /**
+     * @var string
+     */
+    protected $cellRange;
+
+    /**
+     * @var string
+     */
+    protected $referenceCell;
+
+    /**
+     * @var int
+     */
+    protected $referenceRow;
+
+    /**
+     * @var bool
+     */
+    protected $stopIfTrue = false;
+
+    /**
+     * @var int
+     */
+    protected $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 &&
+            substr($operand, 0, 1) === '"' &&
+            substr($operand, -1) === '"'
+        ) {
+            $operand = str_replace('""', '"', substr($operand, 1, -1));
+        } elseif ($operandValueType === Wizard::VALUE_TYPE_FORMULA && substr($operand, 0, 1) === '=') {
+            $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 (strpos($column, '$') === false) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column -= $referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (strpos($row, '$') === false) {
+            $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',
+                    function ($matches) use ($referenceColumnIndex, $referenceRow) {
+                        return 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 (strpos($column, '$') === false) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (strpos($row, '$') === false) {
+            $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php
new file mode 100644
index 000000000..10ad57b20
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
index 1d6bace14..bd87a7926 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
@@ -2,8 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-
 class Fill extends Supervisor
 {
     // Fill types
@@ -30,19 +28,19 @@ class Fill extends Supervisor
     const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
 
     /**
-     * @var int
+     * @var null|int
      */
     public $startcolorIndex;
 
     /**
-     * @var int
+     * @var null|int
      */
     public $endcolorIndex;
 
     /**
      * Fill type.
      *
-     * @var string
+     * @var null|string
      */
     protected $fillType = self::FILL_NONE;
 
@@ -51,7 +49,7 @@ class Fill extends Supervisor
      *
      * @var float
      */
-    protected $rotation = 0;
+    protected $rotation = 0.0;
 
     /**
      * Start color.
@@ -67,6 +65,9 @@ class Fill extends Supervisor
      */
     protected $endColor;
 
+    /** @var bool */
+    private $colorChanged = false;
+
     /**
      * Create a new Fill.
      *
@@ -104,7 +105,10 @@ class Fill extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getFill();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFill();
     }
 
     /**
@@ -126,7 +130,7 @@ class Fill extends Supervisor
      * $spreadsheet->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
      *     [
      *         'fillType' => Fill::FILL_GRADIENT_LINEAR,
-     *         'rotation' => 0,
+     *         'rotation' => 0.0,
      *         'startColor' => [
      *             'rgb' => '000000'
      *         ],
@@ -137,32 +141,30 @@ class Fill extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -172,7 +174,7 @@ class Fill extends Supervisor
     /**
      * Get Fill Type.
      *
-     * @return string
+     * @return null|string
      */
     public function getFillType()
     {
@@ -186,17 +188,17 @@ class Fill extends Supervisor
     /**
      * 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($fillType)
     {
         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;
@@ -219,17 +221,17 @@ class Fill extends Supervisor
     /**
      * Set Rotation.
      *
-     * @param float $pValue
+     * @param float $angleInDegrees
      *
      * @return $this
      */
-    public function setRotation($pValue)
+    public function setRotation($angleInDegrees)
     {
         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;
@@ -248,16 +250,13 @@ class Fill extends Supervisor
     /**
      * Set Start Color.
      *
-     * @param Color $pValue
-     *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setStartColor(Color $pValue)
+    public function setStartColor(Color $color)
     {
+        $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()]);
@@ -282,16 +281,13 @@ class Fill extends Supervisor
     /**
      * Set End Color.
      *
-     * @param Color $pValue
-     *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setEndColor(Color $pValue)
+    public function setEndColor(Color $color)
     {
+        $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()]);
@@ -303,6 +299,17 @@ class Fill extends Supervisor
         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.
      *
@@ -320,7 +327,21 @@ class Fill extends Supervisor
             $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, 'fillType', $this->getFillType());
+        $this->exportArray2($exportedArray, 'rotation', $this->getRotation());
+        if ($this->getColorsChanged()) {
+            $this->exportArray2($exportedArray, 'endColor', $this->getEndColor());
+            $this->exportArray2($exportedArray, 'startColor', $this->getStartColor());
+        }
+
+        return $exportedArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
index 0341cad0d..a8eeaa986 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 
 class Font extends Supervisor
 {
@@ -16,56 +16,82 @@ class Font extends Supervisor
     /**
      * Font Name.
      *
-     * @var string
+     * @var null|string
      */
     protected $name = 'Calibri';
 
+    /**
+     * The following 7 are used only for chart titles, I think.
+     *
+     *@var string
+     */
+    private $latin = '';
+
+    /** @var string */
+    private $eastAsian = '';
+
+    /** @var string */
+    private $complexScript = '';
+
+    /** @var int */
+    private $baseLine = 0;
+
+    /** @var string */
+    private $strikeType = '';
+
+    /** @var ?ChartColor */
+    private $underlineColor;
+
+    /** @var ?ChartColor */
+    private $chartColor;
+    // end of chart title items
+
     /**
      * Font Size.
      *
-     * @var float
+     * @var null|float
      */
     protected $size = 11;
 
     /**
      * Bold.
      *
-     * @var bool
+     * @var null|bool
      */
     protected $bold = false;
 
     /**
      * Italic.
      *
-     * @var bool
+     * @var null|bool
      */
     protected $italic = false;
 
     /**
      * Superscript.
      *
-     * @var bool
+     * @var null|bool
      */
     protected $superscript = false;
 
     /**
      * Subscript.
      *
-     * @var bool
+     * @var null|bool
      */
     protected $subscript = false;
 
     /**
      * Underline.
      *
-     * @var string
+     * @var null|string
      */
     protected $underline = self::UNDERLINE_NONE;
 
     /**
      * Strikethrough.
      *
-     * @var bool
+     * @var null|bool
      */
     protected $strikethrough = false;
 
@@ -77,10 +103,13 @@ class Font extends Supervisor
     protected $color;
 
     /**
-     * @var int
+     * @var null|int
      */
     public $colorIndex;
 
+    /** @var string */
+    protected $scheme = '';
+
     /**
      * Create a new Font.
      *
@@ -124,7 +153,10 @@ class Font extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getFont();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFont();
     }
 
     /**
@@ -157,43 +189,56 @@ class Font extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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($pStyles['bold'])) {
-                $this->setBold($pStyles['bold']);
+            if (isset($styleArray['latin'])) {
+                $this->setLatin($styleArray['latin']);
             }
-            if (isset($pStyles['italic'])) {
-                $this->setItalic($pStyles['italic']);
+            if (isset($styleArray['eastAsian'])) {
+                $this->setEastAsian($styleArray['eastAsian']);
             }
-            if (isset($pStyles['superscript'])) {
-                $this->setSuperscript($pStyles['superscript']);
+            if (isset($styleArray['complexScript'])) {
+                $this->setComplexScript($styleArray['complexScript']);
             }
-            if (isset($pStyles['subscript'])) {
-                $this->setSubscript($pStyles['subscript']);
+            if (isset($styleArray['bold'])) {
+                $this->setBold($styleArray['bold']);
             }
-            if (isset($pStyles['underline'])) {
-                $this->setUnderline($pStyles['underline']);
+            if (isset($styleArray['italic'])) {
+                $this->setItalic($styleArray['italic']);
             }
-            if (isset($pStyles['strikethrough'])) {
-                $this->setStrikethrough($pStyles['strikethrough']);
+            if (isset($styleArray['superscript'])) {
+                $this->setSuperscript($styleArray['superscript']);
             }
-            if (isset($pStyles['color'])) {
-                $this->getColor()->applyFromArray($pStyles['color']);
+            if (isset($styleArray['subscript'])) {
+                $this->setSubscript($styleArray['subscript']);
             }
-            if (isset($pStyles['size'])) {
-                $this->setSize($pStyles['size']);
+            if (isset($styleArray['underline'])) {
+                $this->setUnderline($styleArray['underline']);
+            }
+            if (isset($styleArray['strikethrough'])) {
+                $this->setStrikethrough($styleArray['strikethrough']);
+            }
+            if (isset($styleArray['color'])) {
+                $this->getColor()->applyFromArray($styleArray['color']);
+            }
+            if (isset($styleArray['size'])) {
+                $this->setSize($styleArray['size']);
+            }
+            if (isset($styleArray['chartColor'])) {
+                $this->chartColor = $styleArray['chartColor'];
+            }
+            if (isset($styleArray['scheme'])) {
+                $this->setScheme($styleArray['scheme']);
             }
         }
 
@@ -203,7 +248,7 @@ class Font extends Supervisor
     /**
      * Get Name.
      *
-     * @return string
+     * @return null|string
      */
     public function getName()
     {
@@ -214,23 +259,102 @@ class Font extends Supervisor
         return $this->name;
     }
 
-    /**
-     * Set Name.
-     *
-     * @param string $pValue
-     *
-     * @return $this
-     */
-    public function setName($pValue)
+    public function getLatin(): string
     {
-        if ($pValue == '') {
-            $pValue = 'Calibri';
+        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 and turn off Scheme.
+     *
+     * @param string $fontname
+     */
+    public function setName($fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['name' => $pValue]);
+            $styleArray = $this->getStyleArray(['name' => $fontname]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->name = $pValue;
+            $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;
@@ -239,7 +363,7 @@ class Font extends Supervisor
     /**
      * Get Size.
      *
-     * @return float
+     * @return null|float
      */
     public function getSize()
     {
@@ -253,20 +377,29 @@ class Font extends Supervisor
     /**
      * Set Size.
      *
-     * @param float $pValue
+     * @param mixed $sizeInPoints A float representing the value of a positive measurement in points (1/72 of an inch)
      *
      * @return $this
      */
-    public function setSize($pValue)
+    public function setSize($sizeInPoints, bool $nullOk = false)
     {
-        if ($pValue == '') {
-            $pValue = 10;
+        if (is_string($sizeInPoints) || is_int($sizeInPoints)) {
+            $sizeInPoints = (float) $sizeInPoints; // $pValue = 0 if given string is not numeric
         }
+
+        // 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)) {
+            if (!$nullOk || $sizeInPoints !== null) {
+                $sizeInPoints = 10.0;
+            }
+        }
+
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['size' => $pValue]);
+            $styleArray = $this->getStyleArray(['size' => $sizeInPoints]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->size = $pValue;
+            $this->size = $sizeInPoints;
         }
 
         return $this;
@@ -275,7 +408,7 @@ class Font extends Supervisor
     /**
      * Get Bold.
      *
-     * @return bool
+     * @return null|bool
      */
     public function getBold()
     {
@@ -289,20 +422,20 @@ class Font extends Supervisor
     /**
      * Set Bold.
      *
-     * @param bool $pValue
+     * @param bool $bold
      *
      * @return $this
      */
-    public function setBold($pValue)
+    public function setBold($bold)
     {
-        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;
@@ -311,7 +444,7 @@ class Font extends Supervisor
     /**
      * Get Italic.
      *
-     * @return bool
+     * @return null|bool
      */
     public function getItalic()
     {
@@ -325,20 +458,20 @@ class Font extends Supervisor
     /**
      * Set Italic.
      *
-     * @param bool $pValue
+     * @param bool $italic
      *
      * @return $this
      */
-    public function setItalic($pValue)
+    public function setItalic($italic)
     {
-        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;
@@ -347,7 +480,7 @@ class Font extends Supervisor
     /**
      * Get Superscript.
      *
-     * @return bool
+     * @return null|bool
      */
     public function getSuperscript()
     {
@@ -361,21 +494,18 @@ class Font extends Supervisor
     /**
      * Set Superscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSuperscript($pValue)
+    public function setSuperscript(bool $superscript)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         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->subscript = !$pValue;
+            $this->superscript = $superscript;
+            if ($this->superscript) {
+                $this->subscript = false;
+            }
         }
 
         return $this;
@@ -384,7 +514,7 @@ class Font extends Supervisor
     /**
      * Get Subscript.
      *
-     * @return bool
+     * @return null|bool
      */
     public function getSubscript()
     {
@@ -398,30 +528,130 @@ class Font extends Supervisor
     /**
      * Set Subscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSubscript($pValue)
+    public function setSubscript(bool $subscript)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         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->superscript = !$pValue;
+            $this->subscript = $subscript;
+            if ($this->subscript) {
+                $this->superscript = false;
+            }
         }
 
         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 string
+     * @return null|string
      */
     public function getUnderline()
     {
@@ -435,24 +665,24 @@ class Font extends Supervisor
     /**
      * 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)
     {
-        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;
@@ -461,7 +691,7 @@ class Font extends Supervisor
     /**
      * Get Strikethrough.
      *
-     * @return bool
+     * @return null|bool
      */
     public function getStrikethrough()
     {
@@ -475,21 +705,21 @@ class Font extends Supervisor
     /**
      * Set Strikethrough.
      *
-     * @param bool $pValue
+     * @param bool $strikethru
      *
      * @return $this
      */
-    public function setStrikethrough($pValue)
+    public function setStrikethrough($strikethru)
     {
-        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;
@@ -508,16 +738,12 @@ class Font extends Supervisor
     /**
      * Set Color.
      *
-     * @param Color $pValue
-     *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setColor(Color $pValue)
+    public function setColor(Color $color)
     {
         // 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()]);
@@ -529,6 +755,18 @@ class Font extends Supervisor
         return $this;
     }
 
+    private function hashChartColor(?ChartColor $underlineColor): string
+    {
+        if ($underlineColor === null) {
+            return '';
+        }
+
+        return
+            $underlineColor->getValue()
+            . $underlineColor->getType()
+            . (string) $underlineColor->getAlpha();
+    }
+
     /**
      * Get hash code.
      *
@@ -550,7 +788,67 @@ class Font extends Supervisor
             $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,
+                ]
+            ) .
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'baseLine', $this->getBaseLine());
+        $this->exportArray2($exportedArray, 'bold', $this->getBold());
+        $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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
index df4ca76f4..b605cff6e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -2,11 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
-
 class NumberFormat extends Supervisor
 {
     // Pre-defined formats
@@ -15,13 +10,16 @@ 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%';
 
+    /** @deprecated 1.26 use FORMAT_DATE_YYYYMMDD instead */
     const FORMAT_DATE_YYYYMMDD2 = 'yyyy-mm-dd';
     const FORMAT_DATE_YYYYMMDD = 'yyyy-mm-dd';
     const FORMAT_DATE_DDMMYYYY = 'dd/mm/yyyy';
@@ -45,10 +43,50 @@ class NumberFormat extends Supervisor
     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 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_XLSX15,
+        self::FORMAT_DATE_XLSX16,
+        self::FORMAT_DATE_XLSX17,
+        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,
+        self::FORMAT_DATE_YYYYMMDDSLASH,
+    ];
+    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,
+    ];
+
+    /** @deprecated 1.28 use FORMAT_CURRENCY_USD_INTEGER instead */
+    const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0_-';
+    const FORMAT_CURRENCY_USD_INTEGER = '$#,##0_-';
+    const FORMAT_CURRENCY_USD = '$#,##0.00_-';
+    /** @deprecated 1.28 use FORMAT_CURRENCY_EUR_INTEGER instead */
+    const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0_-"€"';
+    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\);_("€"* "-"??_);_(@_)';
 
@@ -69,14 +107,14 @@ class NumberFormat extends Supervisor
     /**
      * Format Code.
      *
-     * @var string
+     * @var null|string
      */
     protected $formatCode = self::FORMAT_GENERAL;
 
     /**
      * Built-in format Code.
      *
-     * @var string
+     * @var false|int
      */
     protected $builtInFormatCode = 0;
 
@@ -109,7 +147,10 @@ class NumberFormat extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getNumberFormat();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getNumberFormat();
     }
 
     /**
@@ -135,19 +176,17 @@ class NumberFormat extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -157,14 +196,14 @@ class NumberFormat extends Supervisor
     /**
      * Get Format Code.
      *
-     * @return string
+     * @return null|string
      */
     public function getFormatCode()
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getFormatCode();
         }
-        if ($this->builtInFormatCode !== false) {
+        if (is_int($this->builtInFormatCode)) {
             return self::builtInFormatCode($this->builtInFormatCode);
         }
 
@@ -174,21 +213,21 @@ class NumberFormat extends Supervisor
     /**
      * 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)
     {
-        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;
@@ -197,7 +236,7 @@ class NumberFormat extends Supervisor
     /**
      * Get Built-In Format Code.
      *
-     * @return int
+     * @return false|int
      */
     public function getBuiltInFormatCode()
     {
@@ -205,24 +244,25 @@ class NumberFormat extends Supervisor
             return $this->getSharedComponent()->getBuiltInFormatCode();
         }
 
+        // Scrutinizer says this could return true. It is wrong.
         return $this->builtInFormatCode;
     }
 
     /**
      * 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)
     {
         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;
@@ -231,7 +271,7 @@ class NumberFormat extends Supervisor
     /**
      * Fill built-in format codes.
      */
-    private static function fillBuiltInFormatCodes()
+    private static function fillBuiltInFormatCodes(): void
     {
         //  [MS-OI29500: Microsoft Office Implementation Information for ISO/IEC-29500 Standard Compliance]
         //  18.8.30. numFmt (Number Format)
@@ -256,7 +296,7 @@ class NumberFormat extends Supervisor
         //      KOR fmt 55: "yyyy/mm/dd"
 
         // Built-in format codes
-        if (self::$builtInFormats === null) {
+        if (empty(self::$builtInFormats)) {
             self::$builtInFormats = [];
 
             // General
@@ -334,21 +374,21 @@ class NumberFormat extends Supervisor
     /**
      * Get built-in format code.
      *
-     * @param int $pIndex
+     * @param int $index
      *
      * @return string
      */
-    public static function builtInFormatCode($pIndex)
+    public static function builtInFormatCode($index)
     {
         // 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 '';
@@ -357,18 +397,18 @@ class NumberFormat extends Supervisor
     /**
      * Get built-in format code index.
      *
-     * @param string $formatCode
+     * @param string $formatCodeIndex
      *
-     * @return bool|int
+     * @return false|int
      */
-    public static function builtInFormatCodeIndex($formatCode)
+    public static function builtInFormatCodeIndex($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;
@@ -392,429 +432,26 @@ class NumberFormat extends Supervisor
         );
     }
 
-    /**
-     * Search/replace values to convert Excel date/time format masks to PHP format masks.
-     *
-     * @var array
-     */
-    private static $dateFormatReplacements = [
-            // first remove escapes related to non-format characters
-            '\\' => '',
-            //    12-hour suffix
-            'am/pm' => 'A',
-            //    4-digit year
-            'e' => 'Y',
-            'yyyy' => 'Y',
-            //    2-digit year
-            'yy' => 'y',
-            //    first letter of month - no php equivalent
-            'mmmmm' => 'M',
-            //    full month name
-            'mmmm' => 'F',
-            //    short month name
-            'mmm' => 'M',
-            //    mm is minutes if time, but can also be month w/leading zero
-            //    so we try to identify times be the inclusion of a : separator in the mask
-            //    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
-            'ddd' => 'D',
-            //    days leading zero
-            '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 = [
-        'hh' => 'H',
-        'h' => 'G',
-    ];
-
-    /**
-     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock).
-     *
-     * @var array
-     */
-    private static $dateFormatReplacements12 = [
-        'hh' => 'h',
-        'h' => 'g',
-    ];
-
-    private static function setLowercaseCallback($matches)
-    {
-        return mb_strtolower($matches[0]);
-    }
-
-    private static function escapeQuotesCallback($matches)
-    {
-        return '\\' . implode('\\', str_split($matches[1]));
-    }
-
-    private static function formatAsDate(&$value, &$format)
-    {
-        // 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('/^(\[[0-9A-Za-z]*\])*(\[\$[A-Z]*-[0-9A-F]*\])/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);
-
-        // 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);
-                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);
-                } else {
-                    // 12-hour time format
-                    $block = strtr($block, self::$dateFormatReplacements12);
-                }
-            }
-        }
-        $format = implode('"', $blocks);
-
-        // escape any quoted characters so that DateTime format() will render them correctly
-        $format = preg_replace_callback('/"(.*)"/U', ['self', 'escapeQuotesCallback'], $format);
-
-        $dateObj = Date::excelToDateTimeObject($value);
-        $value = $dateObj->format($format);
-    }
-
-    private static function formatAsPercentage(&$value, &$format)
-    {
-        if ($format === self::FORMAT_PERCENTAGE) {
-            $value = round((100 * $value), 0) . '%';
-        } else {
-            if (preg_match('/\.[#0]+/', $format, $m)) {
-                $s = substr($m[0], 0, 1) . (strlen($m[0]) - 1);
-                $format = str_replace($m[0], $s, $format);
-            }
-            if (preg_match('/^[#0]+/', $format, $m)) {
-                $format = str_replace($m[0], strlen($m[0]), $format);
-            }
-            $format = '%' . str_replace('%', 'f%%', $format);
-
-            $value = sprintf($format, 100 * $value);
-        }
-    }
-
-    private static function formatAsFraction(&$value, &$format)
-    {
-        $sign = ($value < 0) ? '-' : '';
-
-        $integerPart = floor(abs($value));
-        $decimalPart = trim(fmod(abs($value), 1), '0.');
-        $decimalLength = strlen($decimalPart);
-        $decimalDivisor = pow(10, $decimalLength);
-
-        $GCD = MathTrig::GCD($decimalPart, $decimalDivisor);
-
-        $adjustedDecimalPart = $decimalPart / $GCD;
-        $adjustedDecimalDivisor = $decimalDivisor / $GCD;
-
-        if ((strpos($format, '0') !== false) || (strpos($format, '#') !== false) || (substr($format, 0, 3) == '? ?')) {
-            if ($integerPart == 0) {
-                $integerPart = '';
-            }
-            $value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
-        } else {
-            $adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
-            $value = "$sign$adjustedDecimalPart/$adjustedDecimalDivisor";
-        }
-    }
-
-    private static function mergeComplexNumberFormatMasks($numbers, $masks)
-    {
-        $decimalCount = strlen($numbers[1]);
-        $postDecimalMasks = [];
-
-        do {
-            $tempMask = array_pop($masks);
-            $postDecimalMasks[] = $tempMask;
-            $decimalCount -= strlen($tempMask);
-        } while ($decimalCount > 0);
-
-        return [
-            implode('.', $masks),
-            implode('.', array_reverse($postDecimalMasks)),
-        ];
-    }
-
-    private static function processComplexNumberFormatMask($number, $mask)
-    {
-        $result = $number;
-        $maskingBlockCount = preg_match_all('/0+/', $mask, $maskingBlocks, PREG_OFFSET_CAPTURE);
-
-        if ($maskingBlockCount > 1) {
-            $maskingBlocks = array_reverse($maskingBlocks[0]);
-
-            foreach ($maskingBlocks as $block) {
-                $divisor = 1 . $block[0];
-                $size = strlen($block[0]);
-                $offset = $block[1];
-
-                $blockValue = sprintf(
-                    '%0' . $size . 'd',
-                    fmod($number, $divisor)
-                );
-                $number = floor($number / $divisor);
-                $mask = substr_replace($mask, $blockValue, $offset, $size);
-            }
-            if ($number > 0) {
-                $mask = substr_replace($mask, $number, $offset, 0);
-            }
-            $result = $mask;
-        }
-
-        return $result;
-    }
-
-    private static function complexNumberFormatMask($number, $mask, $splitOnPoint = true)
-    {
-        $sign = ($number < 0.0);
-        $number = abs($number);
-
-        if ($splitOnPoint && strpos($mask, '.') !== false && strpos($number, '.') !== false) {
-            $numbers = explode('.', $number);
-            $masks = explode('.', $mask);
-            if (count($masks) > 2) {
-                $masks = self::mergeComplexNumberFormatMasks($numbers, $masks);
-            }
-            $result1 = self::complexNumberFormatMask($numbers[0], $masks[0], false);
-            $result2 = strrev(self::complexNumberFormatMask(strrev($numbers[1]), strrev($masks[1]), false));
-
-            return (($sign) ? '-' : '') . $result1 . '.' . $result2;
-        }
-
-        $result = self::processComplexNumberFormatMask($number, $mask);
-
-        return (($sign) ? '-' : '') . $result;
-    }
-
-    private static function formatStraightNumericValue($value, $format, array $matches, $useThousands, $number_regex)
-    {
-        $left = $matches[1];
-        $dec = $matches[2];
-        $right = $matches[3];
-
-        // minimun width of formatted number (including dot)
-        $minWidth = strlen($left) + strlen($dec) + strlen($right);
-        if ($useThousands) {
-            $value = number_format(
-                $value,
-                strlen($right),
-                StringHelper::getDecimalSeparator(),
-                StringHelper::getThousandsSeparator()
-            );
-            $value = preg_replace($number_regex, $value, $format);
-        } else {
-            if (preg_match('/[0#]E[+-]0/i', $format)) {
-                //    Scientific format
-                $value = sprintf('%5.2E', $value);
-            } elseif (preg_match('/0([^\d\.]+)0/', $format) || substr_count($format, '.') > 1) {
-                if ($value == (int) $value && substr_count($format, '.') === 1) {
-                    $value *= 10 ** strlen(explode('.', $format)[1]);
-                }
-                $value = self::complexNumberFormatMask($value, $format);
-            } else {
-                $sprintf_pattern = "%0$minWidth." . strlen($right) . 'f';
-                $value = sprintf($sprintf_pattern, $value);
-                $value = preg_replace($number_regex, $value, $format);
-            }
-        }
-
-        return $value;
-    }
-
-    private static function formatAsNumber($value, $format)
-    {
-        if ($format === self::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);
-
-        // 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);
-        }
-
-        // 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 = pow(1000, strlen($matches[2]));
-
-            // strip the commas
-            $format = preg_replace('/0,+/', '0', $format);
-            $format = preg_replace('/#,+/', '#', $format);
-        }
-
-        if (preg_match('/#?.*\?\/\?/', $format, $m)) {
-            if ($value != (int) $value) {
-                self::formatAsFraction($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);
-
-            $n = '/\\[[^\\]]+\\]/';
-            $m = preg_replace($n, '', $format);
-            $number_regex = '/(0+)(\\.?)(0*)/';
-            if (preg_match($number_regex, $m, $matches)) {
-                $value = self::formatStraightNumericValue($value, $format, $matches, $useThousands, $number_regex);
-            }
-        }
-
-        if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
-            //  Currency or Accounting
-            $currencyCode = $m[1];
-            [$currencyCode] = explode('-', $currencyCode);
-            if ($currencyCode == '') {
-                $currencyCode = StringHelper::getCurrencyCode();
-            }
-            $value = preg_replace('/\[\$([^\]]*)\]/u', $currencyCode, $value);
-        }
-
-        return $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 = self::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)
     {
-        // For now we do not treat strings although section 4 of a format code affects strings
-        if (!is_numeric($value)) {
-            return $value;
-        }
+        return NumberFormat\Formatter::toFormattedString($value, $format, $callBack);
+    }
 
-        // 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 === self::FORMAT_GENERAL) || ($format === self::FORMAT_TEXT)) {
-            return $value;
-        }
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'formatCode', $this->getFormatCode());
 
-        // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
-        $format = preg_replace('/(\\\(((.)(?!((AM\/PM)|(A\/P))))|([^ ])))(?=(?:[^"]|"[^"]*")*$)/u', '"${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);
-
-        // Extract the relevant section depending on whether number is positive, negative, or zero?
-        // Text not supported yet.
-        // Here is how the sections apply to various values in Excel:
-        //   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
-        //   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
-        //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
-        //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
-        switch (count($sections)) {
-            case 1:
-                $format = $sections[0];
-
-                break;
-            case 2:
-                $format = ($value >= 0) ? $sections[0] : $sections[1];
-                $value = abs($value); // Use the absolute value
-                break;
-            case 3:
-                $format = ($value > 0) ?
-                    $sections[0] : (($value < 0) ?
-                        $sections[1] : $sections[2]);
-                $value = abs($value); // Use the absolute value
-                break;
-            case 4:
-                $format = ($value > 0) ?
-                    $sections[0] : (($value < 0) ?
-                        $sections[1] : $sections[2]);
-                $value = abs($value); // Use the absolute value
-                break;
-            default:
-                // something is wrong, just use first section
-                $format = $sections[0];
-
-                break;
-        }
-
-        // 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('/_./', ' ', $format);
-
-        // Save format with color information for later use below
-        $formatColor = $format;
-        // Strip colour information
-        $color_regex = '/\[(' . implode('|', Color::NAMED_COLORS) . ')\]/';
-        $format = preg_replace($color_regex, '', $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)) {
-            // datetime format
-            self::formatAsDate($value, $format);
-        } else {
-            if (substr($format, 0, 1) === '"' && substr($format, -1, 1) === '"') {
-                $value = substr($format, 1, -1);
-            } elseif (preg_match('/%$/', $format)) {
-                // % number format
-                self::formatAsPercentage($value, $format);
-            } else {
-                $value = self::formatAsNumber($value, $format);
-            }
-        }
-
-        // Additional formatting provided by callback function
-        if ($callBack !== null) {
-            [$writerInstance, $function] = $callBack;
-            $value = $writerInstance->$function($value, $formatColor);
-        }
-
-        return $value;
+        return $exportedArray;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
new file mode 100644
index 000000000..7988143c5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+abstract class BaseFormatter
+{
+    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);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
new file mode 100644
index 000000000..ba54b5359
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+class DateFormatter
+{
+    /**
+     * Search/replace values to convert Excel date/time format masks to PHP format masks.
+     */
+    private const DATE_FORMAT_REPLACEMENTS = [
+        // first remove escapes related to non-format characters
+        '\\' => '',
+        //    12-hour suffix
+        'am/pm' => 'A',
+        //    4-digit year
+        'e' => 'Y',
+        'yyyy' => 'Y',
+        //    2-digit year
+        'yy' => 'y',
+        //    first letter of month - no php equivalent
+        'mmmmm' => 'M',
+        //    full month name
+        'mmmm' => 'F',
+        //    short month name
+        'mmm' => 'M',
+        //    mm is minutes if time, but can also be month w/leading zero
+        //    so we try to identify times be the inclusion of a : separator in the mask
+        //    It isn't perfect, but the best way I know how
+        ':mm' => ':i',
+        'mm:' => 'i:',
+        //    full day of week name
+        'dddd' => 'l',
+        //    short day of week name
+        'ddd' => 'D',
+        //    days leading zero
+        'dd' => 'd',
+        //    days no leading zero
+        'd' => 'j',
+        //    fractional seconds - no php equivalent
+        '.s' => '',
+    ];
+
+    /**
+     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock).
+     */
+    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).
+     */
+    private const DATE_FORMAT_REPLACEMENTS12 = [
+        'hh' => 'h',
+        'h' => 'g',
+        //    month leading zero
+        'mm' => 'm',
+        //    month no leading zero
+        'm' => 'n',
+        //    seconds
+        'ss' => 's',
+    ];
+
+    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,
+    ];
+
+    /** @param mixed $value */
+    private static function tryInterval(bool &$seekingBracket, string &$block, $value, string $format): void
+    {
+        if ($seekingBracket) {
+            if (false !== strpos($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 mixed $value */
+    public static function format($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 = (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
+        /** @var 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::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
+                    $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::DATE_FORMAT_REPLACEMENTS12);
+                }
+            }
+        }
+        $format = implode('"', $blocks);
+
+        // escape any quoted characters so that DateTime format() will render them correctly
+        /** @var callable */
+        $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 = (string) \preg_replace('/\\\\:m/', ':i', $format);
+
+        return $dateObj->format($format);
+    }
+
+    private static function setLowercaseCallback(array $matches): string
+    {
+        return mb_strtolower($matches[0]);
+    }
+
+    private static function escapeQuotesCallback(array $matches): string
+    {
+        return '\\' . implode('\\', /** @scrutinizer ignore-type */ str_split($matches[1]));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
new file mode 100644
index 000000000..41a17151d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
@@ -0,0 +1,206 @@
+<?php
+
+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
+{
+    /**
+     * Matches any @ symbol that isn't enclosed in quotes.
+     */
+    private const SYMBOL_AT = '/@(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
+
+    /**
+     * Matches any ; symbol that isn't enclosed in quotes, for a "section" split.
+     */
+    private const SECTION_SPLIT = '/;(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
+
+    /**
+     * @param mixed $value
+     * @param mixed $comparisonValue
+     * @param mixed $defaultComparisonValue
+     */
+    private static function splitFormatComparison(
+        $value,
+        ?string $condition,
+        $comparisonValue,
+        string $defaultCondition,
+        $defaultComparisonValue
+    ): bool {
+        if (!$condition) {
+            $condition = $defaultCondition;
+            $comparisonValue = $defaultComparisonValue;
+        }
+
+        switch ($condition) {
+            case '>':
+                return $value > $comparisonValue;
+
+            case '<':
+                return $value < $comparisonValue;
+
+            case '<=':
+                return $value <= $comparisonValue;
+
+            case '<>':
+                return $value != $comparisonValue;
+
+            case '=':
+                return $value == $comparisonValue;
+        }
+
+        return $value >= $comparisonValue;
+    }
+
+    /** @param mixed $value */
+    private static function splitFormatForSectionSelection(array $sections, $value): array
+    {
+        // Extract the relevant section depending on whether number is positive, negative, or zero?
+        // Text not supported yet.
+        // Here is how the sections apply to various values in Excel:
+        //   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
+        //   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
+        //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
+        //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
+        $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 = ['', '', '', '', ''];
+        $conditionOperations = ['', '', '', '', ''];
+        $conditionComparisonValues = [0, 0, 0, 0, 0];
+        for ($idx = 0; $idx < $sectionCount; ++$idx) {
+            if (preg_match($color_regex, $sections[$idx], $matches)) {
+                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)) {
+                $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 ($sectionCount) {
+            case 2:
+                $absval = abs($value);
+                if (!self::splitFormatComparison($value, $conditionOperations[0], $conditionComparisonValues[0], '>=', 0)) {
+                    $color = $colors[1];
+                    $format = $sections[1];
+                }
+
+                break;
+            case 3:
+            case 4:
+                $absval = abs($value);
+                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 {
+                        $color = $colors[2];
+                        $format = $sections[2];
+                    }
+                }
+
+                break;
+        }
+
+        return [$color, $format, $absval];
+    }
+
+    /**
+     * Convert a value in a pre-defined format to a PHP 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)
+    {
+        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 (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 (string) $value;
+        }
+
+        // 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]);
+            },
+            $format
+        );
+
+        // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
+        $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(self::SECTION_SPLIT, $format) ?: [];
+
+        [$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 = (string) preg_replace('/_.?/ui', ' ', $format);
+
+        // Let's begin inspecting the format and converting the value to a formatted string
+        if (
+            //  Check for date/time characters (not inside quotes)
+            (preg_match('/(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy](?=(?:[^"]|"[^"]*")*$)/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) {
+                $value = substr($format, 1, -1);
+            } elseif (preg_match('/[0#, ]%/', $format)) {
+                // % number format - avoid weird '-0' problem
+                $value = PercentageFormatter::format(0 + (float) $value, $format);
+            } else {
+                $value = NumberFormatter::format($value, $format);
+            }
+        }
+
+        // Additional formatting provided by callback function
+        if ($callBack !== null) {
+            [$writerInstance, $function] = $callBack;
+            $value = $writerInstance->$function($value, $colors);
+        }
+
+        return str_replace(chr(0x00), '.', $value);
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
new file mode 100644
index 000000000..fdcf98329
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class FractionFormatter extends BaseFormatter
+{
+    /**
+     * @param mixed $value
+     */
+    public static function format($value, string $format): string
+    {
+        $format = self::stripQuotes($format);
+        $value = (float) $value;
+        $absValue = abs($value);
+
+        $sign = ($value < 0.0) ? '-' : '';
+
+        $integerPart = floor($absValue);
+
+        $decimalPart = self::getDecimal((string) $absValue);
+        if ($decimalPart === '0') {
+            return "{$sign}{$integerPart}";
+        }
+        $decimalLength = strlen($decimalPart);
+        $decimalDivisor = 10 ** $decimalLength;
+
+        preg_match('/(#?.*\?)\/(\?+|\d+)/', $format, $matches);
+        $formatIntegerPart = $matches[1];
+
+        if (is_numeric($matches[2])) {
+            $fractionDivisor = 100 / (int) $matches[2];
+        } else {
+            /** @var float */
+            $fractionDivisor = MathTrig\Gcd::evaluate((int) $decimalPart, $decimalDivisor);
+        }
+
+        $adjustedDecimalPart = (int) round((int) $decimalPart / $fractionDivisor, 0);
+        $adjustedDecimalDivisor = $decimalDivisor / $fractionDivisor;
+
+        if ((strpos($formatIntegerPart, '0') !== false)) {
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        } elseif ((strpos($formatIntegerPart, '#') !== false)) {
+            if ($integerPart == 0) {
+                return "{$sign}{$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+            }
+
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        } elseif ((substr($formatIntegerPart, 0, 3) == '? ?')) {
+            if ($integerPart == 0) {
+                $integerPart = '';
+            }
+
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        }
+
+        $adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
+
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
new file mode 100644
index 000000000..c03534586
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
@@ -0,0 +1,326 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class NumberFormatter
+{
+    private const NUMBER_REGEX = '/(0+)(\\.?)(0*)/';
+
+    private static function mergeComplexNumberFormatMasks(array $numbers, array $masks): array
+    {
+        $decimalCount = strlen($numbers[1]);
+        $postDecimalMasks = [];
+
+        do {
+            $tempMask = array_pop($masks);
+            if ($tempMask !== null) {
+                $postDecimalMasks[] = $tempMask;
+                $decimalCount -= strlen($tempMask);
+            }
+        } while ($tempMask !== null && $decimalCount > 0);
+
+        return [
+            implode('.', $masks),
+            implode('.', array_reverse($postDecimalMasks)),
+        ];
+    }
+
+    /**
+     * @param mixed $number
+     */
+    private static function processComplexNumberFormatMask($number, string $mask): string
+    {
+        /** @var string */
+        $result = $number;
+        $maskingBlockCount = preg_match_all('/0+/', $mask, $maskingBlocks, PREG_OFFSET_CAPTURE);
+
+        if ($maskingBlockCount > 1) {
+            $maskingBlocks = array_reverse($maskingBlocks[0]);
+
+            $offset = 0;
+            foreach ($maskingBlocks as $block) {
+                $size = strlen($block[0]);
+                $divisor = 10 ** $size;
+                $offset = $block[1];
+
+                /** @var float */
+                $numberFloat = $number;
+                $blockValue = sprintf("%0{$size}d", fmod($numberFloat, $divisor));
+                $number = floor($numberFloat / $divisor);
+                $mask = substr_replace($mask, $blockValue, $offset, $size);
+            }
+            /** @var string */
+            $numberString = $number;
+            if ($number > 0) {
+                $mask = substr_replace($mask, $numberString, $offset, 0);
+            }
+            $result = $mask;
+        }
+
+        return self::makeString($result);
+    }
+
+    /**
+     * @param mixed $number
+     */
+    private static function complexNumberFormatMask($number, string $mask, bool $splitOnPoint = true): string
+    {
+        /** @var float */
+        $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) {
+            $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}";
+    }
+
+    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;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function formatStraightNumericValue($value, string $format, array $matches, bool $useThousands): string
+    {
+        /** @var float */
+        $valueFloat = $value;
+        $left = $matches[1];
+        $dec = $matches[2];
+        $right = $matches[3];
+
+        // minimun width of formatted number (including dot)
+        $minWidth = strlen($left) + strlen($dec) + strlen($right);
+        if ($useThousands) {
+            $value = number_format(
+                $valueFloat,
+                strlen($right),
+                StringHelper::getDecimalSeparator(),
+                StringHelper::getThousandsSeparator()
+            );
+
+            return self::pregReplace(self::NUMBER_REGEX, $value, $format);
+        }
+
+        if (preg_match('/[0#]E[+-]0/i', $format)) {
+            //    Scientific format
+            $decimals = strlen($right);
+            $size = $decimals + 3;
+
+            return sprintf("%{$size}.{$decimals}E", $valueFloat);
+        } elseif (preg_match('/0([^\d\.]+)0/', $format) || substr_count($format, '.') > 1) {
+            if ($valueFloat == floor($valueFloat) && substr_count($format, '.') === 1) {
+                $value *= 10 ** strlen(explode('.', $format)[1]);
+            }
+
+            $result = self::complexNumberFormatMask($value, $format);
+            if (strpos($result, 'E') !== false) {
+                // 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';
+
+        /** @var float */
+        $valueFloat = $value;
+        $value = sprintf($sprintf_pattern, round($valueFloat, strlen($right)));
+
+        return self::pregReplace(self::NUMBER_REGEX, $value, $format);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    public static function format($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);
+        // }
+
+        $baseFormat = $format;
+
+        $useThousands = self::areThousandsRequired($format);
+        $scale = self::scaleThousandsMillions($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;
+            $paddingPlaceholder = (strpos($format, '?') !== false);
+
+            // Replace # or ? with 0
+            $format = self::pregReplace('/[\\#\?](?=(?:[^"]*"[^"]*")*[^"]*\Z)/', '0', $format);
+            // Remove locale code [$-###] for an LCID
+            $format = self::pregReplace('/\[\$\-.*\]/', '', $format);
+
+            $n = '/\\[[^\\]]+\\]/';
+            $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 = self::makeString(str_replace('?', '', $format));
+            }
+        }
+
+        if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
+            //  Currency or Accounting
+            $currencyCode = $m[1];
+            [$currencyCode] = explode('-', $currencyCode);
+            if ($currencyCode == '') {
+                $currencyCode = StringHelper::getCurrencyCode();
+            }
+            $value = self::pregReplace('/\[\$([^\]]*)\]/u', $currencyCode, (string) $value);
+        }
+
+        if (
+            (strpos((string) $value, '0.') !== false) &&
+            ((strpos($baseFormat, '#.') !== false) || (strpos($baseFormat, '?.') !== false))
+        ) {
+            $value = preg_replace('/(\b)0\.|([^\d])0\./', '${2}.', (string) $value);
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * @param array|string $value
+     */
+    private static function makeString($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
+    {
+        /** @phpstan-ignore-next-line */
+        [$preDecimal, $postDecimal] = preg_split('/\.(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu', $baseFormat . '.?');
+
+        $length = strlen($value);
+        if (strpos($postDecimal, '?') !== false) {
+            $value = str_pad(rtrim($value, '0. '), $length, ' ', STR_PAD_RIGHT);
+        }
+        if (strpos($preDecimal, '?') !== false) {
+            $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
new file mode 100644
index 000000000..55b5971aa
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class PercentageFormatter extends BaseFormatter
+{
+    /** @param float|int $value */
+    public static function format($value, string $format): string
+    {
+        if ($format === NumberFormat::FORMAT_PERCENTAGE) {
+            return round((100 * $value), 0) . '%';
+        }
+
+        $value *= 100;
+        $format = self::stripQuotes($format);
+
+        [, $vDecimals] = explode('.', ((string) $value) . '.');
+        $vDecimalCount = strlen(rtrim($vDecimals, '0'));
+
+        $format = str_replace('%', '%%', $format);
+        $wholePartSize = strlen((string) floor($value));
+        $decimalPartSize = 0;
+        $placeHolders = '';
+        // Number of decimals
+        if (preg_match('/\.([?0]+)/u', $format, $matches)) {
+            $decimalPartSize = strlen($matches[1]);
+            $vMinDecimalCount = strlen(rtrim($matches[1], '?'));
+            $decimalPartSize = min(max($vMinDecimalCount, $vDecimalCount), $decimalPartSize);
+            $placeHolders = str_repeat(' ', strlen($matches[1]) - $decimalPartSize);
+        }
+        // Number of digits to display before the decimal
+        if (preg_match('/([#0,]+)\.?/u', $format, $matches)) {
+            $firstZero = preg_replace('/^[#,]*/', '', $matches[1]) ?? '';
+            $wholePartSize = max($wholePartSize, strlen($firstZero));
+        }
+
+        $wholePartSize += $decimalPartSize + (int) ($decimalPartSize > 0);
+        $replacement = "0{$wholePartSize}.{$decimalPartSize}";
+        $mask = (string) preg_replace('/[#0,]+\.?[?#0,]*/ui', "%{$replacement}f{$placeHolders}", $format);
+
+        /** @var float */
+        $valueFloat = $value;
+
+        return sprintf($mask, round($valueFloat, $decimalPartSize));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
new file mode 100644
index 000000000..c30028601
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Accounting extends Currency
+{
+    /**
+     * @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
+     * @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).
+     *
+     * @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
+    ) {
+        $this->setCurrencyCode($currencyCode);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setDecimals($decimals);
+        $this->setCurrencySymbolPosition($currencySymbolPosition);
+        $this->setCurrencySymbolSpacing($currencySymbolSpacing);
+        $this->setLocale($locale);
+    }
+
+    /**
+     * @throws Exception if the Intl extension and ICU version don't support Accounting formats
+     */
+    protected function getLocaleFormat(): string
+    {
+        if (version_compare(PHP_VERSION, '7.4.1', '<')) {
+            throw new Exception('The Intl extension does not support Accounting Formats below PHP 7.4.1');
+        }
+
+        if ($this->icuVersion() < 53.0) {
+            throw new Exception('The Intl extension does not support Accounting Formats without ICU 53');
+        }
+
+        // Scrutinizer does not recognize CURRENCY_ACCOUNTING
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY_ACCOUNTING);
+        $mask = $formatter->format();
+        if ($this->decimals === 0) {
+            $mask = (string) preg_replace('/\.0+/miu', '', $mask);
+        }
+
+        return str_replace('¤', $this->formatCurrencyCode(), $mask);
+    }
+
+    private 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}]";
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+
+        return sprintf(
+            '_-%s%s%s0%s%s%s_-',
+            $this->currencySymbolPosition === self::LEADING_SYMBOL ? $this->formatCurrencyCode() : null,
+            (
+                $this->currencySymbolPosition === self::LEADING_SYMBOL &&
+                $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null,
+            (
+                $this->currencySymbolPosition === self::TRAILING_SYMBOL &&
+                $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->currencySymbolPosition === self::TRAILING_SYMBOL ? $this->formatCurrencyCode() : null
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
new file mode 100644
index 000000000..2fcd10838
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Currency 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;
+
+    /**
+     * @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
+     * @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).
+     *
+     * @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
+    ) {
+        $this->setCurrencyCode($currencyCode);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setDecimals($decimals);
+        $this->setCurrencySymbolPosition($currencySymbolPosition);
+        $this->setCurrencySymbolSpacing($currencySymbolSpacing);
+        $this->setLocale($locale);
+    }
+
+    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;
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY);
+        $mask = $formatter->format();
+        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;
+        }
+
+        return sprintf(
+            '%s%s%s0%s%s%s',
+            $this->currencySymbolPosition === self::LEADING_SYMBOL ? $this->formatCurrencyCode() : null,
+            (
+                $this->currencySymbolPosition === self::LEADING_SYMBOL &&
+                $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null,
+            (
+                $this->currencySymbolPosition === self::TRAILING_SYMBOL &&
+                $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->currencySymbolPosition === self::TRAILING_SYMBOL ? $this->formatCurrencyCode() : null
+        );
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php
new file mode 100644
index 000000000..61ac117b7
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
new file mode 100644
index 000000000..292c1efc9
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
@@ -0,0 +1,50 @@
+<?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);
+    }
+
+    /**
+     * @param DateTimeWizard|string $value
+     */
+    private function mapFormatBlocks($value): string
+    {
+        // Any date masking codes are returned as lower case values
+        if (is_object($value)) {
+            // We can't explicitly test for Stringable until PHP >= 8.0
+            return $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
new file mode 100644
index 000000000..b14a6190f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+abstract class DateTimeWizard implements 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 (strpos(self::NO_ESCAPING_NEEDED, $value) !== false) {
+            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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php
new file mode 100644
index 000000000..b81f77acb
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
new file mode 100644
index 000000000..9f0336274
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
@@ -0,0 +1,37 @@
+<?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(): string
+    {
+        return $this->formatter->getPattern();
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php
new file mode 100644
index 000000000..d7e7cd07f
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
new file mode 100644
index 000000000..73ab570f5
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+abstract class NumberBase
+{
+    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
new file mode 100644
index 000000000..003c0ddf1
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php
new file mode 100644
index 000000000..2c25efd14
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php
new file mode 100644
index 000000000..64b9104a6
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php
new file mode 100644
index 000000000..de4dc4f81
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
index 8112bc620..1c174e726 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
@@ -2,8 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-
 class Protection extends Supervisor
 {
     /** Protection styles */
@@ -55,7 +53,10 @@ class Protection extends Supervisor
      */
     public function getSharedComponent()
     {
-        return $this->parent->getSharedComponent()->getProtection();
+        /** @var Style */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getProtection();
     }
 
     /**
@@ -82,22 +83,20 @@ class Protection extends Supervisor
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     *
-     * @throws PhpSpreadsheetException
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray)
     {
         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']);
             }
         }
 
@@ -121,17 +120,17 @@ class Protection extends Supervisor
     /**
      * Set locked.
      *
-     * @param string $pValue see self::PROTECTION_*
+     * @param string $lockType see self::PROTECTION_*
      *
      * @return $this
      */
-    public function setLocked($pValue)
+    public function setLocked($lockType)
     {
         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;
@@ -154,17 +153,17 @@ class Protection extends Supervisor
     /**
      * Set hidden.
      *
-     * @param string $pValue see self::PROTECTION_*
+     * @param string $hiddenType see self::PROTECTION_*
      *
      * @return $this
      */
-    public function setHidden($pValue)
+    public function setHidden($hiddenType)
     {
         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;
@@ -187,4 +186,13 @@ class Protection extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'locked', $this->getLocked());
+        $this->exportArray2($exportedArray, 'hidden', $this->getHidden());
+
+        return $exportedArray;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
new file mode 100644
index 000000000..582ae4839
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
@@ -0,0 +1,175 @@
+<?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];
+    }
+
+    /** @var mixed */
+    private static $scrutinizerZeroPointZero = 0.0;
+
+    /**
+     * 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($hue, $luminance, $saturation): array
+    {
+        if ($saturation === self::$scrutinizerZeroPointZero) {
+            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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
index a37d99b5f..9309830bf 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
@@ -2,7 +2,10 @@
 
 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
@@ -42,13 +45,6 @@ class Style extends Supervisor
      */
     protected $numberFormat;
 
-    /**
-     * Conditional styles.
-     *
-     * @var Conditional[]
-     */
-    protected $conditionalStyles;
-
     /**
      * Protection.
      *
@@ -70,6 +66,25 @@ class Style extends Supervisor
      */
     protected $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.
+     *
+     * @see Style::applyFromArray()
+     * @see Style::getHashCode()
+     *
+     * @var null|array<string, array>
+     */
+    private static $cachedStyles;
+
     /**
      * Create a new Style.
      *
@@ -85,7 +100,6 @@ class Style extends Supervisor
         parent::__construct($isSupervisor);
 
         // Initialise values
-        $this->conditionalStyles = [];
         $this->font = new Font($isSupervisor, $isConditional);
         $this->fill = new Fill($isSupervisor, $isConditional);
         $this->borders = new Borders($isSupervisor, $isConditional);
@@ -107,13 +121,11 @@ class Style extends Supervisor
     /**
      * 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();
@@ -121,17 +133,15 @@ class Style extends Supervisor
             $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();
     }
 
     /**
@@ -186,18 +196,25 @@ class Style extends Supervisor
      * );
      * </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, $advancedBorders = true)
     {
         if ($this->isSupervisor) {
             $pRange = $this->getSelectedCells();
 
-            // Uppercase coordinate
+            // Uppercase coordinate and strip any Worksheet reference from the selected range
             $pRange = strtoupper($pRange);
+            if (strpos($pRange, '!') !== false) {
+                $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) {
@@ -210,64 +227,65 @@ class Style extends Supervisor
             // Calculate range outer borders
             $rangeStart = Coordinate::coordinateFromString($rangeA);
             $rangeEnd = Coordinate::coordinateFromString($rangeB);
+            $rangeStartIndexes = Coordinate::indexesFromString($rangeA);
+            $rangeEndIndexes = Coordinate::indexesFromString($rangeB);
 
-            // Translate column into index
-            $rangeStart[0] = Coordinate::columnIndexFromString($rangeStart[0]);
-            $rangeEnd[0] = Coordinate::columnIndexFromString($rangeEnd[0]);
+            $columnStart = $rangeStart[0];
+            $columnEnd = $rangeEnd[0];
 
             // Make sure we can loop upwards on rows and columns
-            if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-                $tmp = $rangeStart;
-                $rangeStart = $rangeEnd;
-                $rangeEnd = $tmp;
+            if ($rangeStartIndexes[0] > $rangeEndIndexes[0] && $rangeStartIndexes[1] > $rangeEndIndexes[1]) {
+                $tmp = $rangeStartIndexes;
+                $rangeStartIndexes = $rangeEndIndexes;
+                $rangeEndIndexes = $tmp;
             }
 
             // 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($rangeEnd[0] - $rangeStart[0] + 1, 3);
-                $yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3);
+                $xMax = min($rangeEndIndexes[0] - $rangeStartIndexes[0] + 1, 3);
+                $yMax = min($rangeEndIndexes[1] - $rangeStartIndexes[1] + 1, 3);
 
                 // 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($rangeEnd[0])
-                            : Coordinate::stringFromColumnIndex($rangeStart[0] + $x - 1);
+                        Coordinate::stringFromColumnIndex($rangeEndIndexes[0])
+                        : Coordinate::stringFromColumnIndex($rangeStartIndexes[0] + $x - 1);
                     // end column index for region
                     $colEnd = ($x == 1) ?
-                        Coordinate::stringFromColumnIndex($rangeStart[0])
-                            : Coordinate::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
+                        Coordinate::stringFromColumnIndex($rangeStartIndexes[0])
+                        : Coordinate::stringFromColumnIndex($rangeEndIndexes[0] - $xMax + $x);
 
                     for ($y = 1; $y <= $yMax; ++$y) {
                         // which edges are touching the region
@@ -291,17 +309,17 @@ class Style extends Supervisor
 
                         // start row index for region
                         $rowStart = ($y == 3) ?
-                            $rangeEnd[1] : $rangeStart[1] + $y - 1;
+                            $rangeEndIndexes[1] : $rangeStartIndexes[1] + $y - 1;
 
                         // end row index for region
                         $rowEnd = ($y == 1) ?
-                            $rangeStart[1] : $rangeEnd[1] - $yMax + $y;
+                            $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
@@ -313,8 +331,8 @@ class Style extends Supervisor
                                 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]);
                                     }
@@ -323,8 +341,8 @@ class Style extends Supervisor
                                 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]);
                                     }
@@ -348,54 +366,77 @@ class Style extends Supervisor
             // 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
-            switch ($selectionType) {
-                case 'COLUMN':
-                    $oldXfIndexes = [];
-                    for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                        $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
-                    }
-
-                    break;
-                case 'ROW':
-                    $oldXfIndexes = [];
-                    for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                        if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() == null) {
-                            $oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
-                        } else {
-                            $oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
-                        }
-                    }
-
-                    break;
-                case 'CELL':
-                    $oldXfIndexes = [];
-                    for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                            $oldXfIndexes[$this->getActiveSheet()->getCellByColumnAndRow($col, $row)->getXfIndex()] = true;
-                        }
-                    }
-
-                    break;
-            }
+            $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();
@@ -405,26 +446,32 @@ class Style extends Supervisor
             // Loop through columns, rows, or cells again and update the XF index
             switch ($selectionType) {
                 case 'COLUMN':
-                    for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                    for ($col = $rangeStartIndexes[0]; $col <= $rangeEndIndexes[0]; ++$col) {
                         $columnDimension = $this->getActiveSheet()->getColumnDimensionByColumn($col);
                         $oldXfIndex = $columnDimension->getXfIndex();
                         $columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
                     }
 
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
                     break;
                 case 'ROW':
-                    for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                    for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
                         $rowDimension = $this->getActiveSheet()->getRowDimension($row);
-                        $oldXfIndex = $rowDimension->getXfIndex() === null ?
-                            0 : $rowDimension->getXfIndex(); // row without explicit style should be formatted based on default style
+                        // row without explicit style should be formatted based on default style
+                        $oldXfIndex = $rowDimension->getXfIndex() ?? 0;
                         $rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
                     }
 
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
                     break;
                 case 'CELL':
-                    for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-                        for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                            $cell = $this->getActiveSheet()->getCellByColumnAndRow($col, $row);
+                    for ($col = $rangeStartIndexes[0]; $col <= $rangeEndIndexes[0]; ++$col) {
+                        for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
+                            $cell = $this->getActiveSheet()->getCell([$col, $row]);
                             $oldXfIndex = $cell->getXfIndex();
                             $cell->setXfIndex($newXfIndexes[$oldXfIndex]);
                         }
@@ -434,32 +481,83 @@ class Style extends Supervisor
             }
         } 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 $styleArray): array
+    {
+        $oldXfIndexes = [];
+        switch ($selectionType) {
+            case 'COLUMN':
+                for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                    $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
+                }
+                foreach ($this->getActiveSheet()->getColumnIterator($columnStart, $columnEnd) as $columnIterator) {
+                    $cellIterator = $columnIterator->getCellIterator();
+                    $cellIterator->setIterateOnlyExistingCells(true);
+                    foreach ($cellIterator as $columnCell) {
+                        if ($columnCell !== null) {
+                            $columnCell->getStyle()->applyFromArray($styleArray);
+                        }
+                    }
+                }
+
+                break;
+            case 'ROW':
+                for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                    if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() === null) {
+                        $oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
+                    } else {
+                        $oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
+                    }
+                }
+                foreach ($this->getActiveSheet()->getRowIterator((int) $rangeStart[1], (int) $rangeEnd[1]) as $rowIterator) {
+                    $cellIterator = $rowIterator->getCellIterator();
+                    $cellIterator->setIterateOnlyExistingCells(true);
+                    foreach ($cellIterator as $rowCell) {
+                        if ($rowCell !== null) {
+                            $rowCell->getStyle()->applyFromArray($styleArray);
+                        }
+                    }
+                }
+
+                break;
+            case 'CELL':
+                for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                    for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                        $oldXfIndexes[$this->getActiveSheet()->getCell([$col, $row])->getXfIndex()] = true;
+                    }
+                }
+
+                break;
+        }
+
+        return $oldXfIndexes;
+    }
+
     /**
      * Get Fill.
      *
@@ -483,8 +581,6 @@ class Style extends Supervisor
     /**
      * Set font.
      *
-     * @param Font $font
-     *
      * @return $this
      */
     public function setFont(Font $font)
@@ -537,13 +633,13 @@ class Style extends Supervisor
     /**
      * 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)
     {
-        $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
+        $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $conditionalStyleArray);
 
         return $this;
     }
@@ -575,20 +671,20 @@ class Style extends Supervisor
     /**
      * Set quote prefix.
      *
-     * @param bool $pValue
+     * @param bool $quotePrefix
      *
      * @return $this
      */
-    public function setQuotePrefix($pValue)
+    public function setQuotePrefix($quotePrefix)
     {
-        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;
@@ -601,18 +697,12 @@ class Style extends Supervisor
      */
     public function getHashCode()
     {
-        $hashConditionals = '';
-        foreach ($this->conditionalStyles as $conditional) {
-            $hashConditionals .= $conditional->getHashCode();
-        }
-
         return md5(
             $this->fill->getHashCode() .
             $this->font->getHashCode() .
             $this->borders->getHashCode() .
             $this->alignment->getHashCode() .
             $this->numberFormat->getHashCode() .
-            $hashConditionals .
             $this->protection->getHashCode() .
             ($this->quotePrefix ? 't' : 'f') .
             __CLASS__
@@ -632,10 +722,24 @@ class Style extends Supervisor
     /**
      * Set own index in style collection.
      *
-     * @param int $pValue
+     * @param int $index
      */
-    public function setIndex($pValue)
+    public function setIndex($index): void
     {
-        $this->index = $pValue;
+        $this->index = $index;
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'alignment', $this->getAlignment());
+        $this->exportArray2($exportedArray, 'borders', $this->getBorders());
+        $this->exportArray2($exportedArray, 'fill', $this->getFill());
+        $this->exportArray2($exportedArray, 'font', $this->getFont());
+        $this->exportArray2($exportedArray, 'numberFormat', $this->getNumberFormat());
+        $this->exportArray2($exportedArray, 'protection', $this->getProtection());
+        $this->exportArray2($exportedArray, 'quotePrefx', $this->getQuotePrefix());
+
+        return $exportedArray;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
index 1a700974b..8a5c350d0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
@@ -18,7 +18,7 @@ abstract class Supervisor implements IComparable
     /**
      * Parent. Only used for supervisor.
      *
-     * @var Spreadsheet|Style
+     * @var Spreadsheet|Supervisor
      */
     protected $parent;
 
@@ -45,7 +45,7 @@ abstract class Supervisor implements IComparable
     /**
      * Bind parent. Only used for supervisor.
      *
-     * @param Spreadsheet|Style $parent
+     * @param Spreadsheet|Supervisor $parent
      * @param null|string $parentPropertyName
      *
      * @return $this
@@ -114,4 +114,62 @@ abstract class Supervisor implements IComparable
             }
         }
     }
+
+    /**
+     * Export style as array.
+     *
+     * Available to anything which extends this class:
+     * Alignment, Border, Borders, Color, Fill, Font,
+     * NumberFormat, Protection, and Style.
+     */
+    final public function exportArray(): array
+    {
+        return $this->exportArray1();
+    }
+
+    /**
+     * Abstract method to be implemented in anything which
+     * extends this class.
+     *
+     * This method invokes exportArray2 with the names and values
+     * of all properties to be included in output array,
+     * returning that array to exportArray, then to caller.
+     */
+    abstract protected function exportArray1(): array;
+
+    /**
+     * Populate array from exportArray1.
+     * This method is available to anything which extends this class.
+     * The parameter index is the key to be added to the 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
+    {
+        if ($objOrValue instanceof self) {
+            $exportedArray[$index] = $objOrValue->exportArray();
+        } else {
+            $exportedArray[$index] = $objOrValue;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     *
+     * @return mixed
+     */
+    abstract public function getSharedComponent();
+
+    /**
+     * Build style array from subcomponents.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    abstract public function getStyleArray($array);
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
new file mode 100644
index 000000000..ab101f01e
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+class Theme
+{
+    /** @var string */
+    private $themeColorName = 'Office';
+
+    /** @var string */
+    private $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 $themeColors = self::COLOR_SCHEME_2007_2010;
+
+    /** @var string */
+    private $majorFontLatin = 'Cambria';
+
+    /** @var string */
+    private $majorFontEastAsian = '';
+
+    /** @var string */
+    private $majorFontComplexScript = '';
+
+    /** @var string */
+    private $minorFontLatin = 'Calibri';
+
+    /** @var string */
+    private $minorFontEastAsian = '';
+
+    /** @var string */
+    private $minorFontComplexScript = '';
+
+    /**
+     * Map of Major (header) fonts to write.
+     *
+     * @var string[]
+     */
+    private $majorFontSubstitutions = self::FONTS_TIMES_SUBSTITUTIONS;
+
+    /**
+     * Map of Minor (body) fonts to write.
+     *
+     * @var string[]
+     */
+    private $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;
+    }
+
+    /** @param null|array $substitutions */
+    public function setMajorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, $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;
+    }
+
+    /** @param null|array $substitutions */
+    public function setMinorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
index dcbc4da5b..cbc4ff65f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -2,19 +2,23 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use DateTime;
+use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\DateTime;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 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;
 
 class AutoFilter
 {
     /**
      * Autofilter Worksheet.
      *
-     * @var Worksheet
+     * @var null|Worksheet
      */
     private $workSheet;
 
@@ -32,22 +36,41 @@ class AutoFilter
      */
     private $columns = [];
 
+    /** @var bool */
+    private $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|array<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($range = '', ?Worksheet $worksheet = null)
     {
-        $this->range = $pRange;
-        $this->workSheet = $pSheet;
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+
+        $this->range = $range;
+        $this->workSheet = $worksheet;
     }
 
     /**
      * Get AutoFilter Parent Worksheet.
      *
-     * @return Worksheet
+     * @return null|Worksheet
      */
     public function getParent()
     {
@@ -57,13 +80,12 @@ class AutoFilter
     /**
      * Set AutoFilter Parent Worksheet.
      *
-     * @param Worksheet $pSheet
-     *
      * @return $this
      */
-    public function setParent(Worksheet $pSheet = null)
+    public function setParent(?Worksheet $worksheet = null)
     {
-        $this->workSheet = $pSheet;
+        $this->evaluated = false;
+        $this->workSheet = $worksheet;
 
         return $this;
     }
@@ -79,38 +101,54 @@ class AutoFilter
     }
 
     /**
-     * Set AutoFilter Range.
+     * Set AutoFilter Cell Range.
      *
-     * @param string $pRange Cell range (i.e. A1:E10)
-     *
-     * @throws PhpSpreadsheetException
-     *
-     * @return $this
+     * @param AddressRange|array<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($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);
             }
         }
 
@@ -132,20 +170,18 @@ class AutoFilter
      *
      * @param string $column Column name (e.g. A)
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return int The column offset within the autofilter range
      */
     public function testColumnInRange($column)
     {
         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];
@@ -154,50 +190,44 @@ class AutoFilter
     /**
      * Get a specified AutoFilter Column Offset within the defined AutoFilter range.
      *
-     * @param string $pColumn Column name (e.g. A)
-     *
-     * @throws PhpSpreadsheetException
+     * @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($column)
     {
-        return $this->testColumnInRange($pColumn);
+        return $this->testColumnInRange($column);
     }
 
     /**
      * Get a specified AutoFilter Column.
      *
-     * @param string $pColumn Column name (e.g. A)
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $column Column name (e.g. A)
      *
      * @return AutoFilter\Column
      */
-    public function getColumn($pColumn)
+    public function getColumn($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)
-     *
-     * @throws PhpSpreadsheetException
+     * @param int $columnOffset Column offset within range (starting from 0)
      *
      * @return AutoFilter\Column
      */
-    public function getColumnByOffset($pColumnOffset)
+    public function getColumnByOffset($columnOffset)
     {
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
-        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $pColumnOffset);
+        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
 
         return $this->getColumn($pColumn);
     }
@@ -205,29 +235,28 @@ class AutoFilter
     /**
      * Set AutoFilter.
      *
-     * @param AutoFilter\Column|string $pColumn
+     * @param AutoFilter\Column|string $columnObjectOrString
      *            A simple string containing a Column ID like 'A' is permitted
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setColumn($pColumn)
+    public function setColumn($columnObjectOrString)
     {
-        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 (is_object($columnObjectOrString) && ($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);
 
@@ -237,18 +266,17 @@ class AutoFilter
     /**
      * Clear a specified AutoFilter Column.
      *
-     * @param string $pColumn Column name (e.g. A)
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $column Column name (e.g. A)
      *
      * @return $this
      */
-    public function clearColumn($pColumn)
+    public function clearColumn($column)
     {
-        $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;
@@ -268,6 +296,7 @@ class AutoFilter
      */
     public function shiftColumn($fromColumn, $toColumn)
     {
+        $this->evaluated = false;
         $fromColumn = strtoupper($fromColumn);
         $toColumn = strtoupper($toColumn);
 
@@ -292,7 +321,7 @@ class AutoFilter
      *
      * @return bool
      */
-    private static function filterTestInSimpleDataSet($cellValue, $dataSet)
+    protected static function filterTestInSimpleDataSet($cellValue, $dataSet)
     {
         $dataSetValues = $dataSet['filterValues'];
         $blanks = $dataSet['blanks'];
@@ -311,27 +340,29 @@ class AutoFilter
      *
      * @return bool
      */
-    private static function filterTestInDateGroupSet($cellValue, $dataSet)
+    protected static function filterTestInDateGroupSet($cellValue, $dataSet)
     {
         $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) {
@@ -353,8 +384,9 @@ class AutoFilter
      *
      * @return bool
      */
-    private static function filterTestInCustomDataSet($cellValue, $ruleSet)
+    protected static function filterTestInCustomDataSet($cellValue, $ruleSet)
     {
+        /** @var array[] */
         $dataSet = $ruleSet['filterRules'];
         $join = $ruleSet['join'];
         $customRuleForBlanks = $ruleSet['customRuleForBlanks'] ?? false;
@@ -367,43 +399,50 @@ class AutoFilter
         }
         $returnVal = ($join == AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND);
         foreach ($dataSet as $rule) {
+            /** @var string */
+            $ruleValue = $rule['value'];
+            /** @var string */
+            $ruleOperator = $rule['operator'];
+            /** @var string */
+            $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:
+            } elseif ($ruleValue == '') {
+                switch ($ruleOperator) {
+                    case Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
                         $retVal = (($cellValue == '') || ($cellValue === null));
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                    case Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
                         $retVal = (($cellValue != '') && ($cellValue !== null));
 
                         break;
@@ -414,7 +453,32 @@ class AutoFilter
                 }
             } else {
                 //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-                $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue);
+                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 Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) < 0;
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) <= 0;
+
+                        break;
+                }
             }
             //    If there are multiple conditions, then we need to test both using the appropriate join operator
             switch ($join) {
@@ -445,7 +509,7 @@ class AutoFilter
      *
      * @return bool
      */
-    private static function filterTestInPeriodDateSet($cellValue, $monthSet)
+    protected static function filterTestInPeriodDateSet($cellValue, $monthSet)
     {
         //    Blank cells are always ignored, so return a FALSE
         if (($cellValue == '') || ($cellValue === null)) {
@@ -453,7 +517,8 @@ class AutoFilter
         }
 
         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;
             }
@@ -462,165 +527,298 @@ class AutoFilter
         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;
+    }
+
+    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
+    {
+        $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];
+    }
+
+    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;
+    }
+
+    private static function dynamicLastQuarter(): array
+    {
+        $maxval = self::firstDayOfQuarter();
+        $val = clone $maxval;
+        $val->modify('-3 months');
+
+        return [$val, $maxval];
+    }
+
+    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];
+    }
+
+    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);
+
+        return [$val, $maxval];
+    }
+
+    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];
+    }
+
+    private static function dynamicNextQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $val->modify('+3 months');
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
+
+        return [$val, $maxval];
+    }
+
+    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];
+    }
+
+    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];
+    }
+
+    private static function dynamicThisQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
+
+        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.
      *
      * @param string $dynamicRuleType
-     * @param AutoFilter\Column $filterColumn
      *
      * @return mixed[]
      */
-    private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
+    private function dynamicFilterDateRange($dynamicRuleType, AutoFilter\Column &$filterColumn)
     {
-        $rDateType = Functions::getReturnDateType();
-        Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
-        $val = $maxVal = null;
-
         $ruleValues = [];
-        $baseDate = DateTime::DATENOW();
+        $callBack = [__CLASS__, self::DATE_FUNCTIONS[$dynamicRuleType]]; // What if not found?
         //    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);
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
-                $baseDate = strtotime('-7 days', $baseDate);
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
-                $baseDate = strtotime('-1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
-                $baseDate = strtotime('+1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
-                $baseDate = strtotime('-3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
-                $baseDate = strtotime('+3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
-                $baseDate = strtotime('-1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
-                $baseDate = strtotime('+1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-        }
-
-        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;
-        }
-
-        switch ($dynamicRuleType) {
-            //    Adjust Today dates for Yesterday and Tomorrow
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
-                --$maxVal;
-                --$val;
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
-                ++$maxVal;
-                ++$val;
-
-                break;
+        //    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)
-    {
-        $range = $columnID . $startRow . ':' . $columnID . $endRow;
-        $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
-
-        $dataValues = array_filter($dataValues);
-        if ($ruleType == AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
-            rsort($dataValues);
-        } else {
-            sort($dataValues);
-        }
-
-        return array_pop(array_slice($dataValues, 0, $ruleValue));
-    }
-
     /**
      * Apply the AutoFilter rules to the AutoFilter Range.
      *
-     * @throws PhpSpreadsheetException
+     * @param string $columnID
+     * @param int $startRow
+     * @param int $endRow
+     * @param ?string $ruleType
+     * @param mixed $ruleValue
+     *
+     * @return mixed
+     */
+    private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
+    {
+        $range = $columnID . $startRow . ':' . $columnID . $endRow;
+        $retVal = null;
+        if ($this->workSheet !== null) {
+            $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
+            $dataValues = array_filter($dataValues);
+
+            if ($ruleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+                rsort($dataValues);
+            } else {
+                sort($dataValues);
+            }
+
+            $slice = array_slice($dataValues, 0, $ruleValue);
+
+            $retVal = array_pop($slice);
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Apply the AutoFilter rules to the AutoFilter Range.
      *
      * @return $this
      */
     public function showHideRows()
     {
+        if ($this->workSheet === null) {
+            return $this;
+        }
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
 
         //    The heading row should always be visible
@@ -644,7 +842,7 @@ class AutoFilter
                     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',
@@ -658,30 +856,45 @@ class AutoFilter
                             '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] !== '')) {
-                                $date .= sprintf('%04d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
+                                ($ruleValue[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] != '')) {
-                                $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
+                                ($ruleValue[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] !== '')) {
-                                $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
+                                ($ruleValue[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] !== '')) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
+                                ($ruleValue[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] !== '')) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
+                                ($ruleValue[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] !== '')) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
+                                ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')
+                            ) {
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
                             }
                             $dateTime = $date . $time;
                             $arguments['date'][] = $date;
@@ -700,15 +913,14 @@ class AutoFilter
 
                     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);
@@ -728,16 +940,22 @@ class AutoFilter
                     foreach ($rules as $rule) {
                         //    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)) {
+                        if (
+                            ($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'));
+                            $spreadsheet = ($this->workSheet === null) ? null : $this->workSheet->getParent();
+                            $average = Calculation::getInstance($spreadsheet)->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,
@@ -779,27 +997,30 @@ class AutoFilter
                 case AutoFilter\Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER:
                     $ruleValues = [];
                     $dataRowCount = $rangeEnd[1] - $rangeStart[1];
+                    $toptenRuleType = null;
+                    $ruleValue = 0;
+                    $ruleOperator = null;
                     foreach ($rules as $rule) {
                         //    We should only ever have one Dynamic Filter Rule anyway
                         $toptenRuleType = $rule->getGrouping();
                         $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 = floor((float) $ruleValue * ($dataRowCount / 100));
                     }
-                    if ($ruleValue < 1) {
+                    if (!is_array($ruleValue) && $ruleValue < 1) {
                         $ruleValue = 1;
                     }
-                    if ($ruleValue > 500) {
+                    if (!is_array($ruleValue) && $ruleValue > 500) {
                         $ruleValue = 500;
                     }
 
-                    $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, $rangeEnd[1], $toptenRuleType, $ruleValue);
+                    $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',
@@ -811,29 +1032,53 @@ class AutoFilter
             }
         }
 
+        $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']]
-                    );
+                $result = // $result && // phpstan says $result is always true here
+                    // @phpstan-ignore-next-line
+                    call_user_func_array([self::class, $columnFilterTest['method']], [$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);
+            $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 $e) {
+                // 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.
      */
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
index 3ed7270a1..076292f37 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
@@ -49,7 +49,7 @@ class Column
     /**
      * Autofilter.
      *
-     * @var AutoFilter
+     * @var null|AutoFilter
      */
     private $parent;
 
@@ -77,27 +77,34 @@ class Column
     /**
      * Autofilter Column Rules.
      *
-     * @var array of Column\Rule
+     * @var Column\Rule[]
      */
     private $ruleset = [];
 
     /**
      * Autofilter Column Dynamic Attributes.
      *
-     * @var array of mixed
+     * @var mixed[]
      */
     private $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($column, ?AutoFilter $parent = null)
     {
-        $this->columnIndex = $pColumn;
-        $this->parent = $pParent;
+        $this->columnIndex = $column;
+        $this->parent = $parent;
+    }
+
+    public function setEvaluatedFalse(): void
+    {
+        if ($this->parent !== null) {
+            $this->parent->setEvaluated(false);
+        }
     }
 
     /**
@@ -113,21 +120,20 @@ class Column
     /**
      * Set AutoFilter column index as string eg: 'A'.
      *
-     * @param string $pColumn Column (e.g. A)
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $column Column (e.g. A)
      *
      * @return $this
      */
-    public function setColumnIndex($pColumn)
+    public function setColumnIndex($column)
     {
+        $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;
     }
@@ -135,7 +141,7 @@ class Column
     /**
      * Get this Column's AutoFilter Parent.
      *
-     * @return AutoFilter
+     * @return null|AutoFilter
      */
     public function getParent()
     {
@@ -145,13 +151,12 @@ class Column
     /**
      * Set this Column's AutoFilter Parent.
      *
-     * @param AutoFilter $pParent
-     *
      * @return $this
      */
-    public function setParent(AutoFilter $pParent = null)
+    public function setParent(?AutoFilter $parent = null)
     {
-        $this->parent = $pParent;
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
 
         return $this;
     }
@@ -169,19 +174,21 @@ class Column
     /**
      * Set AutoFilter Type.
      *
-     * @param string $pFilterType
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $filterType
      *
      * @return $this
      */
-    public function setFilterType($pFilterType)
+    public function setFilterType($filterType)
     {
-        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;
     }
@@ -199,21 +206,20 @@ class Column
     /**
      * Set AutoFilter Multiple Rules And/Or.
      *
-     * @param string $pJoin And/Or
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $join And/Or
      *
      * @return $this
      */
-    public function setJoin($pJoin)
+    public function setJoin($join)
     {
+        $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;
     }
@@ -221,12 +227,13 @@ class Column
     /**
      * Set AutoFilter Attributes.
      *
-     * @param string[] $attributes
+     * @param mixed[] $attributes
      *
      * @return $this
      */
-    public function setAttributes(array $attributes)
+    public function setAttributes($attributes)
     {
+        $this->setEvaluatedFalse();
         $this->attributes = $attributes;
 
         return $this;
@@ -235,14 +242,15 @@ class Column
     /**
      * Set An AutoFilter Attribute.
      *
-     * @param string $pName Attribute Name
-     * @param string $pValue Attribute Value
+     * @param string $name Attribute Name
+     * @param int|string $value Attribute Value
      *
      * @return $this
      */
-    public function setAttribute($pName, $pValue)
+    public function setAttribute($name, $value)
     {
-        $this->attributes[$pName] = $pValue;
+        $this->setEvaluatedFalse();
+        $this->attributes[$name] = $value;
 
         return $this;
     }
@@ -250,7 +258,7 @@ class Column
     /**
      * Get AutoFilter Column Attributes.
      *
-     * @return string[]
+     * @return int[]|string[]
      */
     public function getAttributes()
     {
@@ -260,19 +268,24 @@ class Column
     /**
      * Get specific AutoFilter Column Attribute.
      *
-     * @param string $pName Attribute Name
+     * @param string $name Attribute Name
      *
-     * @return string
+     * @return null|int|string
      */
-    public function getAttribute($pName)
+    public function getAttribute($name)
     {
-        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.
      *
@@ -286,17 +299,17 @@ class Column
     /**
      * Get a specified AutoFilter Column Rule.
      *
-     * @param int $pIndex Rule index in the ruleset array
+     * @param int $index Rule index in the ruleset array
      *
      * @return Column\Rule
      */
-    public function getRule($pIndex)
+    public function getRule($index)
     {
-        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];
     }
 
     /**
@@ -306,6 +319,10 @@ class Column
      */
     public function createRule()
     {
+        $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);
@@ -314,14 +331,13 @@ class Column
     /**
      * Add a new AutoFilter Column Rule to the ruleset.
      *
-     * @param Column\Rule $pRule
-     *
      * @return $this
      */
-    public function addRule(Column\Rule $pRule)
+    public function addRule(Column\Rule $rule)
     {
-        $pRule->setParent($this);
-        $this->ruleset[] = $pRule;
+        $this->setEvaluatedFalse();
+        $rule->setParent($this);
+        $this->ruleset[] = $rule;
 
         return $this;
     }
@@ -330,14 +346,15 @@ class Column
      * 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($index)
     {
-        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);
@@ -354,6 +371,7 @@ class Column
      */
     public function clearRules()
     {
+        $this->setEvaluatedFalse();
         $this->ruleset = [];
         $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
 
@@ -378,8 +396,6 @@ class Column
                     $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
index 09a2bacdd..408dfb3f0 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
+++ b/libraries/phpspreadsheet/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,49 +153,27 @@ 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
+     * @var ?Column
      */
     private $parent;
 
@@ -217,7 +187,7 @@ class Rule
     /**
      * Autofilter Rule Value.
      *
-     * @var string
+     * @var int|int[]|string|string[]
      */
     private $value = '';
 
@@ -237,12 +207,17 @@ class Rule
 
     /**
      * 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();
+        }
     }
 
     /**
@@ -258,19 +233,18 @@ class Rule
     /**
      * Set AutoFilter Rule Type.
      *
-     * @param string $pRuleType see self::AUTOFILTER_RULETYPE_*
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $ruleType see self::AUTOFILTER_RULETYPE_*
      *
      * @return $this
      */
-    public function setRuleType($pRuleType)
+    public function setRuleType($ruleType)
     {
-        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;
     }
@@ -278,7 +252,7 @@ class Rule
     /**
      * Get AutoFilter Rule Value.
      *
-     * @return string
+     * @return int|int[]|string|string[]
      */
     public function getValue()
     {
@@ -288,33 +262,32 @@ class Rule
     /**
      * Set AutoFilter Rule Value.
      *
-     * @param string|string[] $pValue
-     *
-     * @throws PhpSpreadsheetException
+     * @param int|int[]|string|string[] $value
      *
      * @return $this
      */
-    public function setValue($pValue)
+    public function setValue($value)
     {
-        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;
     }
@@ -332,22 +305,23 @@ class Rule
     /**
      * Set AutoFilter Rule Operator.
      *
-     * @param string $pOperator see self::AUTOFILTER_COLUMN_RULE_*
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
      *
      * @return $this
      */
-    public function setOperator($pOperator)
+    public function setOperator($operator)
     {
-        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))) {
+        if (
+            (!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;
     }
@@ -365,21 +339,22 @@ class Rule
     /**
      * Set AutoFilter Rule Grouping.
      *
-     * @param string $pGrouping
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $grouping
      *
      * @return $this
      */
-    public function setGrouping($pGrouping)
+    public function setGrouping($grouping)
     {
-        if (($pGrouping !== null) &&
-            (!in_array($pGrouping, self::$dateTimeGroups)) &&
-            (!in_array($pGrouping, self::$dynamicTypes)) &&
-            (!in_array($pGrouping, self::$topTenType))) {
-            throw new PhpSpreadsheetException('Invalid rule type for column AutoFilter Rule.');
+        $this->setEvaluatedFalse();
+        if (
+            ($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 grouping for column AutoFilter Rule.');
         }
-        $this->grouping = $pGrouping;
+        $this->grouping = $grouping;
 
         return $this;
     }
@@ -387,23 +362,22 @@ class Rule
     /**
      * Set AutoFilter Rule.
      *
-     * @param string $pOperator see self::AUTOFILTER_COLUMN_RULE_*
-     * @param string|string[] $pValue
-     * @param string $pGrouping
-     *
-     * @throws PhpSpreadsheetException
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
+     * @param int|int[]|string|string[] $value
+     * @param string $grouping
      *
      * @return $this
      */
-    public function setRule($pOperator, $pValue, $pGrouping = null)
+    public function setRule($operator, $value, $grouping = null)
     {
-        $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;
@@ -412,7 +386,7 @@ class Rule
     /**
      * Get this Rule's AutoFilter Column Parent.
      *
-     * @return Column
+     * @return ?Column
      */
     public function getParent()
     {
@@ -422,13 +396,12 @@ class Rule
     /**
      * Set this Rule's AutoFilter Column Parent.
      *
-     * @param Column $pParent
-     *
      * @return $this
      */
-    public function setParent(Column $pParent = null)
+    public function setParent(?Column $parent = null)
     {
-        $this->parent = $pParent;
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
 
         return $this;
     }
@@ -441,11 +414,9 @@ class Rule
         $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php
new file mode 100644
index 000000000..46a0e9c74
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
index 7d24e4496..49e2eff10 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
@@ -8,6 +8,22 @@ use PhpOffice\PhpSpreadsheet\IComparable;
 
 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.
+     *
+     * @var string
+     */
+    protected $editAs = '';
+
     /**
      * Image counter.
      *
@@ -27,19 +43,19 @@ class BaseDrawing implements IComparable
      *
      * @var string
      */
-    protected $name;
+    protected $name = '';
 
     /**
      * Description.
      *
      * @var string
      */
-    protected $description;
+    protected $description = '';
 
     /**
      * Worksheet.
      *
-     * @var Worksheet
+     * @var null|Worksheet
      */
     protected $worksheet;
 
@@ -48,49 +64,84 @@ class BaseDrawing implements IComparable
      *
      * @var string
      */
-    protected $coordinates;
+    protected $coordinates = 'A1';
 
     /**
      * Offset X.
      *
      * @var int
      */
-    protected $offsetX;
+    protected $offsetX = 0;
 
     /**
      * Offset Y.
      *
      * @var int
      */
-    protected $offsetY;
+    protected $offsetY = 0;
+
+    /**
+     * Coordinates2.
+     *
+     * @var string
+     */
+    protected $coordinates2 = '';
+
+    /**
+     * Offset X2.
+     *
+     * @var int
+     */
+    protected $offsetX2 = 0;
+
+    /**
+     * Offset Y2.
+     *
+     * @var int
+     */
+    protected $offsetY2 = 0;
 
     /**
      * Width.
      *
      * @var int
      */
-    protected $width;
+    protected $width = 0;
 
     /**
      * Height.
      *
      * @var int
      */
-    protected $height;
+    protected $height = 0;
+
+    /**
+     * Pixel width of image. See $width for the size the Drawing will be in the sheet.
+     *
+     * @var int
+     */
+    protected $imageWidth = 0;
+
+    /**
+     * Pixel width of image. See $height for the size the Drawing will be in the sheet.
+     *
+     * @var int
+     */
+    protected $imageHeight = 0;
 
     /**
      * Proportional resize.
      *
      * @var bool
      */
-    protected $resizeProportional;
+    protected $resizeProportional = true;
 
     /**
      * Rotation.
      *
      * @var int
      */
-    protected $rotation;
+    protected $rotation = 0;
 
     /**
      * Shadow.
@@ -106,93 +157,56 @@ class BaseDrawing implements IComparable
      */
     private $hyperlink;
 
+    /**
+     * Image type.
+     *
+     * @var int
+     */
+    protected $type = IMAGETYPE_UNKNOWN;
+
     /**
      * Create a new BaseDrawing.
      */
     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 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 Worksheet
-     */
-    public function getWorksheet()
+    public function getWorksheet(): ?Worksheet
     {
         return $this->worksheet;
     }
@@ -200,28 +214,25 @@ class BaseDrawing implements IComparable
     /**
      * Set Worksheet.
      *
-     * @param Worksheet $pValue
-     * @param bool $pOverrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
-     *
-     * @throws PhpSpreadsheetException
-     *
-     * @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();
 
                 while ($iterator->valid()) {
-                    if ($iterator->current()->getHashCode() == $this->getHashCode()) {
-                        $this->worksheet->getDrawingCollection()->offsetUnset($iterator->key());
+                    if ($iterator->current()->getHashCode() === $this->getHashCode()) {
+                        $this->worksheet->getDrawingCollection()->offsetUnset(/** @scrutinizer ignore-type */ $iterator->key());
                         $this->worksheet = null;
 
                         break;
@@ -229,7 +240,7 @@ class BaseDrawing implements IComparable
                 }
 
                 // 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.');
             }
@@ -238,136 +249,112 @@ class BaseDrawing implements IComparable
         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 = 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 = round($ratio * $pValue);
+            $this->width = (int) round($ratio * $height);
         }
 
         // Set height
-        $this->height = $pValue;
+        $this->height = $height;
 
         return $this;
     }
@@ -382,22 +369,17 @@ class BaseDrawing implements IComparable
      * </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);
         if ($this->resizeProportional && !($width == 0 || $height == 0)) {
             if (($xratio * $this->height) < $height) {
-                $this->height = ceil($xratio * $this->height);
+                $this->height = (int) ceil($xratio * $this->height);
                 $this->width = $width;
             } else {
-                $this->width = ceil($yratio * $this->width);
+                $this->width = (int) ceil($yratio * $this->width);
                 $this->height = $height;
             }
         } else {
@@ -408,74 +390,38 @@ class BaseDrawing implements IComparable
         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(): Drawing\Shadow
     {
         return $this->shadow;
     }
 
-    /**
-     * Set Shadow.
-     *
-     * @param Drawing\Shadow $pValue
-     *
-     * @return $this
-     */
-    public function setShadow(Drawing\Shadow $pValue = null)
+    public function setShadow(?Drawing\Shadow $shadow = null): self
     {
-        $this->shadow = $pValue;
+        $this->shadow = $shadow ?? new Drawing\Shadow();
 
         return $this;
     }
@@ -490,10 +436,13 @@ class BaseDrawing implements IComparable
         return md5(
             $this->name .
             $this->description .
-            $this->worksheet->getHashCode() .
+            (($this->worksheet === null) ? '' : $this->worksheet->getHashCode()) .
             $this->coordinates .
             $this->offsetX .
             $this->offsetY .
+            $this->coordinates2 .
+            $this->offsetX2 .
+            $this->offsetY2 .
             $this->width .
             $this->height .
             $this->rotation .
@@ -519,19 +468,68 @@ class BaseDrawing implements IComparable
         }
     }
 
-    /**
-     * @param null|Hyperlink $pHyperlink
-     */
-    public function setHyperlink(Hyperlink $pHyperlink = null)
+    public function setHyperlink(?Hyperlink $hyperlink = null): void
     {
-        $this->hyperlink = $pHyperlink;
+        $this->hyperlink = $hyperlink;
     }
 
-    /**
-     * @return null|Hyperlink
-     */
-    public function getHyperlink()
+    public function getHyperlink(): ?Hyperlink
     {
         return $this->hyperlink;
     }
+
+    /**
+     * Set Fact Sizes and Type of Image.
+     */
+    protected function setSizesAndType(string $path): void
+    {
+        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);
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
index d97e33f7d..8d56fb89d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
@@ -2,10 +2,25 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+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.
      *
@@ -13,6 +28,13 @@ abstract class CellIterator implements \Iterator
      */
     protected $worksheet;
 
+    /**
+     * Cell Collection to iterate.
+     *
+     * @var Cells
+     */
+    protected $cellCollection;
+
     /**
      * Iterate only existing cells.
      *
@@ -20,39 +42,50 @@ abstract class CellIterator implements \Iterator
      */
     protected $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.
+     *
+     * @var bool
+     */
+    protected $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW;
+
     /**
      * Destructor.
      */
     public function __destruct()
     {
-        unset($this->worksheet);
+        // @phpstan-ignore-next-line
+        $this->worksheet = $this->cellCollection = null;
+    }
+
+    public function getIfNotExists(): bool
+    {
+        return $this->ifNotExists;
+    }
+
+    public function setIfNotExists(bool $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW): void
+    {
+        $this->ifNotExists = $ifNotExists;
     }
 
     /**
      * Get loop only existing cells.
-     *
-     * @return bool
      */
-    public function getIterateOnlyExistingCells()
+    public function getIterateOnlyExistingCells(): bool
     {
         return $this->onlyExistingCells;
     }
 
     /**
-     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
-     *
-     * @throws PhpSpreadsheetException
+     * 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.
-     *
-     * @param bool $value
-     *
-     * @throws PhpSpreadsheetException
      */
-    public function setIterateOnlyExistingCells($value)
+    public function setIterateOnlyExistingCells(bool $value): void
     {
         $this->onlyExistingCells = (bool) $value;
 
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
index 098967f72..077ba5da9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
@@ -9,7 +9,7 @@ class Column
      *
      * @var Worksheet
      */
-    private $parent;
+    private $worksheet;
 
     /**
      * Column index.
@@ -21,13 +21,12 @@ class Column
     /**
      * Create a new column.
      *
-     * @param Worksheet $parent
      * @param string $columnIndex
      */
-    public function __construct(Worksheet $parent = null, $columnIndex = 'A')
+    public function __construct(Worksheet $worksheet, $columnIndex = 'A')
     {
         // Set parent and column index
-        $this->parent = $parent;
+        $this->worksheet = $worksheet;
         $this->columnIndex = $columnIndex;
     }
 
@@ -36,15 +35,14 @@ class Column
      */
     public function __destruct()
     {
-        unset($this->parent);
+        // @phpstan-ignore-next-line
+        $this->worksheet = null;
     }
 
     /**
      * Get column index as string eg: 'A'.
-     *
-     * @return string
      */
-    public function getColumnIndex()
+    public function getColumnIndex(): string
     {
         return $this->columnIndex;
     }
@@ -54,11 +52,70 @@ class Column
      *
      * @param int $startRow The row number at which to start iterating
      * @param int $endRow Optionally, the row number at which to stop iterating
-     *
-     * @return ColumnCellIterator
      */
-    public function getCellIterator($startRow = 1, $endRow = null)
+    public function getCellIterator($startRow = 1, $endRow = null): ColumnCellIterator
     {
-        return new ColumnCellIterator($this->parent, $this->columnIndex, $startRow, $endRow);
+        return new ColumnCellIterator($this->worksheet, $this->columnIndex, $startRow, $endRow);
+    }
+
+    /**
+     * Get row iterator. Synonym for getCellIterator().
+     *
+     * @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($startRow = 1, $endRow = null): ColumnCellIterator
+    {
+        return $this->getCellIterator($startRow, $endRow);
+    }
+
+    /**
+     * 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, $startRow = 1, $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) {
+            /** @scrutinizer ignore-call */
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns bound worksheet.
+     */
+    public function getWorksheet(): Worksheet
+    {
+        return $this->worksheet;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
index d75da8988..ed88d4eca 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
@@ -2,9 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
+/**
+ * @extends CellIterator<int>
+ */
 class ColumnCellIterator extends CellIterator
 {
     /**
@@ -17,7 +21,7 @@ class ColumnCellIterator extends CellIterator
     /**
      * Column index.
      *
-     * @var string
+     * @var int
      */
     private $columnIndex;
 
@@ -38,15 +42,16 @@ class ColumnCellIterator extends CellIterator
     /**
      * 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
      */
-    public function __construct(Worksheet $subject = null, $columnIndex = 'A', $startRow = 1, $endRow = null)
+    public function __construct(Worksheet $worksheet, $columnIndex = 'A', $startRow = 1, $endRow = null)
     {
         // Set subject
-        $this->worksheet = $subject;
+        $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
         $this->columnIndex = Coordinate::columnIndexFromString($columnIndex);
         $this->resetEnd($endRow);
         $this->resetStart($startRow);
@@ -57,11 +62,9 @@ class ColumnCellIterator extends CellIterator
      *
      * @param int $startRow The row number at which to start iterating
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function resetStart($startRow = 1)
+    public function resetStart(int $startRow = 1)
     {
         $this->startRow = $startRow;
         $this->adjustForExistingOnlyRange();
@@ -75,13 +78,11 @@ class ColumnCellIterator extends CellIterator
      *
      * @param int $endRow The row number at which to stop iterating
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function resetEnd($endRow = null)
     {
-        $this->endRow = ($endRow) ? $endRow : $this->worksheet->getHighestRow();
+        $this->endRow = $endRow ?: $this->worksheet->getHighestRow();
         $this->adjustForExistingOnlyRange();
 
         return $this;
@@ -92,16 +93,18 @@ class ColumnCellIterator extends CellIterator
      *
      * @param int $row The row number to set the current pointer at
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function seek($row = 1)
+    public function seek(int $row = 1)
     {
+        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)) {
             throw new PhpSpreadsheetException("Row $row is out of range ({$this->startRow} - {$this->endRow})");
-        } elseif ($this->onlyExistingCells && !($this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $row))) {
-            throw new PhpSpreadsheetException('In "IterateOnlyExistingCells" mode and Cell does not exist');
         }
         $this->currentRow = $row;
 
@@ -111,27 +114,31 @@ class ColumnCellIterator extends CellIterator
     /**
      * Rewind the iterator to the starting row.
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->currentRow = $this->startRow;
     }
 
     /**
      * Return the current cell in this worksheet column.
-     *
-     * @return null|\PhpOffice\PhpSpreadsheet\Cell\Cell
      */
-    public function current()
+    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
+            );
     }
 
     /**
      * Return the current iterator key.
-     *
-     * @return int
      */
-    public function key()
+    public function key(): int
     {
         return $this->currentRow;
     }
@@ -139,59 +146,60 @@ class ColumnCellIterator extends CellIterator
     /**
      * Set the iterator to its next value.
      */
-    public function next()
+    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));
+        } while (
+            ($this->onlyExistingCells) &&
+            ($this->currentRow <= $this->endRow) &&
+            (!$this->cellCollection->has($columnAddress . $this->currentRow))
+        );
     }
 
     /**
      * Set the iterator to its previous value.
      */
-    public function prev()
+    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));
+        } while (
+            ($this->onlyExistingCells) &&
+            ($this->currentRow >= $this->startRow) &&
+            (!$this->cellCollection->has($columnAddress . $this->currentRow))
+        );
     }
 
     /**
      * Indicate if more rows exist in the worksheet range of rows that we're iterating.
-     *
-     * @return bool
      */
-    public function valid()
+    public function valid(): bool
     {
         return $this->currentRow <= $this->endRow && $this->currentRow >= $this->startRow;
     }
 
     /**
      * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
-     *
-     * @throws PhpSpreadsheetException
      */
-    protected function adjustForExistingOnlyRange()
+    protected function adjustForExistingOnlyRange(): void
     {
         if ($this->onlyExistingCells) {
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->startRow)) &&
-                ($this->startRow <= $this->endRow)) {
+            $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
+            while (
+                (!$this->cellCollection->has($columnAddress . $this->startRow)) &&
+                ($this->startRow <= $this->endRow)
+            ) {
                 ++$this->startRow;
             }
-            if ($this->startRow > $this->endRow) {
-                throw new PhpSpreadsheetException('No cells exist within the specified range');
-            }
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->endRow)) &&
-                ($this->endRow >= $this->startRow)) {
+            while (
+                (!$this->cellCollection->has($columnAddress . $this->endRow)) &&
+                ($this->endRow >= $this->startRow)
+            ) {
                 --$this->endRow;
             }
-            if ($this->endRow < $this->startRow) {
-                throw new PhpSpreadsheetException('No cells exist within the specified range');
-            }
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
index 4e87a344c..939364828 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
 class ColumnDimension extends Dimension
 {
     /**
      * Column index.
      *
-     * @var string
+     * @var ?string
      */
     private $columnIndex;
 
@@ -30,12 +33,12 @@ class ColumnDimension extends Dimension
     /**
      * Create a new ColumnDimension.
      *
-     * @param string $pIndex Character column index
+     * @param ?string $index Character column index
      */
-    public function __construct($pIndex = 'A')
+    public function __construct($index = 'A')
     {
         // Initialise values
-        $this->columnIndex = $pIndex;
+        $this->columnIndex = $index;
 
         // set dimension as unformatted by default
         parent::__construct(0);
@@ -43,24 +46,36 @@ class ColumnDimension extends Dimension
 
     /**
      * Get column index as string eg: 'A'.
-     *
-     * @return string
      */
-    public function getColumnIndex()
+    public function getColumnIndex(): ?string
     {
         return $this->columnIndex;
     }
 
     /**
      * Set column index as string eg: 'A'.
-     *
-     * @param string $pValue
-     *
-     * @return $this
      */
-    public function setColumnIndex($pValue)
+    public function setColumnIndex(string $index): self
     {
-        $this->columnIndex = $pValue;
+        $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;
     }
@@ -68,33 +83,42 @@ class ColumnDimension extends Dimension
     /**
      * Get Width.
      *
-     * @return float
+     * 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()
+    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.
      *
-     * @param float $pValue
+     * 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($pValue)
+    public function setWidth(float $width, ?string $unitOfMeasure = null)
     {
-        $this->width = $pValue;
+        $this->width = ($unitOfMeasure === null || $width < 0)
+            ? $width
+            : (new CssDimension("{$width}{$unitOfMeasure}"))->width();
 
         return $this;
     }
 
     /**
      * Get Auto Size.
-     *
-     * @return bool
      */
-    public function getAutoSize()
+    public function getAutoSize(): bool
     {
         return $this->autoSize;
     }
@@ -102,13 +126,11 @@ class ColumnDimension extends Dimension
     /**
      * Set Auto Size.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setAutoSize($pValue)
+    public function setAutoSize(bool $autosizeEnabled)
     {
-        $this->autoSize = $pValue;
+        $this->autoSize = $autosizeEnabled;
 
         return $this;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
index c8913cc16..fffef1292 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+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.
@@ -56,7 +60,8 @@ class ColumnIterator implements \Iterator
      */
     public function __destruct()
     {
-        unset($this->worksheet);
+        // @phpstan-ignore-next-line
+        $this->worksheet = null;
     }
 
     /**
@@ -64,15 +69,15 @@ class ColumnIterator implements \Iterator
      *
      * @param string $startColumn The column address at which to start iterating
      *
-     * @throws Exception
-     *
      * @return $this
      */
-    public function resetStart($startColumn = 'A')
+    public function resetStart(string $startColumn = 'A')
     {
         $startColumnIndex = Coordinate::columnIndexFromString($startColumn);
         if ($startColumnIndex > Coordinate::columnIndexFromString($this->worksheet->getHighestColumn())) {
-            throw new Exception("Start column ({$startColumn}) is beyond highest column ({$this->worksheet->getHighestColumn()})");
+            throw new Exception(
+                "Start column ({$startColumn}) is beyond highest column ({$this->worksheet->getHighestColumn()})"
+            );
         }
 
         $this->startColumnIndex = $startColumnIndex;
@@ -93,7 +98,7 @@ class ColumnIterator implements \Iterator
      */
     public function resetEnd($endColumn = null)
     {
-        $endColumn = $endColumn ? $endColumn : $this->worksheet->getHighestColumn();
+        $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
         $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
 
         return $this;
@@ -104,15 +109,15 @@ class ColumnIterator implements \Iterator
      *
      * @param string $column The column address to set the current pointer at
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function seek($column = 'A')
+    public function seek(string $column = 'A')
     {
         $column = Coordinate::columnIndexFromString($column);
         if (($column < $this->startColumnIndex) || ($column > $this->endColumnIndex)) {
-            throw new PhpSpreadsheetException("Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
+            throw new PhpSpreadsheetException(
+                "Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})"
+            );
         }
         $this->currentColumnIndex = $column;
 
@@ -122,27 +127,23 @@ class ColumnIterator implements \Iterator
     /**
      * Rewind the iterator to the starting column.
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->currentColumnIndex = $this->startColumnIndex;
     }
 
     /**
      * 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));
     }
 
     /**
      * Return the current iterator key.
-     *
-     * @return string
      */
-    public function key()
+    public function key(): string
     {
         return Coordinate::stringFromColumnIndex($this->currentColumnIndex);
     }
@@ -150,7 +151,7 @@ class ColumnIterator implements \Iterator
     /**
      * Set the iterator to its next value.
      */
-    public function next()
+    public function next(): void
     {
         ++$this->currentColumnIndex;
     }
@@ -158,17 +159,15 @@ class ColumnIterator implements \Iterator
     /**
      * Set the iterator to its previous value.
      */
-    public function prev()
+    public function prev(): void
     {
         --$this->currentColumnIndex;
     }
 
     /**
      * 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;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
index ce40cf57f..ba03b5b72 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
@@ -47,10 +47,8 @@ abstract class Dimension
 
     /**
      * Get Visible.
-     *
-     * @return bool
      */
-    public function getVisible()
+    public function getVisible(): bool
     {
         return $this->visible;
     }
@@ -58,23 +56,19 @@ abstract class Dimension
     /**
      * Set Visible.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setVisible($pValue)
+    public function setVisible(bool $visible)
     {
-        $this->visible = (bool) $pValue;
+        $this->visible = $visible;
 
         return $this;
     }
 
     /**
      * Get Outline Level.
-     *
-     * @return int
      */
-    public function getOutlineLevel()
+    public function getOutlineLevel(): int
     {
         return $this->outlineLevel;
     }
@@ -83,29 +77,23 @@ abstract class Dimension
      * Set Outline Level.
      * Value must be between 0 and 7.
      *
-     * @param int $pValue
-     *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function setOutlineLevel($pValue)
+    public function setOutlineLevel(int $level)
     {
-        if ($pValue < 0 || $pValue > 7) {
+        if ($level < 0 || $level > 7) {
             throw new PhpSpreadsheetException('Outline level must range between 0 and 7.');
         }
 
-        $this->outlineLevel = $pValue;
+        $this->outlineLevel = $level;
 
         return $this;
     }
 
     /**
      * Get Collapsed.
-     *
-     * @return bool
      */
-    public function getCollapsed()
+    public function getCollapsed(): bool
     {
         return $this->collapsed;
     }
@@ -113,13 +101,11 @@ abstract class Dimension
     /**
      * Set Collapsed.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setCollapsed($pValue)
+    public function setCollapsed(bool $collapsed)
     {
-        $this->collapsed = (bool) $pValue;
+        $this->collapsed = $collapsed;
 
         return $this;
     }
@@ -129,7 +115,7 @@ abstract class Dimension
      *
      * @return int
      */
-    public function getXfIndex()
+    public function getXfIndex(): ?int
     {
         return $this->xfIndex;
     }
@@ -137,29 +123,12 @@ abstract class Dimension
     /**
      * Set index to cellXf.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setXfIndex($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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
index da492b4c3..aec54266d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
@@ -3,9 +3,17 @@
 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.
      *
@@ -13,6 +21,13 @@ class Drawing extends BaseDrawing
      */
     private $path;
 
+    /**
+     * Whether or not we are dealing with a URL.
+     *
+     * @var bool
+     */
+    private $isUrl;
+
     /**
      * Create a new Drawing.
      */
@@ -20,6 +35,7 @@ class Drawing extends BaseDrawing
     {
         // Initialise values
         $this->path = '';
+        $this->isUrl = false;
 
         // Initialize parent
         parent::__construct();
@@ -37,15 +53,10 @@ class Drawing extends BaseDrawing
 
     /**
      * 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();
     }
 
     /**
@@ -60,6 +71,20 @@ class Drawing extends BaseDrawing
         return $exploded[count($exploded) - 1];
     }
 
+    /**
+     * Get full filepath to store drawing in zip archive.
+     *
+     * @return string
+     */
+    public function getMediaFilename()
+    {
+        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.
      *
@@ -73,29 +98,101 @@ class Drawing extends BaseDrawing
     /**
      * Set Path.
      *
-     * @param string $pValue File path
-     * @param bool $pVerifyFile Verify file
-     *
-     * @throws PhpSpreadsheetException
+     * @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($path, $verifyFile = true, $zip = null)
     {
-        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 (substr($path, 0, 6) === '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;
     }
@@ -113,4 +210,42 @@ class Drawing extends BaseDrawing
             __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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
index c7594dae9..ca396d221 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
@@ -52,7 +52,7 @@ class Shadow implements IComparable
     /**
      * Shadow alignment.
      *
-     * @var int
+     * @var string
      */
     private $alignment;
 
@@ -98,13 +98,13 @@ class Shadow implements IComparable
     /**
      * Set Visible.
      *
-     * @param bool $pValue
+     * @param bool $visible
      *
      * @return $this
      */
-    public function setVisible($pValue)
+    public function setVisible($visible)
     {
-        $this->visible = $pValue;
+        $this->visible = $visible;
 
         return $this;
     }
@@ -122,13 +122,13 @@ class Shadow implements IComparable
     /**
      * Set Blur radius.
      *
-     * @param int $pValue
+     * @param int $blurRadius
      *
      * @return $this
      */
-    public function setBlurRadius($pValue)
+    public function setBlurRadius($blurRadius)
     {
-        $this->blurRadius = $pValue;
+        $this->blurRadius = $blurRadius;
 
         return $this;
     }
@@ -146,13 +146,13 @@ class Shadow implements IComparable
     /**
      * Set Shadow distance.
      *
-     * @param int $pValue
+     * @param int $distance
      *
      * @return $this
      */
-    public function setDistance($pValue)
+    public function setDistance($distance)
     {
-        $this->distance = $pValue;
+        $this->distance = $distance;
 
         return $this;
     }
@@ -170,13 +170,13 @@ class Shadow implements IComparable
     /**
      * Set Shadow direction (in degrees).
      *
-     * @param int $pValue
+     * @param int $direction
      *
      * @return $this
      */
-    public function setDirection($pValue)
+    public function setDirection($direction)
     {
-        $this->direction = $pValue;
+        $this->direction = $direction;
 
         return $this;
     }
@@ -184,7 +184,7 @@ class Shadow implements IComparable
     /**
      * Get Shadow alignment.
      *
-     * @return int
+     * @return string
      */
     public function getAlignment()
     {
@@ -194,13 +194,13 @@ class Shadow implements IComparable
     /**
      * Set Shadow alignment.
      *
-     * @param int $pValue
+     * @param string $alignment
      *
      * @return $this
      */
-    public function setAlignment($pValue)
+    public function setAlignment($alignment)
     {
-        $this->alignment = $pValue;
+        $this->alignment = $alignment;
 
         return $this;
     }
@@ -218,13 +218,11 @@ class Shadow implements IComparable
     /**
      * Set Color.
      *
-     * @param Color $pValue
-     *
      * @return $this
      */
-    public function setColor(Color $pValue = null)
+    public function setColor(Color $color)
     {
-        $this->color = $pValue;
+        $this->color = $color;
 
         return $this;
     }
@@ -242,13 +240,13 @@ class Shadow implements IComparable
     /**
      * Set Alpha.
      *
-     * @param int $pValue
+     * @param int $alpha
      *
      * @return $this
      */
-    public function setAlpha($pValue)
+    public function setAlpha($alpha)
     {
-        $this->alpha = $pValue;
+        $this->alpha = $alpha;
 
         return $this;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
index be19abbd2..c3504d831 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
@@ -170,13 +170,13 @@ class HeaderFooter
     /**
      * Set OddHeader.
      *
-     * @param string $pValue
+     * @param string $oddHeader
      *
      * @return $this
      */
-    public function setOddHeader($pValue)
+    public function setOddHeader($oddHeader)
     {
-        $this->oddHeader = $pValue;
+        $this->oddHeader = $oddHeader;
 
         return $this;
     }
@@ -194,13 +194,13 @@ class HeaderFooter
     /**
      * Set OddFooter.
      *
-     * @param string $pValue
+     * @param string $oddFooter
      *
      * @return $this
      */
-    public function setOddFooter($pValue)
+    public function setOddFooter($oddFooter)
     {
-        $this->oddFooter = $pValue;
+        $this->oddFooter = $oddFooter;
 
         return $this;
     }
@@ -218,13 +218,13 @@ class HeaderFooter
     /**
      * Set EvenHeader.
      *
-     * @param string $pValue
+     * @param string $eventHeader
      *
      * @return $this
      */
-    public function setEvenHeader($pValue)
+    public function setEvenHeader($eventHeader)
     {
-        $this->evenHeader = $pValue;
+        $this->evenHeader = $eventHeader;
 
         return $this;
     }
@@ -242,13 +242,13 @@ class HeaderFooter
     /**
      * Set EvenFooter.
      *
-     * @param string $pValue
+     * @param string $evenFooter
      *
      * @return $this
      */
-    public function setEvenFooter($pValue)
+    public function setEvenFooter($evenFooter)
     {
-        $this->evenFooter = $pValue;
+        $this->evenFooter = $evenFooter;
 
         return $this;
     }
@@ -266,13 +266,13 @@ class HeaderFooter
     /**
      * Set FirstHeader.
      *
-     * @param string $pValue
+     * @param string $firstHeader
      *
      * @return $this
      */
-    public function setFirstHeader($pValue)
+    public function setFirstHeader($firstHeader)
     {
-        $this->firstHeader = $pValue;
+        $this->firstHeader = $firstHeader;
 
         return $this;
     }
@@ -290,13 +290,13 @@ class HeaderFooter
     /**
      * Set FirstFooter.
      *
-     * @param string $pValue
+     * @param string $firstFooter
      *
      * @return $this
      */
-    public function setFirstFooter($pValue)
+    public function setFirstFooter($firstFooter)
     {
-        $this->firstFooter = $pValue;
+        $this->firstFooter = $firstFooter;
 
         return $this;
     }
@@ -314,13 +314,13 @@ class HeaderFooter
     /**
      * Set DifferentOddEven.
      *
-     * @param bool $pValue
+     * @param bool $differentOddEvent
      *
      * @return $this
      */
-    public function setDifferentOddEven($pValue)
+    public function setDifferentOddEven($differentOddEvent)
     {
-        $this->differentOddEven = $pValue;
+        $this->differentOddEven = $differentOddEvent;
 
         return $this;
     }
@@ -338,13 +338,13 @@ class HeaderFooter
     /**
      * Set DifferentFirst.
      *
-     * @param bool $pValue
+     * @param bool $differentFirst
      *
      * @return $this
      */
-    public function setDifferentFirst($pValue)
+    public function setDifferentFirst($differentFirst)
     {
-        $this->differentFirst = $pValue;
+        $this->differentFirst = $differentFirst;
 
         return $this;
     }
@@ -362,13 +362,13 @@ class HeaderFooter
     /**
      * Set ScaleWithDocument.
      *
-     * @param bool $pValue
+     * @param bool $scaleWithDocument
      *
      * @return $this
      */
-    public function setScaleWithDocument($pValue)
+    public function setScaleWithDocument($scaleWithDocument)
     {
-        $this->scaleWithDocument = $pValue;
+        $this->scaleWithDocument = $scaleWithDocument;
 
         return $this;
     }
@@ -386,13 +386,13 @@ class HeaderFooter
     /**
      * Set AlignWithMargins.
      *
-     * @param bool $pValue
+     * @param bool $alignWithMargins
      *
      * @return $this
      */
-    public function setAlignWithMargins($pValue)
+    public function setAlignWithMargins($alignWithMargins)
     {
-        $this->alignWithMargins = $pValue;
+        $this->alignWithMargins = $alignWithMargins;
 
         return $this;
     }
@@ -400,7 +400,6 @@ class HeaderFooter
     /**
      * Add header/footer image.
      *
-     * @param HeaderFooterDrawing $image
      * @param string $location
      *
      * @return $this
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
index d8797a347..dc082043e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
@@ -4,6 +4,9 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
+/**
+ * @implements \Iterator<int, Worksheet>
+ */
 class Iterator implements \Iterator
 {
     /**
@@ -22,8 +25,6 @@ class Iterator implements \Iterator
 
     /**
      * Create a new worksheet iterator.
-     *
-     * @param Spreadsheet $subject
      */
     public function __construct(Spreadsheet $subject)
     {
@@ -31,38 +32,26 @@ class Iterator implements \Iterator
         $this->subject = $subject;
     }
 
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        unset($this->subject);
-    }
-
     /**
      * Rewind iterator.
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->position = 0;
     }
 
     /**
      * Current Worksheet.
-     *
-     * @return Worksheet
      */
-    public function current()
+    public function current(): Worksheet
     {
         return $this->subject->getSheet($this->position);
     }
 
     /**
      * Current key.
-     *
-     * @return int
      */
-    public function key()
+    public function key(): int
     {
         return $this->position;
     }
@@ -70,17 +59,15 @@ class Iterator implements \Iterator
     /**
      * Next value.
      */
-    public function next()
+    public function next(): void
     {
         ++$this->position;
     }
 
     /**
      * Are there more Worksheet instances available?
-     *
-     * @return bool
      */
-    public function valid()
+    public function valid(): bool
     {
         return $this->position < $this->subject->getSheetCount() && $this->position >= 0;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
index f0935585d..c1c4160a7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
@@ -2,6 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use GdImage;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+
 class MemoryDrawing extends BaseDrawing
 {
     // Rendering functions
@@ -16,10 +20,16 @@ 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 resource
+     * @var null|GdImage|resource
      */
     private $imageResource;
 
@@ -44,25 +54,204 @@ class MemoryDrawing extends BaseDrawing
      */
     private $uniqueName;
 
+    /** @var null|resource */
+    private $alwaysNull;
+
     /**
      * Create a new MemoryDrawing.
      */
     public function __construct()
     {
         // Initialise values
-        $this->imageResource = null;
         $this->renderingFunction = self::RENDERING_DEFAULT;
         $this->mimeType = self::MIMETYPE_DEFAULT;
-        $this->uniqueName = md5(rand(0, 9999) . time() . rand(0, 9999));
+        $this->uniqueName = md5(mt_rand(0, 9999) . time() . mt_rand(0, 9999));
+        $this->alwaysNull = null;
 
         // Initialize parent
         parent::__construct();
     }
 
+    public function __destruct()
+    {
+        if ($this->imageResource) {
+            $rslt = @imagedestroy($this->imageResource);
+            // "Fix" for Scrutinizer
+            $this->imageResource = $rslt ? null : $this->alwaysNull;
+        }
+    }
+
+    public function __clone()
+    {
+        parent::__clone();
+        $this->cloneResource();
+    }
+
+    private function cloneResource(): void
+    {
+        if (!$this->imageResource) {
+            return;
+        }
+
+        $width = (int) imagesx($this->imageResource);
+        $height = (int) imagesy($this->imageResource);
+
+        if (imageistruecolor($this->imageResource)) {
+            $clone = imagecreatetruecolor($width, $height);
+            if (!$clone) {
+                throw new Exception('Could not clone image resource');
+            }
+
+            imagealphablending($clone, false);
+            imagesavealpha($clone, true);
+        } else {
+            $clone = imagecreate($width, $height);
+            if (!$clone) {
+                throw new Exception('Could not clone image resource');
+            }
+
+            // If the image has transparency...
+            $transparent = imagecolortransparent($this->imageResource);
+            if ($transparent >= 0) {
+                $rgb = imagecolorsforindex($this->imageResource, $transparent);
+                if (empty($rgb)) {
+                    throw new Exception('Could not get image colors');
+                }
+
+                imagesavealpha($clone, true);
+                $color = imagecolorallocatealpha($clone, $rgb['red'], $rgb['green'], $rgb['blue'], $rgb['alpha']);
+                if ($color === false) {
+                    throw new Exception('Could not get image alpha color');
+                }
+
+                imagefill($clone, 0, 0, $color);
+            }
+        }
+
+        //Create the Clone!!
+        imagecopy($clone, $this->imageResource, 0, 0, 0, 0, $width, $height);
+
+        $this->imageResource = $clone;
+    }
+
+    /**
+     * @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
+     *
+     * @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);
+        $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
+    {
+        switch ($mimeType) {
+            case self::MIMETYPE_PNG:
+                return self::RENDERING_PNG;
+            case self::MIMETYPE_JPEG:
+                return self::RENDERING_JPEG;
+            case self::MIMETYPE_GIF:
+                return self::RENDERING_GIF;
+        }
+
+        return 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'] ?? null;
+
+                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.
      *
-     * @return resource
+     * @return null|GdImage|resource
      */
     public function getImageResource()
     {
@@ -72,7 +261,7 @@ class MemoryDrawing extends BaseDrawing
     /**
      * Set image resource.
      *
-     * @param resource $value
+     * @param GdImage|resource $value
      *
      * @return $this
      */
@@ -82,8 +271,8 @@ class MemoryDrawing extends BaseDrawing
 
         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;
@@ -139,10 +328,8 @@ class MemoryDrawing extends BaseDrawing
 
     /**
      * Get indexed filename (using image index).
-     *
-     * @return string
      */
-    public function getIndexedFilename()
+    public function getIndexedFilename(): string
     {
         $extension = strtolower($this->getMimeType());
         $extension = explode('/', $extension);
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
new file mode 100644
index 000000000..743cc58d6
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class PageBreak
+{
+    /** @var int */
+    private $breakType;
+
+    /** @var string */
+    private $coordinate;
+
+    /** @var int */
+    private $maxColOrRow;
+
+    /** @param array|CellAddress|string $coordinate */
+    public function __construct(int $breakType, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
index 9ebfb6488..d51023fcc 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
@@ -66,13 +66,13 @@ class PageMargins
     /**
      * Set Left.
      *
-     * @param float $pValue
+     * @param float $left
      *
      * @return $this
      */
-    public function setLeft($pValue)
+    public function setLeft($left)
     {
-        $this->left = $pValue;
+        $this->left = $left;
 
         return $this;
     }
@@ -90,13 +90,13 @@ class PageMargins
     /**
      * Set Right.
      *
-     * @param float $pValue
+     * @param float $right
      *
      * @return $this
      */
-    public function setRight($pValue)
+    public function setRight($right)
     {
-        $this->right = $pValue;
+        $this->right = $right;
 
         return $this;
     }
@@ -114,13 +114,13 @@ class PageMargins
     /**
      * Set Top.
      *
-     * @param float $pValue
+     * @param float $top
      *
      * @return $this
      */
-    public function setTop($pValue)
+    public function setTop($top)
     {
-        $this->top = $pValue;
+        $this->top = $top;
 
         return $this;
     }
@@ -138,13 +138,13 @@ class PageMargins
     /**
      * Set Bottom.
      *
-     * @param float $pValue
+     * @param float $bottom
      *
      * @return $this
      */
-    public function setBottom($pValue)
+    public function setBottom($bottom)
     {
-        $this->bottom = $pValue;
+        $this->bottom = $bottom;
 
         return $this;
     }
@@ -162,13 +162,13 @@ class PageMargins
     /**
      * Set Header.
      *
-     * @param float $pValue
+     * @param float $header
      *
      * @return $this
      */
-    public function setHeader($pValue)
+    public function setHeader($header)
     {
-        $this->header = $pValue;
+        $this->header = $header;
 
         return $this;
     }
@@ -186,29 +186,44 @@ class PageMargins
     /**
      * Set Footer.
      *
-     * @param float $pValue
+     * @param float $footer
      *
      * @return $this
      */
-    public function setFooter($pValue)
+    public function setFooter($footer)
     {
-        $this->footer = $pValue;
+        $this->footer = $footer;
 
         return $this;
     }
 
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
+    public static function fromCentimeters(float $value): float
     {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
+        return $value / 2.54;
+    }
+
+    public static function toCentimeters(float $value): float
+    {
+        return $value * 2.54;
+    }
+
+    public static function fromMillimeters(float $value): float
+    {
+        return $value / 25.4;
+    }
+
+    public static function toMillimeters(float $value): float
+    {
+        return $value * 25.4;
+    }
+
+    public static function fromPoints(float $value): float
+    {
+        return $value / 72;
+    }
+
+    public static function toPoints(float $value): float
+    {
+        return $value * 72;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
index fa1810f3b..72c8958c8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -76,10 +76,6 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
  * 67 = A3 transverse paper (297 mm by 420 mm)
  * 68 = A3 extra transverse paper (322 mm by 445 mm)
  * </code>
- *
- * @category   PhpSpreadsheet
- *
- * @copyright  Copyright (c) 2006 - 2016 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
  */
 class PageSetup
 {
@@ -160,19 +156,36 @@ class PageSetup
     const SETPRINTRANGE_OVERWRITE = 'O';
     const SETPRINTRANGE_INSERT = 'I';
 
+    const PAGEORDER_OVER_THEN_DOWN = 'overThenDown';
+    const PAGEORDER_DOWN_THEN_OVER = 'downThenOver';
+
     /**
-     * Paper size.
+     * Paper size default.
      *
      * @var int
      */
-    private $paperSize = self::PAPERSIZE_LETTER;
+    private static $paperSizeDefault = self::PAPERSIZE_LETTER;
+
+    /**
+     * Paper size.
+     *
+     * @var ?int
+     */
+    private $paperSize;
+
+    /**
+     * Orientation default.
+     *
+     * @var string
+     */
+    private static $orientationDefault = self::ORIENTATION_DEFAULT;
 
     /**
      * Orientation.
      *
      * @var string
      */
-    private $orientation = self::ORIENTATION_DEFAULT;
+    private $orientation;
 
     /**
      * Scale (Print Scale).
@@ -180,7 +193,7 @@ class PageSetup
      * Print scaling. Valid values range from 10 to 400
      * This setting is overridden when fitToWidth and/or fitToHeight are in use
      *
-     * @var int?
+     * @var null|int
      */
     private $scale = 100;
 
@@ -196,7 +209,7 @@ class PageSetup
      * Fit To Height
      * Number of vertical pages to fit on.
      *
-     * @var int?
+     * @var null|int
      */
     private $fitToHeight = 1;
 
@@ -204,7 +217,7 @@ class PageSetup
      * Fit To Width
      * Number of horizontal pages to fit on.
      *
-     * @var int?
+     * @var null|int
      */
     private $fitToWidth = 1;
 
@@ -239,22 +252,26 @@ class PageSetup
     /**
      * Print area.
      *
-     * @var string
+     * @var null|string
      */
     private $printArea;
 
     /**
      * First page number.
      *
-     * @var int
+     * @var ?int
      */
     private $firstPageNumber;
 
+    /** @var string */
+    private $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
+
     /**
      * Create a new PageSetup.
      */
     public function __construct()
     {
+        $this->orientation = self::$orientationDefault;
     }
 
     /**
@@ -264,23 +281,39 @@ class PageSetup
      */
     public function getPaperSize()
     {
-        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($paperSize)
     {
-        $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.
      *
@@ -294,21 +327,35 @@ class PageSetup
     /**
      * Set Orientation.
      *
-     * @param string $pValue see self::ORIENTATION_*
+     * @param string $orientation see self::ORIENTATION_*
      *
      * @return $this
      */
-    public function setOrientation($pValue)
+    public function setOrientation($orientation)
     {
-        $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 int?
+     * @return null|int
      */
     public function getScale()
     {
@@ -320,20 +367,18 @@ class PageSetup
      * 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
-     *
-     * @throws PhpSpreadsheetException
+     * @param null|int $scale
+     * @param bool $update Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
      *
      * @return $this
      */
-    public function setScale($pValue, $pUpdate = true)
+    public function setScale($scale, $update = true)
     {
         // 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 {
@@ -356,13 +401,13 @@ class PageSetup
     /**
      * Set Fit To Page.
      *
-     * @param bool $pValue
+     * @param bool $fitToPage
      *
      * @return $this
      */
-    public function setFitToPage($pValue)
+    public function setFitToPage($fitToPage)
     {
-        $this->fitToPage = $pValue;
+        $this->fitToPage = $fitToPage;
 
         return $this;
     }
@@ -370,7 +415,7 @@ class PageSetup
     /**
      * Get Fit To Height.
      *
-     * @return int?
+     * @return null|int
      */
     public function getFitToHeight()
     {
@@ -380,15 +425,15 @@ class PageSetup
     /**
      * Set Fit To Height.
      *
-     * @param null|int $pValue
-     * @param bool $pUpdate Update fitToPage so it applies rather than scaling
+     * @param null|int $fitToHeight
+     * @param bool $update Update fitToPage so it applies rather than scaling
      *
      * @return $this
      */
-    public function setFitToHeight($pValue, $pUpdate = true)
+    public function setFitToHeight($fitToHeight, $update = true)
     {
-        $this->fitToHeight = $pValue;
-        if ($pUpdate) {
+        $this->fitToHeight = $fitToHeight;
+        if ($update) {
             $this->fitToPage = true;
         }
 
@@ -398,7 +443,7 @@ class PageSetup
     /**
      * Get Fit To Width.
      *
-     * @return int?
+     * @return null|int
      */
     public function getFitToWidth()
     {
@@ -408,15 +453,15 @@ class PageSetup
     /**
      * Set Fit To Width.
      *
-     * @param null|int $pValue
-     * @param bool $pUpdate Update fitToPage so it applies rather than scaling
+     * @param null|int $value
+     * @param bool $update Update fitToPage so it applies rather than scaling
      *
      * @return $this
      */
-    public function setFitToWidth($pValue, $pUpdate = true)
+    public function setFitToWidth($value, $update = true)
     {
-        $this->fitToWidth = $pValue;
-        if ($pUpdate) {
+        $this->fitToWidth = $value;
+        if ($update) {
             $this->fitToPage = true;
         }
 
@@ -430,7 +475,7 @@ class PageSetup
      */
     public function isColumnsToRepeatAtLeftSet()
     {
-        if (is_array($this->columnsToRepeatAtLeft)) {
+        if (!empty($this->columnsToRepeatAtLeft)) {
             if ($this->columnsToRepeatAtLeft[0] != '' && $this->columnsToRepeatAtLeft[1] != '') {
                 return true;
             }
@@ -452,13 +497,13 @@ class PageSetup
     /**
      * 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)
     {
-        $this->columnsToRepeatAtLeft = $pValue;
+        $this->columnsToRepeatAtLeft = $columnsToRepeatAtLeft;
 
         return $this;
     }
@@ -466,14 +511,14 @@ class PageSetup
     /**
      * 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($start, $end)
     {
-        $this->columnsToRepeatAtLeft = [$pStart, $pEnd];
+        $this->columnsToRepeatAtLeft = [$start, $end];
 
         return $this;
     }
@@ -485,7 +530,7 @@ class PageSetup
      */
     public function isRowsToRepeatAtTopSet()
     {
-        if (is_array($this->rowsToRepeatAtTop)) {
+        if (!empty($this->rowsToRepeatAtTop)) {
             if ($this->rowsToRepeatAtTop[0] != 0 && $this->rowsToRepeatAtTop[1] != 0) {
                 return true;
             }
@@ -507,13 +552,13 @@ class PageSetup
     /**
      * 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)
     {
-        $this->rowsToRepeatAtTop = $pValue;
+        $this->rowsToRepeatAtTop = $rowsToRepeatAtTop;
 
         return $this;
     }
@@ -521,14 +566,14 @@ class PageSetup
     /**
      * 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($start, $end)
     {
-        $this->rowsToRepeatAtTop = [$pStart, $pEnd];
+        $this->rowsToRepeatAtTop = [$start, $end];
 
         return $this;
     }
@@ -589,16 +634,14 @@ class PageSetup
      *                            Otherwise, the specific range identified by the value of $index will be returned
      *                            Print areas are numbered from 1
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return string
      */
     public function getPrintArea($index = 0)
     {
         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];
         }
@@ -621,7 +664,7 @@ class PageSetup
         if ($index == 0) {
             return $this->printArea !== null;
         }
-        $printAreas = explode(',', $this->printArea);
+        $printAreas = explode(',', (string) $this->printArea);
 
         return isset($printAreas[$index - 1]);
     }
@@ -641,7 +684,7 @@ class PageSetup
         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);
@@ -669,8 +712,6 @@ class PageSetup
      *                            Default behaviour, or the "O" method, overwrites existing print area
      *                            The "I" method, inserts the new print area before any specified index, or at the end of the list
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
@@ -683,12 +724,15 @@ class PageSetup
             throw new PhpSpreadsheetException('Cell coordinate must not be absolute.');
         }
         $value = strtoupper($value);
+        if (!$this->printArea) {
+            $index = 0;
+        }
 
         if ($method == self::SETPRINTRANGE_OVERWRITE) {
             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,11 +744,11 @@ class PageSetup
             }
         } elseif ($method == self::SETPRINTRANGE_INSERT) {
             if ($index == 0) {
-                $this->printArea .= ($this->printArea == '') ? $value : ',' . $value;
+                $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.');
@@ -730,8 +774,6 @@ class PageSetup
      *                                list.
      *                            Print areas are numbered from 1
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function addPrintArea($value, $index = -1)
@@ -760,8 +802,6 @@ class PageSetup
      *                                Default behaviour, or the "O" method, overwrites existing print area
      *                                The "I" method, inserts the new print area before any specified index, or at the end of the list
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
@@ -787,8 +827,6 @@ class PageSetup
      *                                    list.
      *                                Print areas are numbered from 1
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
@@ -803,7 +841,7 @@ class PageSetup
     /**
      * Get first page number.
      *
-     * @return int
+     * @return ?int
      */
     public function getFirstPageNumber()
     {
@@ -813,7 +851,7 @@ class PageSetup
     /**
      * Set first page number.
      *
-     * @param int $value
+     * @param ?int $value
      *
      * @return $this
      */
@@ -834,18 +872,17 @@ class PageSetup
         return $this->setFirstPageNumber(null);
     }
 
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
+    public function getPageOrder(): string
     {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
+        return $this->pageOrder;
+    }
+
+    public function setPageOrder(?string $pageOrder): self
+    {
+        if ($pageOrder === null || $pageOrder === self::PAGEORDER_DOWN_THEN_OVER || $pageOrder === self::PAGEORDER_OVER_THEN_DOWN) {
+            $this->pageOrder = $pageOrder ?? self::PAGEORDER_DOWN_THEN_OVER;
         }
+
+        return $this;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
index 2fd3e9195..063a5cc2b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -6,125 +6,157 @@ use PhpOffice\PhpSpreadsheet\Shared\PasswordHasher;
 
 class Protection
 {
-    /**
-     * Sheet.
-     *
-     * @var bool
-     */
-    private $sheet = false;
+    const ALGORITHM_MD2 = 'MD2';
+    const ALGORITHM_MD4 = 'MD4';
+    const ALGORITHM_MD5 = 'MD5';
+    const ALGORITHM_SHA_1 = 'SHA-1';
+    const ALGORITHM_SHA_256 = 'SHA-256';
+    const ALGORITHM_SHA_384 = 'SHA-384';
+    const ALGORITHM_SHA_512 = 'SHA-512';
+    const ALGORITHM_RIPEMD_128 = 'RIPEMD-128';
+    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
+    const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
 
     /**
-     * Objects.
+     * Autofilters are locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $objects = false;
+    private $autoFilter;
 
     /**
-     * Scenarios.
+     * Deleting columns is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $scenarios = false;
+    private $deleteColumns;
 
     /**
-     * Format cells.
+     * Deleting rows is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $formatCells = false;
+    private $deleteRows;
 
     /**
-     * Format columns.
+     * Formatting cells is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $formatColumns = false;
+    private $formatCells;
 
     /**
-     * Format rows.
+     * Formatting columns is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $formatRows = false;
+    private $formatColumns;
 
     /**
-     * Insert columns.
+     * Formatting rows is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $insertColumns = false;
+    private $formatRows;
 
     /**
-     * Insert rows.
+     * Inserting columns is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $insertRows = false;
+    private $insertColumns;
 
     /**
-     * Insert hyperlinks.
+     * Inserting hyperlinks is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $insertHyperlinks = false;
+    private $insertHyperlinks;
 
     /**
-     * Delete columns.
+     * Inserting rows is locked when sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $deleteColumns = false;
+    private $insertRows;
 
     /**
-     * Delete rows.
+     * Objects are locked when sheet is protected, default false.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $deleteRows = false;
+    private $objects;
 
     /**
-     * Select locked cells.
+     * Pivot tables are locked when the sheet is protected, default true.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $selectLockedCells = false;
+    private $pivotTables;
 
     /**
-     * Sort.
+     * Scenarios are locked when sheet is protected, default false.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $sort = false;
+    private $scenarios;
 
     /**
-     * AutoFilter.
+     * Selection of locked cells is locked when sheet is protected, default false.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $autoFilter = false;
+    private $selectLockedCells;
 
     /**
-     * Pivot tables.
+     * Selection of unlocked cells is locked when sheet is protected, default false.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $pivotTables = false;
+    private $selectUnlockedCells;
 
     /**
-     * Select unlocked cells.
+     * Sheet is locked when sheet is protected, default false.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $selectUnlockedCells = false;
+    private $sheet;
 
     /**
-     * Password.
+     * Sorting is locked when sheet is protected, default true.
+     *
+     * @var ?bool
+     */
+    private $sort;
+
+    /**
+     * Hashed password.
      *
      * @var string
      */
     private $password = '';
 
+    /**
+     * Algorithm name.
+     *
+     * @var string
+     */
+    private $algorithm = '';
+
+    /**
+     * Salt value.
+     *
+     * @var string
+     */
+    private $salt = '';
+
+    /**
+     * Spin count.
+     *
+     * @var int
+     */
+    private $spinCount = 10000;
+
     /**
      * Create a new Protection.
      */
@@ -134,415 +166,223 @@ class Protection
 
     /**
      * Is some sort of protection enabled?
-     *
-     * @return bool
      */
-    public function isProtectionEnabled()
+    public function isProtectionEnabled(): bool
     {
-        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;
+        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);
     }
 
-    /**
-     * Get Sheet.
-     *
-     * @return bool
-     */
-    public function getSheet()
+    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 Password (hashed).
+     * Get hashed password.
      *
      * @return string
      */
@@ -554,21 +394,112 @@ class Protection
     /**
      * Set Password.
      *
-     * @param string $pValue
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
+     * @param string $password
+     * @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($password, $alreadyHashed = false)
     {
-        if (!$pAlreadyHashed) {
-            $pValue = PasswordHasher::hashPassword($pValue);
+        if (!$alreadyHashed) {
+            $salt = $this->generateSalt();
+            $this->setSalt($salt);
+            $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.
+     */
+    private function generateSalt(): string
+    {
+        return base64_encode(random_bytes(16));
+    }
+
+    /**
+     * Get algorithm name.
+     */
+    public function getAlgorithm(): string
+    {
+        return $this->algorithm;
+    }
+
+    /**
+     * Set algorithm name.
+     */
+    public function setAlgorithm(string $algorithm): self
+    {
+        return $this->setAlgorithmName($algorithm);
+    }
+
+    /**
+     * Set algorithm name.
+     */
+    public function setAlgorithmName(string $algorithm): self
+    {
+        $this->algorithm = $algorithm;
+
+        return $this;
+    }
+
+    public function getSalt(): string
+    {
+        return $this->salt;
+    }
+
+    public function setSalt(string $salt): self
+    {
+        return $this->setSaltValue($salt);
+    }
+
+    public function setSaltValue(string $salt): self
+    {
+        $this->salt = $salt;
+
+        return $this;
+    }
+
+    /**
+     * Get spin count.
+     */
+    public function getSpinCount(): int
+    {
+        return $this->spinCount;
+    }
+
+    /**
+     * Set spin count.
+     */
+    public function setSpinCount(int $spinCount): self
+    {
+        $this->spinCount = $spinCount;
+
+        return $this;
+    }
+
+    /**
+     * Verify that the given non-hashed password can "unlock" the protection.
+     */
+    public function verify(string $password): bool
+    {
+        if ($this->password === '') {
+            return true;
+        }
+
+        $hash = PasswordHasher::hashPassword($password, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
+
+        return $this->getPassword() === $hash;
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
index 2a379d2cd..b5f08816b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
@@ -21,10 +21,9 @@ class Row
     /**
      * Create a new row.
      *
-     * @param Worksheet $worksheet
      * @param int $rowIndex
      */
-    public function __construct(Worksheet $worksheet = null, $rowIndex = 1)
+    public function __construct(Worksheet $worksheet, $rowIndex = 1)
     {
         // Set parent and row index
         $this->worksheet = $worksheet;
@@ -36,15 +35,13 @@ class Row
      */
     public function __destruct()
     {
-        unset($this->worksheet);
+        $this->worksheet = null; // @phpstan-ignore-line
     }
 
     /**
      * Get row index.
-     *
-     * @return int
      */
-    public function getRowIndex()
+    public function getRowIndex(): int
     {
         return $this->rowIndex;
     }
@@ -54,20 +51,69 @@ class Row
      *
      * @param string $startColumn The column address at which to start iterating
      * @param string $endColumn Optionally, the column address at which to stop iterating
-     *
-     * @return RowCellIterator
      */
-    public function getCellIterator($startColumn = 'A', $endColumn = null)
+    public function getCellIterator($startColumn = 'A', $endColumn = null): RowCellIterator
     {
         return new RowCellIterator($this->worksheet, $this->rowIndex, $startColumn, $endColumn);
     }
 
     /**
-     * Returns bound worksheet.
+     * Get column iterator. Synonym for getCellIterator().
      *
-     * @return Worksheet
+     * @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 getWorksheet()
+    public function getColumnIterator($startColumn = 'A', $endColumn = null): RowCellIterator
+    {
+        return $this->getCellIterator($startColumn, $endColumn);
+    }
+
+    /**
+     * 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.
+     *
+     * @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 isEmpty(int $definitionOfEmptyFlags = 0, $startColumn = 'A', $endColumn = 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($startColumn, $endColumn);
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            /** @scrutinizer ignore-call */
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns bound worksheet.
+     */
+    public function getWorksheet(): Worksheet
     {
         return $this->worksheet;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
index 9746d6403..0df776f2a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
@@ -2,9 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
+/**
+ * @extends CellIterator<string>
+ */
 class RowCellIterator extends CellIterator
 {
     /**
@@ -43,10 +47,11 @@ class RowCellIterator extends CellIterator
      * @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 __construct(Worksheet $worksheet = null, $rowIndex = 1, $startColumn = 'A', $endColumn = null)
+    public function __construct(Worksheet $worksheet, $rowIndex = 1, $startColumn = 'A', $endColumn = null)
     {
         // Set subject and row index
         $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
         $this->rowIndex = $rowIndex;
         $this->resetEnd($endColumn);
         $this->resetStart($startColumn);
@@ -57,11 +62,9 @@ class RowCellIterator extends CellIterator
      *
      * @param string $startColumn The column address at which to start iterating
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function resetStart($startColumn = 'A')
+    public function resetStart(string $startColumn = 'A')
     {
         $this->startColumnIndex = Coordinate::columnIndexFromString($startColumn);
         $this->adjustForExistingOnlyRange();
@@ -75,13 +78,11 @@ class RowCellIterator extends CellIterator
      *
      * @param string $endColumn The column address at which to stop iterating
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
     public function resetEnd($endColumn = null)
     {
-        $endColumn = $endColumn ? $endColumn : $this->worksheet->getHighestColumn();
+        $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
         $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
         $this->adjustForExistingOnlyRange();
 
@@ -93,19 +94,18 @@ class RowCellIterator extends CellIterator
      *
      * @param string $column The column address to set the current pointer at
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function seek($column = 'A')
+    public function seek(string $column = 'A')
     {
-        $column = Coordinate::columnIndexFromString($column);
-        if (($column < $this->startColumnIndex) || ($column > $this->endColumnIndex)) {
-            throw new PhpSpreadsheetException("Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
-        } elseif ($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');
         }
-        $this->currentColumnIndex = $column;
+        if (($columnId < $this->startColumnIndex) || ($columnId > $this->endColumnIndex)) {
+            throw new PhpSpreadsheetException("Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
+        }
+        $this->currentColumnIndex = $columnId;
 
         return $this;
     }
@@ -113,27 +113,31 @@ class RowCellIterator extends CellIterator
     /**
      * Rewind the iterator to the starting column.
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->currentColumnIndex = $this->startColumnIndex;
     }
 
     /**
      * Return the current cell in this worksheet row.
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Cell\Cell
      */
-    public function current()
+    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
+            );
     }
 
     /**
      * Return the current iterator key.
-     *
-     * @return string
      */
-    public function key()
+    public function key(): string
     {
         return Coordinate::stringFromColumnIndex($this->currentColumnIndex);
     }
@@ -141,65 +145,51 @@ class RowCellIterator extends CellIterator
     /**
      * Set the iterator to its next value.
      */
-    public function next()
+    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));
     }
 
     /**
      * Set the iterator to its previous value.
-     *
-     * @throws PhpSpreadsheetException
      */
-    public function prev()
+    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;
     }
 
     /**
      * Return the current iterator position.
-     *
-     * @return int
      */
-    public function getCurrentColumnIndex()
+    public function getCurrentColumnIndex(): int
     {
         return $this->currentColumnIndex;
     }
 
     /**
      * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
-     *
-     * @throws PhpSpreadsheetException
      */
-    protected function adjustForExistingOnlyRange()
+    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;
             }
-            if ($this->startColumnIndex > $this->endColumnIndex) {
-                throw new PhpSpreadsheetException('No cells exist within the specified range');
-            }
-            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;
             }
-            if ($this->endColumnIndex < $this->startColumnIndex) {
-                throw new PhpSpreadsheetException('No cells exist within the specified range');
-            }
         }
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
index c4a87bdb5..a5e0f98b7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
@@ -2,12 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
 class RowDimension extends Dimension
 {
     /**
      * Row index.
      *
-     * @var int
+     * @var ?int
      */
     private $rowIndex;
 
@@ -30,12 +32,12 @@ class RowDimension extends Dimension
     /**
      * Create a new RowDimension.
      *
-     * @param int $pIndex Numeric row index
+     * @param ?int $index Numeric row index
      */
-    public function __construct($pIndex = 0)
+    public function __construct($index = 0)
     {
         // Initialise values
-        $this->rowIndex = $pIndex;
+        $this->rowIndex = $index;
 
         // set dimension as unformatted by default
         parent::__construct(null);
@@ -43,10 +45,8 @@ class RowDimension extends Dimension
 
     /**
      * Get Row Index.
-     *
-     * @return int
      */
-    public function getRowIndex()
+    public function getRowIndex(): ?int
     {
         return $this->rowIndex;
     }
@@ -54,47 +54,52 @@ class RowDimension extends Dimension
     /**
      * Set Row Index.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setRowIndex($pValue)
+    public function setRowIndex(int $index)
     {
-        $this->rowIndex = $pValue;
+        $this->rowIndex = $index;
 
         return $this;
     }
 
     /**
      * Get Row Height.
+     * 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.
      *
      * @return float
      */
-    public function getRowHeight()
+    public function getRowHeight(?string $unitOfMeasure = null)
     {
-        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 $pValue
+     * @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($pValue)
+    public function setRowHeight($height, ?string $unitOfMeasure = null)
     {
-        $this->height = $pValue;
+        $this->height = ($unitOfMeasure === null || $height < 0)
+            ? $height
+            : (new CssDimension("{$height}{$unitOfMeasure}"))->height();
 
         return $this;
     }
 
     /**
      * Get ZeroHeight.
-     *
-     * @return bool
      */
-    public function getZeroHeight()
+    public function getZeroHeight(): bool
     {
         return $this->zeroHeight;
     }
@@ -102,13 +107,11 @@ class RowDimension extends Dimension
     /**
      * Set ZeroHeight.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setZeroHeight($pValue)
+    public function setZeroHeight(bool $zeroHeight)
     {
-        $this->zeroHeight = $pValue;
+        $this->zeroHeight = $zeroHeight;
 
         return $this;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
index 3b9d0e265..af2bda25a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
@@ -2,9 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+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.
@@ -49,12 +53,9 @@ class RowIterator implements \Iterator
         $this->resetStart($startRow);
     }
 
-    /**
-     * Destructor.
-     */
     public function __destruct()
     {
-        unset($this->subject);
+        $this->subject = null; // @phpstan-ignore-line
     }
 
     /**
@@ -62,14 +63,14 @@ class RowIterator implements \Iterator
      *
      * @param int $startRow The row number at which to start iterating
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function resetStart($startRow = 1)
+    public function resetStart(int $startRow = 1)
     {
         if ($startRow > $this->subject->getHighestRow()) {
-            throw new PhpSpreadsheetException("Start row ({$startRow}) is beyond highest row ({$this->subject->getHighestRow()})");
+            throw new PhpSpreadsheetException(
+                "Start row ({$startRow}) is beyond highest row ({$this->subject->getHighestRow()})"
+            );
         }
 
         $this->startRow = $startRow;
@@ -90,7 +91,7 @@ class RowIterator implements \Iterator
      */
     public function resetEnd($endRow = null)
     {
-        $this->endRow = ($endRow) ? $endRow : $this->subject->getHighestRow();
+        $this->endRow = $endRow ?: $this->subject->getHighestRow();
 
         return $this;
     }
@@ -100,11 +101,9 @@ class RowIterator implements \Iterator
      *
      * @param int $row The row number to set the current pointer at
      *
-     * @throws PhpSpreadsheetException
-     *
      * @return $this
      */
-    public function seek($row = 1)
+    public function seek(int $row = 1)
     {
         if (($row < $this->startRow) || ($row > $this->endRow)) {
             throw new PhpSpreadsheetException("Row $row is out of range ({$this->startRow} - {$this->endRow})");
@@ -117,27 +116,23 @@ class RowIterator implements \Iterator
     /**
      * Rewind the iterator to the starting row.
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->position = $this->startRow;
     }
 
     /**
      * Return the current row in this worksheet.
-     *
-     * @return Row
      */
-    public function current()
+    public function current(): Row
     {
         return new Row($this->subject, $this->position);
     }
 
     /**
      * Return the current iterator key.
-     *
-     * @return int
      */
-    public function key()
+    public function key(): int
     {
         return $this->position;
     }
@@ -145,7 +140,7 @@ class RowIterator implements \Iterator
     /**
      * Set the iterator to its next value.
      */
-    public function next()
+    public function next(): void
     {
         ++$this->position;
     }
@@ -153,17 +148,15 @@ class RowIterator implements \Iterator
     /**
      * Set the iterator to its previous value.
      */
-    public function prev()
+    public function prev(): void
     {
         --$this->position;
     }
 
     /**
      * Indicate if more rows exist in the worksheet range of rows that we're iterating.
-     *
-     * @return bool
      */
-    public function valid()
+    public function valid(): bool
     {
         return $this->position <= $this->endRow && $this->position >= $this->startRow;
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
index fa85bd27d..697f11c2a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
+++ b/libraries/phpspreadsheet/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,
@@ -22,7 +22,7 @@ class SheetView
      *
      * Valid values range from 10 to 400.
      *
-     * @var int
+     * @var ?int
      */
     private $zoomScale = 100;
 
@@ -31,7 +31,7 @@ class SheetView
      *
      * Valid values range from 10 to 400.
      *
-     * @var int
+     * @var ?int
      */
     private $zoomScaleNormal = 100;
 
@@ -64,7 +64,7 @@ class SheetView
     /**
      * Get ZoomScale.
      *
-     * @return int
+     * @return ?int
      */
     public function getZoomScale()
     {
@@ -75,18 +75,16 @@ class SheetView
      * Set ZoomScale.
      * Valid values range from 10 to 400.
      *
-     * @param int $pValue
-     *
-     * @throws PhpSpreadsheetException
+     * @param ?int $zoomScale
      *
      * @return $this
      */
-    public function setZoomScale($pValue)
+    public function setZoomScale($zoomScale)
     {
         // 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.');
         }
@@ -97,7 +95,7 @@ class SheetView
     /**
      * Get ZoomScaleNormal.
      *
-     * @return int
+     * @return ?int
      */
     public function getZoomScaleNormal()
     {
@@ -108,16 +106,14 @@ class SheetView
      * Set ZoomScale.
      * Valid values range from 10 to 400.
      *
-     * @param int $pValue
-     *
-     * @throws PhpSpreadsheetException
+     * @param ?int $zoomScaleNormal
      *
      * @return $this
      */
-    public function setZoomScaleNormal($pValue)
+    public function setZoomScaleNormal($zoomScaleNormal)
     {
-        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.');
         }
@@ -128,11 +124,11 @@ class SheetView
     /**
      * Set ShowZeroes setting.
      *
-     * @param bool $pValue
+     * @param bool $showZeros
      */
-    public function setShowZeros($pValue)
+    public function setShowZeros($showZeros): void
     {
-        $this->showZeros = $pValue;
+        $this->showZeros = $showZeros;
     }
 
     /**
@@ -161,39 +157,22 @@ class SheetView
      *        'pageLayout'        self::SHEETVIEW_PAGE_LAYOUT
      *        'pageBreakPreview'  self::SHEETVIEW_PAGE_BREAK_PREVIEW
      *
-     * @param string $pValue
-     *
-     * @throws PhpSpreadsheetException
+     * @param ?string $sheetViewType
      *
      * @return $this
      */
-    public function setView($pValue)
+    public function setView($sheetViewType)
     {
         // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
new file mode 100644
index 000000000..1bc8dff45
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
@@ -0,0 +1,585 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+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;
+
+class Table
+{
+    /**
+     * Table Name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Show Header Row.
+     *
+     * @var bool
+     */
+    private $showHeaderRow = true;
+
+    /**
+     * Show Totals Row.
+     *
+     * @var bool
+     */
+    private $showTotalsRow = false;
+
+    /**
+     * Table Range.
+     *
+     * @var string
+     */
+    private $range = '';
+
+    /**
+     * Table Worksheet.
+     *
+     * @var null|Worksheet
+     */
+    private $workSheet;
+
+    /**
+     * Table allow filter.
+     *
+     * @var bool
+     */
+    private $allowFilter = true;
+
+    /**
+     * Table Column.
+     *
+     * @var Table\Column[]
+     */
+    private $columns = [];
+
+    /**
+     * Table Style.
+     *
+     * @var TableStyle
+     */
+    private $style;
+
+    /**
+     * Table AutoFilter.
+     *
+     * @var AutoFilter
+     */
+    private $autoFilter;
+
+    /**
+     * Create a new Table.
+     *
+     * @param AddressRange|array<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($range = '', string $name = '')
+    {
+        $this->style = new TableStyle();
+        $this->autoFilter = new AutoFilter($range);
+        $this->setRange($range);
+        $this->setName($name);
+    }
+
+    /**
+     * 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 === null || $this->name === null || $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->getValue();
+                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); // @phpstan-ignore-line
+            }
+        }
+    }
+
+    /**
+     * 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|array<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($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 (strpos($range, ':') === false) {
+            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($column): int
+    {
+        return $this->isColumnInRange($column);
+    }
+
+    /**
+     * Get a specified Table Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function getColumn($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($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($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($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($fromColumn, $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(): Table\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()
+    {
+        return (string) $this->range;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
new file mode 100644
index 000000000..32dd4c4f8
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
@@ -0,0 +1,254 @@
+<?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.
+     *
+     * @var string
+     */
+    private $columnIndex = '';
+
+    /**
+     * Show Filter Button.
+     *
+     * @var bool
+     */
+    private $showFilterButton = true;
+
+    /**
+     * Total Row Label.
+     *
+     * @var string
+     */
+    private $totalsRowLabel;
+
+    /**
+     * Total Row Function.
+     *
+     * @var string
+     */
+    private $totalsRowFunction;
+
+    /**
+     * Total Row Formula.
+     *
+     * @var string
+     */
+    private $totalsRowFormula;
+
+    /**
+     * Column Formula.
+     *
+     * @var string
+     */
+    private $columnFormula;
+
+    /**
+     * Table.
+     *
+     * @var null|Table
+     */
+    private $table;
+
+    /**
+     * Create a new Column.
+     *
+     * @param string $column Column (e.g. A)
+     * @param Table $table Table for this column
+     */
+    public function __construct($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($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->getValue();
+                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); // @phpstan-ignore-line
+            }
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
new file mode 100644
index 000000000..78643c729
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
@@ -0,0 +1,230 @@
+<?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.
+     *
+     * @var string
+     */
+    private $theme;
+
+    /**
+     * Show First Column.
+     *
+     * @var bool
+     */
+    private $showFirstColumn = false;
+
+    /**
+     * Show Last Column.
+     *
+     * @var bool
+     */
+    private $showLastColumn = false;
+
+    /**
+     * Show Row Stripes.
+     *
+     * @var bool
+     */
+    private $showRowStripes = false;
+
+    /**
+     * Show Column Stripes.
+     *
+     * @var bool
+     */
+    private $showColumnStripes = false;
+
+    /**
+     * Table.
+     *
+     * @var null|Table
+     */
+    private $table;
+
+    /**
+     * 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php
new file mode 100644
index 000000000..42ba566c6
--- /dev/null
+++ b/libraries/phpspreadsheet/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<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($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|array<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($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|array<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($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 2:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[0], $cellRange[1]];
+
+                    break;
+                case 4:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[2], $cellRange[3]];
+
+                    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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
index f3a5b4da7..29221e991 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -4,22 +4,28 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use ArrayObject;
 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\CellRange;
 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;
 use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\IComparable;
-use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 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;
@@ -28,14 +34,22 @@ 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.
@@ -54,7 +68,7 @@ class Worksheet implements IComparable
     /**
      * Parent spreadsheet.
      *
-     * @var Spreadsheet
+     * @var ?Spreadsheet
      */
     private $parent;
 
@@ -96,16 +110,23 @@ class Worksheet implements IComparable
     /**
      * Collection of drawings.
      *
-     * @var BaseDrawing[]
+     * @var ArrayObject<int, BaseDrawing>
      */
     private $drawingCollection;
 
     /**
      * Collection of Chart objects.
      *
-     * @var Chart[]
+     * @var ArrayObject<int, Chart>
      */
-    private $chartCollection = [];
+    private $chartCollection;
+
+    /**
+     * Collection of Table objects.
+     *
+     * @var ArrayObject<int, Table>
+     */
+    private $tableCollection;
 
     /**
      * Worksheet title.
@@ -171,30 +192,30 @@ class Worksheet implements IComparable
     private $conditionalStylesCollection = [];
 
     /**
-     * Is the current cell collection sorted already?
+     * Collection of row breaks.
      *
-     * @var bool
+     * @var PageBreak[]
      */
-    private $cellCollectionIsSorted = false;
+    private $rowBreaks = [];
 
     /**
-     * Collection of breaks.
+     * Collection of column breaks.
      *
-     * @var array
+     * @var PageBreak[]
      */
-    private $breaks = [];
+    private $columnBreaks = [];
 
     /**
      * Collection of merged cell ranges.
      *
-     * @var array
+     * @var string[]
      */
     private $mergeCells = [];
 
     /**
      * Collection of protected cell ranges.
      *
-     * @var array
+     * @var string[]
      */
     private $protectedCells = [];
 
@@ -278,9 +299,9 @@ class Worksheet implements IComparable
     /**
      * Cached highest column.
      *
-     * @var string
+     * @var int
      */
-    private $cachedHighestColumn = 'A';
+    private $cachedHighestColumn = 1;
 
     /**
      * Cached highest row.
@@ -313,7 +334,7 @@ class Worksheet implements IComparable
     /**
      * Tab color.
      *
-     * @var Color
+     * @var null|Color
      */
     private $tabColor;
 
@@ -341,14 +362,13 @@ class Worksheet implements IComparable
     /**
      * Create a new worksheet.
      *
-     * @param Spreadsheet $parent
-     * @param string $pTitle
+     * @param string $title
      */
-    public function __construct(Spreadsheet $parent = null, $pTitle = 'Worksheet')
+    public function __construct(?Spreadsheet $parent = null, $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);
@@ -363,26 +383,30 @@ class Worksheet implements IComparable
         // Set sheet view
         $this->sheetView = new SheetView();
         // Drawing collection
-        $this->drawingCollection = new \ArrayObject();
+        $this->drawingCollection = new ArrayObject();
         // Chart collection
-        $this->chartCollection = new \ArrayObject();
+        $this->chartCollection = new ArrayObject();
         // Protection
         $this->protection = new Protection();
         // Default row dimension
         $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();
     }
 
     /**
      * Disconnect all cells from this Worksheet object,
      * typically so that the worksheet object can be unset.
      */
-    public function disconnectCells()
+    public function disconnectCells(): void
     {
         if ($this->cellCollection !== null) {
             $this->cellCollection->unsetWorksheetCells();
+            // @phpstan-ignore-next-line
             $this->cellCollection = null;
         }
         //    detach ourself from the workbook, so that it can then delete this worksheet successfully
@@ -397,6 +421,7 @@ class Worksheet implements IComparable
         Calculation::getInstance($this->parent)->clearCalculationCacheForWorksheet($this->title);
 
         $this->disconnectCells();
+        $this->rowDimensions = [];
     }
 
     /**
@@ -422,55 +447,53 @@ class Worksheet implements IComparable
     /**
      * Check sheet code name for valid Excel syntax.
      *
-     * @param string $pValue The string to check
-     *
-     * @throws Exception
+     * @param string $sheetCodeName The string to check
      *
      * @return string The valid string
      */
-    private static function checkSheetCodeName($pValue)
+    private static function checkSheetCodeName($sheetCodeName)
     {
-        $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) == '\'')) {
+        if (
+            (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
-     *
-     * @throws Exception
+     * @param string $sheetTitle The string to check
      *
      * @return string The valid string
      */
-    private static function checkSheetTitle($pValue)
+    private static function checkSheetTitle($sheetTitle)
     {
         // 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;
     }
 
     /**
@@ -520,9 +543,18 @@ class Worksheet implements IComparable
      */
     public function getColumnDimensions()
     {
+        /** @var 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.
      *
@@ -536,7 +568,7 @@ class Worksheet implements IComparable
     /**
      * Get collection of drawings.
      *
-     * @return BaseDrawing[]
+     * @return ArrayObject<int, BaseDrawing>
      */
     public function getDrawingCollection()
     {
@@ -546,7 +578,7 @@ class Worksheet implements IComparable
     /**
      * Get collection of charts.
      *
-     * @return Chart[]
+     * @return ArrayObject<int, Chart>
      */
     public function getChartCollection()
     {
@@ -556,22 +588,22 @@ class Worksheet implements IComparable
     /**
      * Add chart.
      *
-     * @param Chart $pChart
-     * @param null|int $iChartIndex Index where chart should go (0,1,..., or null for last)
+     * @param null|int $chartIndex 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, $chartIndex = null)
     {
-        $pChart->setWorksheet($this);
-        if ($iChartIndex === null) {
-            $this->chartCollection[] = $pChart;
+        $chart->setWorksheet($this);
+        if ($chartIndex === null) {
+            $this->chartCollection[] = $chart;
         } else {
             // Insert the chart at the requested index
-            array_splice($this->chartCollection, $iChartIndex, 0, [$pChart]);
+            // @phpstan-ignore-next-line
+            array_splice(/** @scrutinizer ignore-type */ $this->chartCollection, $chartIndex, 0, [$chart]);
         }
 
-        return $pChart;
+        return $chart;
     }
 
     /**
@@ -587,7 +619,7 @@ class Worksheet implements IComparable
     /**
      * Get a chart by its index position.
      *
-     * @param string $index Chart index position
+     * @param ?string $index Chart index position
      *
      * @return Chart|false
      */
@@ -631,13 +663,9 @@ class Worksheet implements IComparable
      */
     public function getChartByName($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;
             }
         }
 
@@ -651,10 +679,8 @@ class Worksheet implements IComparable
      */
     public function refreshColumnDimensions()
     {
-        $currentColumnDimensions = $this->getColumnDimensions();
         $newColumnDimensions = [];
-
-        foreach ($currentColumnDimensions as $objColumnDimension) {
+        foreach ($this->getColumnDimensions() as $objColumnDimension) {
             $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
         }
 
@@ -670,10 +696,8 @@ class Worksheet implements IComparable
      */
     public function refreshRowDimensions()
     {
-        $currentRowDimensions = $this->getRowDimensions();
         $newRowDimensions = [];
-
-        foreach ($currentRowDimensions as $objRowDimension) {
+        foreach ($this->getRowDimensions() as $objRowDimension) {
             $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
         }
 
@@ -729,9 +753,12 @@ class Worksheet implements IComparable
                 }
             }
 
+            $autoFilterIndentRanges = (new AutoFit($this))->getAutoFilterIndentRanges();
+
             // loop through all cells in the worksheet
             foreach ($this->getCoordinates(false) as $coordinate) {
-                $cell = $this->getCell($coordinate, false);
+                $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 +766,58 @@ class Worksheet implements IComparable
                     //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()
+                            (string) $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())
+                                ->getNumberFormat()->getFormatCode()
                         );
 
-                        $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
+                                )
+                            );
+                        }
                     }
                 }
             }
@@ -783,28 +835,36 @@ class Worksheet implements IComparable
     }
 
     /**
-     * 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.
      *
-     * @param Spreadsheet $parent
-     *
      * @return $this
      */
     public function rebindParent(Spreadsheet $parent)
     {
         if ($this->parent !== null) {
-            $namedRanges = $this->parent->getNamedRanges();
-            foreach ($namedRanges as $namedRange) {
-                $parent->addNamedRange($namedRange);
+            $definedNames = $this->parent->getDefinedNames();
+            foreach ($definedNames as $definedName) {
+                $parent->addDefinedName($definedName);
             }
 
             $this->parent->removeSheetByIndex(
@@ -829,7 +889,7 @@ class Worksheet implements IComparable
     /**
      * Set title.
      *
-     * @param string $pValue String containing the dimension of this worksheet
+     * @param string $title String containing the dimension of this worksheet
      * @param bool $updateFormulaCellReferences Flag indicating whether cell references in formulae should
      *            be updated to reflect the new sheet name.
      *          This should be left as the default true, unless you are
@@ -840,10 +900,10 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setTitle($pValue, $updateFormulaCellReferences = true, $validate = true)
+    public function setTitle($title, $updateFormulaCellReferences = true, $validate = true)
     {
         // Is this a 'rename' or not?
-        if ($this->getTitle() == $pValue) {
+        if ($this->getTitle() == $title) {
             return $this;
         }
 
@@ -852,37 +912,37 @@ class Worksheet implements IComparable
 
         if ($validate) {
             // Syntax check
-            self::checkSheetTitle($pValue);
+            self::checkSheetTitle($title);
 
             if ($this->parent) {
                 // Is there already such sheet name?
-                if ($this->parent->sheetNameExists($pValue)) {
+                if ($this->parent->sheetNameExists($title)) {
                     // 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($title) > 29) {
+                        $title = Shared\StringHelper::substring($title, 0, 29);
                     }
                     $i = 1;
-                    while ($this->parent->sheetNameExists($pValue . ' ' . $i)) {
+                    while ($this->parent->sheetNameExists($title . ' ' . $i)) {
                         ++$i;
                         if ($i == 10) {
-                            if (Shared\StringHelper::countCharacters($pValue) > 28) {
-                                $pValue = Shared\StringHelper::substring($pValue, 0, 28);
+                            if (Shared\StringHelper::countCharacters($title) > 28) {
+                                $title = Shared\StringHelper::substring($title, 0, 28);
                             }
                         } elseif ($i == 100) {
-                            if (Shared\StringHelper::countCharacters($pValue) > 27) {
-                                $pValue = Shared\StringHelper::substring($pValue, 0, 27);
+                            if (Shared\StringHelper::countCharacters($title) > 27) {
+                                $title = Shared\StringHelper::substring($title, 0, 27);
                             }
                         }
                     }
 
-                    $pValue .= " $i";
+                    $title .= " $i";
                 }
             }
         }
 
         // Set title
-        $this->title = $pValue;
+        $this->title = $title;
         $this->dirty = true;
 
         if ($this->parent && $this->parent->getCalculationEngine()) {
@@ -891,7 +951,7 @@ class Worksheet implements IComparable
             $this->parent->getCalculationEngine()
                 ->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
             if ($updateFormulaCellReferences) {
-                ReferenceHelper::getInstance()->updateNamedFormulas($this->parent, $oldTitle, $newTitle);
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->parent, $oldTitle, $newTitle);
             }
         }
 
@@ -935,13 +995,11 @@ class Worksheet implements IComparable
     /**
      * Set page setup.
      *
-     * @param PageSetup $pValue
-     *
      * @return $this
      */
-    public function setPageSetup(PageSetup $pValue)
+    public function setPageSetup(PageSetup $pageSetup)
     {
-        $this->pageSetup = $pValue;
+        $this->pageSetup = $pageSetup;
 
         return $this;
     }
@@ -959,13 +1017,11 @@ class Worksheet implements IComparable
     /**
      * Set page margins.
      *
-     * @param PageMargins $pValue
-     *
      * @return $this
      */
-    public function setPageMargins(PageMargins $pValue)
+    public function setPageMargins(PageMargins $pageMargins)
     {
-        $this->pageMargins = $pValue;
+        $this->pageMargins = $pageMargins;
 
         return $this;
     }
@@ -983,13 +1039,11 @@ class Worksheet implements IComparable
     /**
      * Set page header/footer.
      *
-     * @param HeaderFooter $pValue
-     *
      * @return $this
      */
-    public function setHeaderFooter(HeaderFooter $pValue)
+    public function setHeaderFooter(HeaderFooter $headerFooter)
     {
-        $this->headerFooter = $pValue;
+        $this->headerFooter = $headerFooter;
 
         return $this;
     }
@@ -1007,13 +1061,11 @@ class Worksheet implements IComparable
     /**
      * Set sheet view.
      *
-     * @param SheetView $pValue
-     *
      * @return $this
      */
-    public function setSheetView(SheetView $pValue)
+    public function setSheetView(SheetView $sheetView)
     {
-        $this->sheetView = $pValue;
+        $this->sheetView = $sheetView;
 
         return $this;
     }
@@ -1031,13 +1083,11 @@ class Worksheet implements IComparable
     /**
      * Set Protection.
      *
-     * @param Protection $pValue
-     *
      * @return $this
      */
-    public function setProtection(Protection $pValue)
+    public function setProtection(Protection $protection)
     {
-        $this->protection = $pValue;
+        $this->protection = $protection;
         $this->dirty = true;
 
         return $this;
@@ -1046,15 +1096,15 @@ class Worksheet implements IComparable
     /**
      * 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)
     {
-        if ($row == null) {
-            return $this->cachedHighestColumn;
+        if ($row === null) {
+            return Coordinate::stringFromColumnIndex($this->cachedHighestColumn);
         }
 
         return $this->getHighestDataColumn($row);
@@ -1063,7 +1113,7 @@ class Worksheet implements IComparable
     /**
      * 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
@@ -1076,14 +1126,14 @@ class Worksheet implements IComparable
     /**
      * 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)
     {
-        if ($column == null) {
+        if ($column === null) {
             return $this->cachedHighestRow;
         }
 
@@ -1093,7 +1143,7 @@ class Worksheet implements IComparable
     /**
      * 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
@@ -1116,14 +1166,17 @@ class Worksheet implements IComparable
     /**
      * Set a cell value.
      *
-     * @param string $pCoordinate Coordinate of the cell, eg: 'A1'
-     * @param mixed $pValue Value of the cell
+     * @param array<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 setCellValue($pCoordinate, $pValue)
+    public function setCellValue($coordinate, $value, ?IValueBinder $binder = null)
     {
-        $this->getCell($pCoordinate)->setValue($pValue);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValue($value, $binder);
 
         return $this;
     }
@@ -1131,15 +1184,21 @@ class Worksheet implements IComparable
     /**
      * Set a cell value by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the setCellValue() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::setCellValue()
+     *
      * @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 null|IValueBinder $binder Value Binder to override the currently set Value Binder
      *
      * @return $this
      */
-    public function setCellValueByColumnAndRow($columnIndex, $row, $value)
+    public function setCellValueByColumnAndRow($columnIndex, $row, $value, ?IValueBinder $binder = null)
     {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValue($value);
+        $this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row)->setValue($value, $binder);
 
         return $this;
     }
@@ -1147,16 +1206,24 @@ class Worksheet implements IComparable
     /**
      * 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_*
+     * @param array<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 setCellValueExplicit($pCoordinate, $pValue, $pDataType)
+    public function setCellValueExplicit($coordinate, $value, $dataType)
     {
-        // Set value
-        $this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValueExplicit($value, $dataType);
 
         return $this;
     }
@@ -1164,16 +1231,28 @@ class Worksheet implements IComparable
     /**
      * Set a cell value by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the setCellValueExplicit() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::setCellValueExplicit()
+     *
      * @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 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)
     {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValueExplicit($value, $dataType);
+        $this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row)->setValueExplicit($value, $dataType);
 
         return $this;
     }
@@ -1181,108 +1260,171 @@ class Worksheet implements IComparable
     /**
      * Get cell at a specific coordinate.
      *
-     * @param string $pCoordinate Coordinate of the cell, eg: 'A1'
-     * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't
-     *                                       already exist, or a null should be returned instead
+     * @param array<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.
      *
-     * @throws Exception
-     *
-     * @return null|Cell Cell that was found/created or null
+     * @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($pCoordinate, $createIfNotExists = true)
+    public function getCell($coordinate): Cell
     {
-        // Uppercase coordinate
-        $pCoordinateUpper = strtoupper($pCoordinate);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
 
-        // Check cell collection
-        if ($this->cellCollection->has($pCoordinateUpper)) {
-            return $this->cellCollection->get($pCoordinateUpper);
+        // Shortcut for increased performance for the vast majority of simple cases
+        if ($this->cellCollection->has($cellAddress)) {
+            /** @var Cell $cell */
+            $cell = $this->cellCollection->get($cellAddress);
+
+            return $cell;
         }
 
+        /** @var Worksheet $sheet */
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
+        $cell = $sheet->cellCollection->get($finalCoordinate);
+
+        return $cell ?? $sheet->createNewCell($finalCoordinate);
+    }
+
+    /**
+     * Get the correct Worksheet and coordinate from a coordinate that may
+     * contains reference to another sheet or a named range.
+     *
+     * @return array{0: Worksheet, 1: string}
+     */
+    private function getWorksheetAndCoordinate(string $coordinate): array
+    {
+        $sheet = null;
+        $finalCoordinate = null;
+
         // Worksheet reference?
-        if (strpos($pCoordinate, '!') !== false) {
-            $worksheetReference = self::extractSheetTitle($pCoordinate, true);
+        if (strpos($coordinate, '!') !== false) {
+            $worksheetReference = self::extractSheetTitle($coordinate, true);
 
-            return $this->parent->getSheetByName($worksheetReference[0])->getCell(strtoupper($worksheetReference[1]), $createIfNotExists);
-        }
+            $sheet = $this->getParentOrThrow()->getSheetByName($worksheetReference[0]);
+            $finalCoordinate = strtoupper($worksheetReference[1]);
 
-        // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
-            $namedRange = NamedRange::resolveRange($pCoordinate, $this);
+            if ($sheet === null) {
+                throw new Exception('Sheet not found for name: ' . $worksheetReference[0]);
+            }
+        } elseif (
+            !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $coordinate) &&
+            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/iu', $coordinate)
+        ) {
+            // Named range?
+            $namedRange = $this->validateNamedRange($coordinate, true);
             if ($namedRange !== null) {
-                $pCoordinate = $namedRange->getRange();
+                $sheet = $namedRange->getWorksheet();
+                if ($sheet === null) {
+                    throw new Exception('Sheet not found for named range: ' . $namedRange->getName());
+                }
 
-                return $namedRange->getWorksheet()->getCell($pCoordinate, $createIfNotExists);
+                /** @phpstan-ignore-next-line */
+                $cellCoordinate = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
+                $finalCoordinate = str_replace('$', '', $cellCoordinate);
             }
         }
 
-        if (Coordinate::coordinateIsRange($pCoordinate)) {
-            throw new Exception('Cell coordinate can not be a range of cells.');
-        } elseif (strpos($pCoordinate, '$') !== false) {
+        if ($sheet === null || $finalCoordinate === null) {
+            $sheet = $this;
+            $finalCoordinate = strtoupper($coordinate);
+        }
+
+        if (Coordinate::coordinateIsRange($finalCoordinate)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (strpos($finalCoordinate, '$') !== false) {
             throw new Exception('Cell coordinate must not be absolute.');
         }
 
-        // Create new cell object, if required
-        return $createIfNotExists ? $this->createNewCell($pCoordinateUpper) : null;
+        return [$sheet, $finalCoordinate];
+    }
+
+    /**
+     * Get an existing cell at a specific coordinate, or null.
+     *
+     * @param string $coordinate Coordinate of the cell, eg: 'A1'
+     *
+     * @return null|Cell Cell that was found or null
+     */
+    private function getCellOrNull($coordinate): ?Cell
+    {
+        // Check cell collection
+        if ($this->cellCollection->has($coordinate)) {
+            return $this->cellCollection->get($coordinate);
+        }
+
+        return null;
     }
 
     /**
      * Get cell at a specific coordinate by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the getCell() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::getCell()
+     *
      * @param int $columnIndex Numeric column coordinate of the cell
      * @param int $row Numeric row coordinate of the cell
-     * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't
-     *                                       already exist, or a null should be returned instead
      *
-     * @return null|Cell Cell that was found/created or null
+     * @return Cell Cell that was found/created or null
+     *              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 getCellByColumnAndRow($columnIndex, $row, $createIfNotExists = true)
+    public function getCellByColumnAndRow($columnIndex, $row): Cell
     {
-        $columnLetter = Coordinate::stringFromColumnIndex($columnIndex);
-        $coordinate = $columnLetter . $row;
-
-        if ($this->cellCollection->has($coordinate)) {
-            return $this->cellCollection->get($coordinate);
-        }
-
-        // Create new cell object, if required
-        return $createIfNotExists ? $this->createNewCell($coordinate) : null;
+        return $this->getCell(Coordinate::stringFromColumnIndex($columnIndex) . $row);
     }
 
     /**
      * 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($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
-        $aCoordinates = Coordinate::coordinateFromString($pCoordinate);
-        if (Coordinate::columnIndexFromString($this->cachedHighestColumn) < Coordinate::columnIndexFromString($aCoordinates[0])) {
-            $this->cachedHighestColumn = $aCoordinates[0];
+        if ($column > $this->cachedHighestColumn) {
+            $this->cachedHighestColumn = $column;
         }
-        if ($aCoordinates[1] > $this->cachedHighestRow) {
-            $this->cachedHighestRow = $aCoordinates[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->getRowDimension($aCoordinates[1], false);
-        $columnDimension = $this->getColumnDimension($aCoordinates[0], false);
+        $rowDimension = $this->rowDimensions[$row] ?? null;
+        $columnDimension = $this->columnDimensions[$columnString] ?? 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());
+        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);
+            }
+        } elseif ($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;
@@ -1291,61 +1433,30 @@ class Worksheet implements IComparable
     /**
      * Does the cell at a specific coordinate exist?
      *
-     * @param string $pCoordinate Coordinate of the cell eg: 'A1'
-     *
-     * @throws Exception
-     *
-     * @return bool
+     * @param array<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($pCoordinate)
+    public function cellExists($coordinate): bool
     {
-        // Worksheet reference?
-        if (strpos($pCoordinate, '!') !== false) {
-            $worksheetReference = self::extractSheetTitle($pCoordinate, true);
+        $cellAddress = Validations::validateCellAddress($coordinate);
+        /** @var Worksheet $sheet */
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
 
-            return $this->parent->getSheetByName($worksheetReference[0])->cellExists(strtoupper($worksheetReference[1]));
-        }
-
-        // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
-            $namedRange = NamedRange::resolveRange($pCoordinate, $this);
-            if ($namedRange !== null) {
-                $pCoordinate = $namedRange->getRange();
-                if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
-                    if (!$namedRange->getLocalOnly()) {
-                        return $namedRange->getWorksheet()->cellExists($pCoordinate);
-                    }
-
-                    throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
-                }
-            } else {
-                return false;
-            }
-        }
-
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
-
-        if (Coordinate::coordinateIsRange($pCoordinate)) {
-            throw new Exception('Cell coordinate can not be a range of cells.');
-        } elseif (strpos($pCoordinate, '$') !== false) {
-            throw new Exception('Cell coordinate must not be absolute.');
-        }
-
-        // Cell exists?
-        return $this->cellCollection->has($pCoordinate);
+        return $sheet->cellCollection->has($finalCoordinate);
     }
 
     /**
      * Cell at a specific coordinate by using numeric cell coordinates exists?
      *
+     * @deprecated 1.23.0
+     *      Use the cellExists() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::cellExists()
+     *
      * @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)
+    public function cellExistsByColumnAndRow($columnIndex, $row): bool
     {
         return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex) . $row);
     }
@@ -1353,65 +1464,54 @@ class Worksheet implements IComparable
     /**
      * Get row dimension at a specific row.
      *
-     * @param int $pRow Numeric index of the row
-     * @param bool $create
-     *
-     * @return RowDimension
+     * @param int $row Numeric index of the row
      */
-    public function getRowDimension($pRow, $create = true)
+    public function getRowDimension(int $row): RowDimension
     {
-        // Found
-        $found = null;
-
         // Get row dimension
-        if (!isset($this->rowDimensions[$pRow])) {
-            if (!$create) {
-                return null;
-            }
-            $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]);
     }
 
     /**
      * Get column dimension at a specific column.
      *
-     * @param string $pColumn String index of the column eg: 'A'
-     * @param bool $create
-     *
-     * @return ColumnDimension
+     * @param string $column String index of the column eg: 'A'
      */
-    public function getColumnDimension($pColumn, $create = true)
+    public function getColumnDimension(string $column): ColumnDimension
     {
         // Uppercase coordinate
-        $pColumn = strtoupper($pColumn);
+        $column = strtoupper($column);
 
         // Fetch dimensions
-        if (!isset($this->columnDimensions[$pColumn])) {
-            if (!$create) {
-                return null;
-            }
-            $this->columnDimensions[$pColumn] = new ColumnDimension($pColumn);
+        if (!isset($this->columnDimensions[$column])) {
+            $this->columnDimensions[$column] = new ColumnDimension($column);
 
-            if (Coordinate::columnIndexFromString($this->cachedHighestColumn) < Coordinate::columnIndexFromString($pColumn)) {
-                $this->cachedHighestColumn = $pColumn;
+            $columnIndex = Coordinate::columnIndexFromString($column);
+            if ($this->cachedHighestColumn < $columnIndex) {
+                $this->cachedHighestColumn = $columnIndex;
             }
         }
 
-        return $this->columnDimensions[$pColumn];
+        return $this->columnDimensions[$column];
     }
 
     /**
      * Get column dimension at a specific column by using numeric cell coordinates.
      *
      * @param int $columnIndex Numeric column coordinate of the cell
-     *
-     * @return ColumnDimension
      */
-    public function getColumnDimensionByColumn($columnIndex)
+    public function getColumnDimensionByColumn(int $columnIndex): ColumnDimension
     {
         return $this->getColumnDimension(Coordinate::stringFromColumnIndex($columnIndex));
     }
@@ -1429,62 +1529,131 @@ class Worksheet implements IComparable
     /**
      * Get style for cell.
      *
-     * @param string $pCellCoordinate Cell coordinate (or range) to get style for, eg: 'A1'
+     * @param AddressRange|array<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($cellCoordinate): Style
+    {
+        $cellCoordinate = Validations::validateCellOrCellRange($cellCoordinate);
+
+        // set this sheet as active
+        $this->getParentOrThrow()->setActiveSheetIndex($this->getParentOrThrow()->getIndex($this));
+
+        // set cell coordinate as active
+        $this->setSelectedCells($cellCoordinate);
+
+        return $this->getParentOrThrow()->getCellXfSupervisor();
+    }
+
+    /**
+     * Get style for cell by using numeric cell coordinates.
      *
-     * @throws Exception
+     * @deprecated 1.23.0
+     *      Use the getStyle() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object.
+     * @see Worksheet::getStyle()
+     *
+     * @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 getStyle($pCellCoordinate)
+    public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
     {
-        // set this sheet as active
-        $this->parent->setActiveSheetIndex($this->parent->getIndex($this));
+        if ($columnIndex2 !== null && $row2 !== null) {
+            $cellRange = new CellRange(
+                CellAddress::fromColumnAndRow($columnIndex1, $row1),
+                CellAddress::fromColumnAndRow($columnIndex2, $row2)
+            );
 
-        // set cell coordinate as active
-        $this->setSelectedCells($pCellCoordinate);
+            return $this->getStyle($cellRange);
+        }
 
-        return $this->parent->getCellXfSupervisor();
+        return $this->getStyle(CellAddress::fromColumnAndRow($columnIndex1, $row1));
     }
 
     /**
      * 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
     {
-        $pCoordinate = strtoupper($pCoordinate);
-        if (!isset($this->conditionalStylesCollection[$pCoordinate])) {
-            $this->conditionalStylesCollection[$pCoordinate] = [];
+        $coordinate = strtoupper($coordinate);
+        if (strpos($coordinate, ':') !== false) {
+            return $this->conditionalStylesCollection[$coordinate] ?? [];
         }
 
-        return $this->conditionalStylesCollection[$pCoordinate];
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            if ($cell->isInRange($conditionalRange)) {
+                return $this->conditionalStylesCollection[$conditionalRange];
+            }
+        }
+
+        return [];
+    }
+
+    public function getConditionalRange(string $coordinate): ?string
+    {
+        $coordinate = strtoupper($coordinate);
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            if ($cell->isInRange($conditionalRange)) {
+                return $conditionalRange;
+            }
+        }
+
+        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($coordinate): bool
     {
-        return isset($this->conditionalStylesCollection[strtoupper($pCoordinate)]);
+        $coordinate = strtoupper($coordinate);
+        if (strpos($coordinate, ':') !== false) {
+            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($coordinate)
     {
-        unset($this->conditionalStylesCollection[strtoupper($pCoordinate)]);
+        unset($this->conditionalStylesCollection[strtoupper($coordinate)]);
 
         return $this;
     }
@@ -1502,66 +1671,43 @@ class Worksheet implements IComparable
     /**
      * Set conditional styles.
      *
-     * @param string $pCoordinate eg: 'A1'
-     * @param $pValue Conditional[]
+     * @param string $coordinate eg: 'A1'
+     * @param Conditional[] $styles
      *
      * @return $this
      */
-    public function setConditionalStyles($pCoordinate, $pValue)
+    public function setConditionalStyles($coordinate, $styles)
     {
-        $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")
-     *
-     * @throws Exception
+     * @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, $range)
     {
         // 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]) {
@@ -1585,23 +1731,21 @@ class Worksheet implements IComparable
      *
      * 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")
-     *
-     * @throws Exception
+     * @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, $range = '')
     {
-        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]) {
@@ -1613,7 +1757,7 @@ class Worksheet implements IComparable
         // 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);
             }
         }
 
@@ -1623,28 +1767,22 @@ class Worksheet implements IComparable
     /**
      * Set break on a cell.
      *
-     * @param string $pCoordinate Cell coordinate (e.g. A1)
-     * @param int $pBreak Break type (type of Worksheet::BREAK_*)
-     *
-     * @throws Exception
+     * @param array<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($coordinate, $break, int $max = -1)
     {
-        // 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;
@@ -1653,6 +1791,11 @@ class Worksheet implements IComparable
     /**
      * Set break on a cell by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the setBreak() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::setBreak()
+     *
      * @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_*)
@@ -1667,93 +1810,245 @@ class Worksheet implements IComparable
     /**
      * Get breaks.
      *
-     * @return array[]
+     * @return int[]
      */
     public function getBreaks()
     {
-        return $this->breaks;
+        $breaks = [];
+        /** @var callable */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
+        foreach ($this->rowBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_ROW;
+        }
+        /** @var callable */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
+        foreach ($this->columnBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_COLUMN;
+        }
+
+        return $breaks;
+    }
+
+    /**
+     * Get row breaks.
+     *
+     * @return PageBreak[]
+     */
+    public function getRowBreaks()
+    {
+        /** @var callable */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
+
+        return $this->rowBreaks;
+    }
+
+    protected static function compareRowBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $row1 = Coordinate::indexesFromString($coordinate1)[1];
+        $row2 = Coordinate::indexesFromString($coordinate2)[1];
+
+        return $row1 - $row2;
+    }
+
+    protected static function compareColumnBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $column1 = Coordinate::indexesFromString($coordinate1)[0];
+        $column2 = Coordinate::indexesFromString($coordinate2)[0];
+
+        return $column1 - $column2;
+    }
+
+    /**
+     * Get column breaks.
+     *
+     * @return PageBreak[]
+     */
+    public function getColumnBreaks()
+    {
+        /** @var callable */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
+
+        return $this->columnBreaks;
     }
 
     /**
      * Set merge on a cell range.
      *
-     * @param string $pRange Cell range (e.g. A1:E1)
-     *
-     * @throws Exception
+     * @param AddressRange|array<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 mergeCells($pRange)
+    public function mergeCells($range, $behaviour = self::MERGE_CELL_CONTENT_EMPTY)
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
 
-        if (strpos($pRange, ':') !== false) {
-            $this->mergeCells[$pRange] = $pRange;
+        if (strpos($range, ':') === false) {
+            $range .= ":{$range}";
+        }
 
-            // make sure cells are created
+        if (preg_match('/^([A-Z]+)(\\d+):([A-Z]+)(\\d+)$/', $range, $matches) !== 1) {
+            throw new Exception('Merge must be on a valid range of cells.');
+        }
 
-            // get the cells in the range
-            $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
+        $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;
 
-            // 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);
-            }
+        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)
-            $count = count($aReferences);
-            for ($i = 1; $i < $count; ++$i) {
-                if ($this->cellExists($aReferences[$i])) {
-                    $this->getCell($aReferences[$i])->setValueExplicit(null, DataType::TYPE_NULL);
-                }
+            if ($numberRows > $numberColumns) {
+                $this->clearMergeCellsByColumn($firstColumn, $lastColumn, $firstRow, $lastRow, $upperLeft, $behaviour);
+            } else {
+                $this->clearMergeCellsByRow($firstColumn, $lastColumnIndex, $firstRow, $lastRow, $upperLeft, $behaviour);
             }
-        } else {
-            throw new Exception('Merge must be set on a range of cells.');
         }
 
         return $this;
     }
 
+    private function clearMergeCellsByColumn(string $firstColumn, string $lastColumn, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
+    {
+        $leftCellValue = ($behaviour === self::MERGE_CELL_CONTENT_MERGE)
+            ? [$this->getCell($upperLeft)->getFormattedValue()]
+            : [];
+
+        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
+    {
+        $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 on a cell range by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the mergeCells() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object.
+     * @see Worksheet::mergeCells()
+     *
      * @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
-     *
-     * @throws Exception
+     * @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 mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $behaviour = self::MERGE_CELL_CONTENT_EMPTY)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );
 
-        return $this->mergeCells($cellRange);
+        return $this->mergeCells($cellRange, $behaviour);
     }
 
     /**
      * Remove merge on a cell range.
      *
-     * @param string $pRange Cell range (e.g. A1:E1)
-     *
-     * @throws Exception
+     * @param AddressRange|array<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 unmergeCells($pRange)
+    public function unmergeCells($range)
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
 
-        if (strpos($pRange, ':') !== false) {
-            if (isset($this->mergeCells[$pRange])) {
-                unset($this->mergeCells[$pRange]);
+        if (strpos($range, ':') !== false) {
+            if (isset($this->mergeCells[$range])) {
+                unset($this->mergeCells[$range]);
             } else {
-                throw new Exception('Cell range ' . $pRange . ' not known as merged.');
+                throw new Exception('Cell range ' . $range . ' not known as merged.');
             }
         } else {
             throw new Exception('Merge can only be removed from a range of cells.');
@@ -1765,18 +2060,25 @@ class Worksheet implements IComparable
     /**
      * Remove merge on a cell range by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the unmergeCells() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object.
+     * @see Worksheet::unmergeCells()
+     *
      * @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
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function unmergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );
 
         return $this->unmergeCells($cellRange);
     }
@@ -1784,7 +2086,7 @@ class Worksheet implements IComparable
     /**
      * Get merge cells array.
      *
-     * @return array[]
+     * @return string[]
      */
     public function getMergeCells()
     {
@@ -1795,35 +2097,36 @@ class Worksheet implements IComparable
      * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
      * a single cell range.
      *
-     * @param array $pValue
+     * @param string[] $mergeCells
      *
      * @return $this
      */
-    public function setMergeCells(array $pValue)
+    public function setMergeCells(array $mergeCells)
     {
-        $this->mergeCells = $pValue;
+        $this->mergeCells = $mergeCells;
 
         return $this;
     }
 
     /**
-     * Set protection on a cell range.
+     * Set protection on a cell or 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 AddressRange|array<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 protectCells($pRange, $pPassword, $pAlreadyHashed = false)
+    public function protectCells($range, $password, $alreadyHashed = false)
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
 
-        if (!$pAlreadyHashed) {
-            $pPassword = Shared\PasswordHasher::hashPassword($pPassword);
+        if (!$alreadyHashed) {
+            $password = Shared\PasswordHasher::hashPassword($password);
         }
-        $this->protectedCells[$pRange] = $pPassword;
+        $this->protectedCells[$range] = $password;
 
         return $this;
     }
@@ -1831,6 +2134,12 @@ class Worksheet implements IComparable
     /**
      * Set protection on a cell range by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the protectCells() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object.
+     * @see Worksheet::protectCells()
+     *
      * @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
@@ -1842,29 +2151,31 @@ class Worksheet implements IComparable
      */
     public function protectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $password, $alreadyHashed = false)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );
 
         return $this->protectCells($cellRange, $password, $alreadyHashed);
     }
 
     /**
-     * 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)
-     *
-     * @throws Exception
+     * @param AddressRange|array<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($range)
     {
-        // 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;
@@ -1873,18 +2184,25 @@ class Worksheet implements IComparable
     /**
      * Remove protection on a cell range by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the unprotectCells() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object.
+     * @see Worksheet::unprotectCells()
+     *
      * @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
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function unprotectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );
 
         return $this->unprotectCells($cellRange);
     }
@@ -1892,7 +2210,7 @@ class Worksheet implements IComparable
     /**
      * Get protected cells.
      *
-     * @return array[]
+     * @return string[]
      */
     public function getProtectedCells()
     {
@@ -1912,19 +2230,21 @@ class Worksheet implements IComparable
     /**
      * Set AutoFilter.
      *
-     * @param AutoFilter|string $pValue
+     * @param AddressRange|array<int>|AutoFilter|string $autoFilterOrRange
      *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
-     *
-     * @throws Exception
+     *              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($autoFilterOrRange)
     {
-        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;
@@ -1933,32 +2253,137 @@ class Worksheet implements IComparable
     /**
      * Set Autofilter Range by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the setAutoFilter() method with a cell address range such as 'C5:F8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *          or an AddressRange object or AutoFilter object.
+     * @see Worksheet::setAutoFilter()
+     *
      * @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
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function setAutoFilterByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        return $this->setAutoFilter(
-            Coordinate::stringFromColumnIndex($columnIndex1) . $row1
-            . ':' .
-            Coordinate::stringFromColumnIndex($columnIndex2) . $row2
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
         );
+
+        return $this->setAutoFilter($cellRange);
     }
 
     /**
      * Remove autofilter.
+     */
+    public function removeAutoFilter(): self
+    {
+        $this->autoFilter->setRange('');
+
+        return $this;
+    }
+
+    /**
+     * Get collection of Tables.
+     *
+     * @return ArrayObject<int, Table>
+     */
+    public function getTableCollection()
+    {
+        return $this->tableCollection;
+    }
+
+    /**
+     * Add Table.
      *
      * @return $this
      */
-    public function removeAutoFilter()
+    public function addTable(Table $table): self
     {
-        $this->autoFilter->setRange(null);
+        $table->setWorksheet($this);
+        $this->tableCollection[] = $table;
+
+        return $this;
+    }
+
+    /**
+     * @return string[] array of Table names
+     */
+    public function getTableNames(): array
+    {
+        $tableNames = [];
+
+        foreach ($this->tableCollection as $table) {
+            /** @var Table $table */
+            $tableNames[] = $table->getName();
+        }
+
+        return $tableNames;
+    }
+
+    /** @var null|Table */
+    private static $scrutinizerNullTable;
+
+    /** @var null|int */
+    private static $scrutinizerNullInt;
+
+    /**
+     * @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) ? self::$scrutinizerNullTable : $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 self::$scrutinizerNullInt;
+    }
+
+    /**
+     * Remove Table by name.
+     *
+     * @param string $name Table name
+     *
+     * @return $this
+     */
+    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->tableCollection = new ArrayObject();
 
         return $this;
     }
@@ -1966,7 +2391,7 @@ class Worksheet implements IComparable
     /**
      * Get Freeze Pane.
      *
-     * @return string
+     * @return null|string
      */
     public function getFreezePane()
     {
@@ -1982,25 +2407,40 @@ class Worksheet implements IComparable
      *     - 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
-     *
-     * @throws Exception
+     * @param null|array<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<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)
+    public function freezePane($coordinate, $topLeftCell = null)
     {
-        if (is_string($cell) && Coordinate::coordinateIsRange($cell)) {
+        $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;
+        $this->freezePane = $cellAddress;
+        $this->topLeftCell = $topLeftCell;
+
+        return $this;
+    }
+
+    public function setTopLeftCell(string $topLeftCell): self
+    {
         $this->topLeftCell = $topLeftCell;
 
         return $this;
@@ -2009,6 +2449,11 @@ class Worksheet implements IComparable
     /**
      * Freeze Pane by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the freezePane() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::freezePane()
+     *
      * @param int $columnIndex Numeric column coordinate of the cell
      * @param int $row Numeric row coordinate of the cell
      *
@@ -2032,7 +2477,7 @@ class Worksheet implements IComparable
     /**
      * Get the default position of the right bottom pane.
      *
-     * @return int
+     * @return null|string
      */
     public function getTopLeftCell()
     {
@@ -2042,18 +2487,16 @@ class Worksheet implements IComparable
     /**
      * Insert a new row, updating all possible related data.
      *
-     * @param int $pBefore Insert before this one
-     * @param int $pNumRows Number of rows to insert
-     *
-     * @throws Exception
+     * @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)
     {
-        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.');
         }
@@ -2064,18 +2507,16 @@ class Worksheet implements IComparable
     /**
      * 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
-     *
-     * @throws Exception
+     * @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)
     {
-        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.');
         }
@@ -2086,17 +2527,15 @@ class Worksheet implements IComparable
     /**
      * 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
-     *
-     * @throws Exception
+     * @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)
     {
         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).');
@@ -2105,65 +2544,92 @@ class Worksheet implements IComparable
     /**
      * Delete a row, updating all possible related data.
      *
-     * @param int $pRow Remove starting with this one
-     * @param int $pNumRows Number of rows to remove
-     *
-     * @throws Exception
+     * @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)
     {
-        if ($pRow >= 1) {
-            for ($r = 0; $r < $pNumRows; ++$r) {
-                $this->getCellCollection()->removeRow($pRow + $r);
-            }
-
-            $highestRow = $this->getHighestDataRow();
-            $objReferenceHelper = ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
-            for ($r = 0; $r < $pNumRows; ++$r) {
-                $this->getCellCollection()->removeRow($highestRow);
-                --$highestRow;
-            }
-        } else {
+        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 < $numberOfRows; ++$r) {
+            if ($row + $r <= $highestRow) {
+                $this->getCellCollection()->removeRow($row + $r);
+                ++$removedRowsCounter;
+            }
+        }
+
+        $objReferenceHelper = ReferenceHelper::getInstance();
+        $objReferenceHelper->insertNewBefore('A' . ($row + $numberOfRows), 0, -$numberOfRows, $this);
+        for ($r = 0; $r < $removedRowsCounter; ++$r) {
+            $this->getCellCollection()->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(/** @scrutinizer ignore-type */ $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
-     *
-     * @throws Exception
+     * @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)
     {
-        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) {
+        for ($c = 0, $n = min($maxPossibleColumnsToBeRemoved, $numberOfColumns); $c < $n; ++$c) {
             $this->getCellCollection()->removeColumn($highestColumn);
             $highestColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($highestColumn) - 1);
         }
@@ -2173,17 +2639,35 @@ class Worksheet implements IComparable
         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
      *
-     * @throws Exception
-     *
      * @return $this
      */
-    public function removeColumnByIndex($columnIndex, $numColumns = 1)
+    public function removeColumnByIndex(int $columnIndex, int $numColumns = 1)
     {
         if ($columnIndex >= 1) {
             return $this->removeColumn(Coordinate::stringFromColumnIndex($columnIndex), $numColumns);
@@ -2194,10 +2678,8 @@ class Worksheet implements IComparable
 
     /**
      * Show gridlines?
-     *
-     * @return bool
      */
-    public function getShowGridlines()
+    public function getShowGridlines(): bool
     {
         return $this->showGridlines;
     }
@@ -2205,23 +2687,21 @@ class Worksheet implements IComparable
     /**
      * 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;
     }
@@ -2229,23 +2709,21 @@ class Worksheet implements IComparable
     /**
      * 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;
     }
@@ -2253,23 +2731,21 @@ class Worksheet implements IComparable
     /**
      * 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;
     }
@@ -2277,23 +2753,21 @@ class Worksheet implements IComparable
     /**
      * 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;
     }
@@ -2301,13 +2775,13 @@ class Worksheet implements IComparable
     /**
      * 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;
     }
@@ -2325,13 +2799,40 @@ class Worksheet implements IComparable
     /**
      * 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;
+    }
+
+    /**
+     * Remove comment from cell.
+     *
+     * @param array<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 $this
+     */
+    public function removeComment($cellCoordinate): self
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
+
+        if (Coordinate::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (strpos($cellAddress, '$') !== false) {
+            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 have a comment for this cell and delete it
+        if (isset($this->comments[$cellAddress])) {
+            unset($this->comments[$cellAddress]);
+        }
 
         return $this;
     }
@@ -2339,33 +2840,29 @@ class Worksheet implements IComparable
     /**
      * Get comment for cell.
      *
-     * @param string $pCellCoordinate Cell coordinate to get comment for, eg: 'A1'
-     *
-     * @throws Exception
-     *
-     * @return Comment
+     * @param array<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 getComment($pCellCoordinate)
+    public function getComment($cellCoordinate): Comment
     {
-        // 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 (strpos($cellAddress, '$') !== false) {
             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];
+        if (isset($this->comments[$cellAddress])) {
+            return $this->comments[$cellAddress];
         }
 
         // If not, create a new comment.
         $newComment = new Comment();
-        $this->comments[$pCellCoordinate] = $newComment;
+        $this->comments[$cellAddress] = $newComment;
 
         return $newComment;
     }
@@ -2373,12 +2870,15 @@ class Worksheet implements IComparable
     /**
      * Get comment for cell by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the getComment() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::getComment()
+     *
      * @param int $columnIndex Numeric column coordinate of the cell
      * @param int $row Numeric row coordinate of the cell
-     *
-     * @return Comment
      */
-    public function getCommentByColumnAndRow($columnIndex, $row)
+    public function getCommentByColumnAndRow($columnIndex, $row): Comment
     {
         return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex) . $row);
     }
@@ -2406,46 +2906,38 @@ class Worksheet implements IComparable
     /**
      * 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($coordinate)
     {
-        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|array<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($coordinate)
     {
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
+        if (is_string($coordinate)) {
+            $coordinate = Validations::definedNameToCoordinate($coordinate, $this);
+        }
+        $coordinate = Validations::validateCellOrCellRange($coordinate);
 
-        // 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 (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;
 
         return $this;
     }
@@ -2453,11 +2945,14 @@ class Worksheet implements IComparable
     /**
      * Selected cell by using numeric cell coordinates.
      *
+     * @deprecated 1.23.0
+     *      Use the setSelectedCells() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @see Worksheet::setSelectedCells()
+     *
      * @param int $columnIndex Numeric column coordinate of the cell
      * @param int $row Numeric row coordinate of the cell
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function setSelectedCellByColumnAndRow($columnIndex, $row)
@@ -2497,8 +2992,6 @@ class Worksheet implements IComparable
      * @param string $startCell Insert array starting from this cell address as the top left coordinate
      * @param bool $strictNullComparison Apply strict comparison when testing for null values in the array
      *
-     * @throws Exception
-     *
      * @return $this
      */
     public function fromArray(array $source, $nullValue = null, $startCell = 'A1', $strictNullComparison = false)
@@ -2534,24 +3027,61 @@ class Worksheet implements IComparable
         return $this;
     }
 
+    /**
+     * @param mixed $nullValue
+     *
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception
+     *
+     * @return mixed
+     */
+    protected function cellToArray(Cell $cell, bool $calculateFormulas, bool $formatData, $nullValue)
+    {
+        $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());
+                $returnValue = NumberFormat::toFormattedString(
+                    $returnValue,
+                    $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 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
+     *                             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($pRange, $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
-        // Returnvalue
+    public function rangeToArray(
+        string $range,
+        $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
+        $range = Validations::validateCellOrCellRange($range);
+
         $returnValue = [];
         //    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]);
@@ -2561,41 +3091,23 @@ class Worksheet implements IComparable
         // Loop through rows
         $r = -1;
         for ($row = $minRow; $row <= $maxRow; ++$row) {
-            $rRef = $returnCellRef ? $row : ++$r;
+            if (($ignoreHidden === true) && ($this->getRowDimension($row)->getVisible() === false)) {
+                continue;
+            }
+            $rowRef = $returnCellRef ? $row : ++$r;
             $c = -1;
             // Loop through columns in the current row
-            for ($col = $minCol; $col != $maxCol; ++$col) {
-                $cRef = $returnCellRef ? $col : ++$c;
+            for ($col = $minCol; $col !== $maxCol; ++$col) {
+                if (($ignoreHidden === true) && ($this->getColumnDimension($col)->getVisible() === false)) {
+                    continue;
+                }
+                $columnRef = $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 ($formatData) {
-                            $style = $this->parent->getCellXfByIndex($cell->getXfIndex());
-                            $returnValue[$rRef][$cRef] = NumberFormat::toFormattedString(
-                                $returnValue[$rRef][$cRef],
-                                ($style && $style->getNumberFormat()) ? $style->getNumberFormat()->getFormatCode() : NumberFormat::FORMAT_GENERAL
-                            );
-                        }
-                    } else {
-                        // Cell holds a NULL
-                        $returnValue[$rRef][$cRef] = $nullValue;
-                    }
-                } else {
-                    // Cell doesn't exist
-                    $returnValue[$rRef][$cRef] = $nullValue;
+                $cell = $this->cellCollection->get("{$col}{$row}");
+                $returnValue[$rowRef][$columnRef] = $nullValue;
+                if ($cell !== null) {
+                    $returnValue[$rowRef][$columnRef] = $this->cellToArray($cell, $calculateFormulas, $formatData, $nullValue);
                 }
             }
         }
@@ -2604,31 +3116,73 @@ class Worksheet implements IComparable
         return $returnValue;
     }
 
+    private function validateNamedRange(string $definedName, bool $returnNullIfInvalid = false): ?DefinedName
+    {
+        $namedRange = DefinedName::resolveName($definedName, $this);
+        if ($namedRange === null) {
+            if ($returnNullIfInvalid) {
+                return null;
+            }
+
+            throw new Exception('Named Range ' . $definedName . ' does not exist.');
+        }
+
+        if ($namedRange->isFormula()) {
+            if ($returnNullIfInvalid) {
+                return null;
+            }
+
+            throw new Exception('Defined Named ' . $definedName . ' is a formula, not a range or cell.');
+        }
+
+        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()
+                );
+            }
+        }
+
+        return $namedRange;
+    }
+
     /**
      * Create array from a range of cells.
      *
-     * @param string $pNamedRange Name of the Named Range
+     * @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 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
-     *
-     * @throws Exception
-     *
-     * @return array
+     *                             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($pNamedRange, $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
-        $namedRange = NamedRange::resolveRange($pNamedRange, $this);
+    public function namedRangeToArray(
+        string $definedName,
+        $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
+        $retVal = [];
+        $namedRange = $this->validateNamedRange($definedName);
         if ($namedRange !== null) {
-            $pWorkSheet = $namedRange->getWorksheet();
-            $pCellRange = $namedRange->getRange();
-
-            return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+            $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);
+            }
         }
 
-        throw new Exception('Named Range ' . $pNamedRange . ' does not exist.');
+        return $retVal;
     }
 
     /**
@@ -2638,12 +3192,17 @@ class Worksheet implements IComparable
      * @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
+     *                             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($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
+    public function toArray(
+        $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
         // Garbage collect...
         $this->garbageCollect();
 
@@ -2652,7 +3211,7 @@ class Worksheet implements IComparable
         $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);
     }
 
     /**
@@ -2708,9 +3267,9 @@ class Worksheet implements IComparable
 
         // Cache values
         if ($highestColumn < 1) {
-            $this->cachedHighestColumn = 'A';
+            $this->cachedHighestColumn = 1;
         } else {
-            $this->cachedHighestColumn = Coordinate::stringFromColumnIndex($highestColumn);
+            $this->cachedHighestColumn = $highestColumn;
         }
         $this->cachedHighestRow = $highestRow;
 
@@ -2737,61 +3296,68 @@ class Worksheet implements IComparable
      * 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
      */
-    public static function extractSheetTitle($pRange, $returnRange = false)
+    public static function extractSheetTitle($range, $returnRange = false)
     {
+        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'
+     * @param string $cellCoordinate Cell coordinate to get hyperlink for, eg: 'A1'
      *
      * @return Hyperlink
      */
-    public function getHyperlink($pCellCoordinate)
+    public function getHyperlink($cellCoordinate)
     {
         // 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 null|Hyperlink $pHyperlink
+     * @param string $cellCoordinate Cell coordinate to insert hyperlink, eg: 'A1'
      *
      * @return $this
      */
-    public function setHyperlink($pCellCoordinate, Hyperlink $pHyperlink = null)
+    public function setHyperlink($cellCoordinate, ?Hyperlink $hyperlink = null)
     {
-        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;
@@ -2800,13 +3366,13 @@ class Worksheet implements IComparable
     /**
      * Hyperlink at a specific coordinate exists?
      *
-     * @param string $pCoordinate eg: 'A1'
+     * @param string $coordinate eg: 'A1'
      *
      * @return bool
      */
-    public function hyperlinkExists($pCoordinate)
+    public function hyperlinkExists($coordinate)
     {
-        return isset($this->hyperlinkCollection[$pCoordinate]);
+        return isset($this->hyperlinkCollection[$coordinate]);
     }
 
     /**
@@ -2822,37 +3388,36 @@ class Worksheet implements IComparable
     /**
      * Get data validation.
      *
-     * @param string $pCellCoordinate Cell coordinate to get data validation for, eg: 'A1'
+     * @param string $cellCoordinate Cell coordinate to get data validation for, eg: 'A1'
      *
      * @return DataValidation
      */
-    public function getDataValidation($pCellCoordinate)
+    public function getDataValidation($cellCoordinate)
     {
         // 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 null|DataValidation $pDataValidation
+     * @param string $cellCoordinate Cell coordinate to insert data validation, eg: 'A1'
      *
      * @return $this
      */
-    public function setDataValidation($pCellCoordinate, DataValidation $pDataValidation = null)
+    public function setDataValidation($cellCoordinate, ?DataValidation $dataValidation = null)
     {
-        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;
@@ -2861,13 +3426,13 @@ class Worksheet implements IComparable
     /**
      * Data validation at a specific coordinate exists?
      *
-     * @param string $pCoordinate eg: 'A1'
+     * @param string $coordinate eg: 'A1'
      *
      * @return bool
      */
-    public function dataValidationExists($pCoordinate)
+    public function dataValidationExists($coordinate)
     {
-        return isset($this->dataValidationCollection[$pCoordinate]);
+        return isset($this->dataValidationCollection[$coordinate]);
     }
 
     /**
@@ -2938,7 +3503,6 @@ class Worksheet implements IComparable
     public function resetTabColor()
     {
         $this->tabColor = null;
-        unset($this->tabColor);
 
         return $this;
     }
@@ -2963,11 +3527,72 @@ class Worksheet implements IComparable
         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 $e) {
+            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 $e) {
+            return true;
+        }
+
+        return $column->isEmpty($definitionOfEmptyFlags);
+    }
+
     /**
      * 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 ($key == 'parent') {
                 continue;
@@ -3000,59 +3625,57 @@ class Worksheet implements IComparable
     /**
      * 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.
      *
-     * @throws Exception
-     *
      * @return $this
      */
-    public function setCodeName($pValue, $validate = true)
+    public function setCodeName($codeName, $validate = true)
     {
         // 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;
     }
@@ -3076,4 +3699,9 @@ class Worksheet implements IComparable
     {
         return $this->codeName !== null;
     }
+
+    public static function nameRequiresQuotes(string $sheetName): bool
+    {
+        return preg_match(self::SHEET_NAME_REQUIRES_NO_QUOTES, $sheetName) !== 1;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
index f13150d7e..f903e93ae 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
@@ -6,7 +6,7 @@ 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;.
+     * Identifies whether the Writer should write definitions for any charts that exist in the PhpSpreadsheet object.
      *
      * @var bool
      */
@@ -35,14 +35,24 @@ abstract class BaseWriter implements IWriter
      */
     private $diskCachingDirectory = './';
 
+    /**
+     * @var resource
+     */
+    protected $fileHandle;
+
+    /**
+     * @var bool
+     */
+    private $shouldCloseFile;
+
     public function getIncludeCharts()
     {
         return $this->includeCharts;
     }
 
-    public function setIncludeCharts($pValue)
+    public function setIncludeCharts($includeCharts)
     {
-        $this->includeCharts = (bool) $pValue;
+        $this->includeCharts = (bool) $includeCharts;
 
         return $this;
     }
@@ -52,9 +62,9 @@ abstract class BaseWriter implements IWriter
         return $this->preCalculateFormulas;
     }
 
-    public function setPreCalculateFormulas($pValue)
+    public function setPreCalculateFormulas($precalculateFormulas)
     {
-        $this->preCalculateFormulas = (bool) $pValue;
+        $this->preCalculateFormulas = (bool) $precalculateFormulas;
 
         return $this;
     }
@@ -64,15 +74,15 @@ abstract class BaseWriter implements IWriter
         return $this->useDiskCaching;
     }
 
-    public function setUseDiskCaching($pValue, $pDirectory = null)
+    public function setUseDiskCaching($useDiskCache, $cacheDirectory = null)
     {
-        $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");
             }
         }
 
@@ -83,4 +93,56 @@ abstract class BaseWriter implements IWriter
     {
         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.
+     *
+     * @param resource|string $filename
+     */
+    public function openFileHandle($filename): void
+    {
+        if (is_resource($filename)) {
+            $this->fileHandle = $filename;
+            $this->shouldCloseFile = false;
+
+            return;
+        }
+
+        $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.');
+        }
+
+        $this->fileHandle = $fileHandle;
+        $this->shouldCloseFile = true;
+    }
+
+    /**
+     * Close file handle only if we opened it ourselves.
+     */
+    protected function maybeCloseFileHandle(): void
+    {
+        if ($this->shouldCloseFile) {
+            if (!fclose($this->fileHandle)) {
+                throw new Exception('Could not close file after writing.');
+            }
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
index 1166bd25b..8f0ceda35 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
@@ -43,7 +43,7 @@ class Csv extends BaseWriter
     private $sheetIndex = 0;
 
     /**
-     * Whether to write a BOM (for UTF8).
+     * Whether to write a UTF8 BOM.
      *
      * @var bool
      */
@@ -65,9 +65,14 @@ class Csv extends BaseWriter
     private $excelCompatibility = false;
 
     /**
-     * Create a new CSV.
+     * Output encoding.
      *
-     * @param Spreadsheet $spreadsheet Spreadsheet object
+     * @var string
+     */
+    private $outputEncoding = '';
+
+    /**
+     * Create a new CSV.
      */
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -77,12 +82,12 @@ class Csv extends BaseWriter
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param string $pFilename
-     *
-     * @throws Exception
+     * @param resource|string $filename
      */
-    public function save($pFilename)
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+
         // Fetch sheet
         $sheet = $this->spreadsheet->getSheet($this->sheetIndex);
 
@@ -92,10 +97,7 @@ class Csv extends BaseWriter
         Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
 
         // Open file
-        $fileHandle = fopen($pFilename, 'wb+');
-        if ($fileHandle === false) {
-            throw new Exception("Could not open file $pFilename for writing.");
-        }
+        $this->openFileHandle($filename);
 
         if ($this->excelCompatibility) {
             $this->setUseBOM(true); //  Enforce UTF-8 BOM Header
@@ -104,13 +106,15 @@ class Csv extends BaseWriter
             $this->setDelimiter(';'); //  Set delimiter to a semi-colon
             $this->setLineEnding("\r\n");
         }
+
         if ($this->useBOM) {
             // Write the UTF-8 BOM code if required
-            fwrite($fileHandle, "\xEF\xBB\xBF");
+            fwrite($this->fileHandle, "\xEF\xBB\xBF");
         }
+
         if ($this->includeSeparatorLine) {
             // Write the separator line if required
-            fwrite($fileHandle, 'sep=' . $this->getDelimiter() . $this->lineEnding);
+            fwrite($this->fileHandle, 'sep=' . $this->getDelimiter() . $this->lineEnding);
         }
 
         //    Identify the range that we need to extract from the worksheet
@@ -122,145 +126,90 @@ class Csv extends BaseWriter
             // Convert the row to an array...
             $cellsArray = $sheet->rangeToArray('A' . $row . ':' . $maxCol . $row, '', $this->preCalculateFormulas);
             // ... and write to the file
-            $this->writeLine($fileHandle, $cellsArray[0]);
+            $this->writeLine($this->fileHandle, $cellsArray[0]);
         }
 
-        // Close file
-        fclose($fileHandle);
-
+        $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
     {
-        if ($pValue == '') {
-            $pValue = null;
-        }
-        $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;
     }
@@ -268,75 +217,110 @@ class Csv extends BaseWriter
     /**
      * 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;
     }
 
+    public function getOutputEncoding(): string
+    {
+        return $this->outputEncoding;
+    }
+
+    public function setOutputEncoding(string $outputEnconding): self
+    {
+        $this->outputEncoding = $outputEnconding;
+
+        return $this;
+    }
+
+    /** @var bool */
+    private $enclosureRequired = true;
+
+    public function setEnclosureRequired(bool $value): self
+    {
+        $this->enclosureRequired = $value;
+
+        return $this;
+    }
+
+    public function getEnclosureRequired(): bool
+    {
+        return $this->enclosureRequired;
+    }
+
+    /**
+     * Convert boolean to TRUE/FALSE; otherwise return element cast to string.
+     *
+     * @param mixed $element
+     */
+    private static function elementToString($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)
+    private function writeLine($fileHandle, array $values): void
     {
         // No leading delimiter
-        $writeDelimiter = false;
+        $delimiter = '';
 
         // Build the line
         $line = '';
 
-        foreach ($pValues as $element) {
-            // Escape enclosures
-            $element = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $element);
-
+        foreach ($values as $element) {
+            $element = self::elementToString($element);
             // Add delimiter
-            if ($writeDelimiter) {
-                $line .= $this->delimiter;
-            } else {
-                $writeDelimiter = true;
+            $line .= $delimiter;
+            $delimiter = $this->delimiter;
+            // Escape enclosures
+            $enclosure = $this->enclosure;
+            if ($enclosure) {
+                // If enclosure is not required, use enclosure only if
+                // element contains newline, delimiter, or enclosure.
+                if (!$this->enclosureRequired && strpbrk($element, "$delimiter$enclosure\n") === false) {
+                    $enclosure = '';
+                } else {
+                    $element = str_replace($enclosure, $enclosure . $enclosure, $element);
+                }
             }
-
             // Add enclosed string
-            $line .= $this->enclosure . $element . $this->enclosure;
+            $line .= $enclosure . $element . $enclosure;
         }
 
         // Add line ending
         $line .= $this->lineEnding;
 
         // Write to file
-        fwrite($pFileHandle, $line);
+        if ($this->outputEncoding != '') {
+            $line = mb_convert_encoding($line, $this->outputEncoding);
+        }
+        fwrite($fileHandle, /** @scrutinizer ignore-type */ $line);
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
index 37d68e912..66a0ec89b 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
@@ -2,12 +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\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;
@@ -22,8 +26,8 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
 class Html extends BaseWriter
 {
@@ -37,7 +41,7 @@ class Html extends BaseWriter
     /**
      * Sheet index to write.
      *
-     * @var int
+     * @var null|int
      */
     private $sheetIndex = 0;
 
@@ -53,7 +57,7 @@ class Html extends BaseWriter
      *
      * @var bool
      */
-    private $embedImages = false;
+    protected $embedImages = false;
 
     /**
      * Use inline CSS?
@@ -125,6 +129,13 @@ class Html extends BaseWriter
      */
     protected $isPdf = false;
 
+    /**
+     * Is the current writer creating mPDF?
+     *
+     * @var bool
+     */
+    protected $isMPdf = false;
+
     /**
      * Generate the Navigation block.
      *
@@ -133,9 +144,14 @@ class Html extends BaseWriter
     private $generateSheetNavigationBlock = true;
 
     /**
-     * Create a new HTML.
+     * Callback for editing generated html.
      *
-     * @param Spreadsheet $spreadsheet
+     * @var null|callable
+     */
+    private $editHtmlCallback;
+
+    /**
+     * Create a new HTML.
      */
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -146,11 +162,28 @@ class Html extends BaseWriter
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename
-     *
-     * @throws WriterException
+     * @param resource|string $filename
      */
-    public function save($pFilename)
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // Open file
+        $this->openFileHandle($filename);
+
+        // Write html
+        fwrite($this->fileHandle, $this->generateHTMLAll());
+
+        // Close file
+        $this->maybeCloseFileHandle();
+    }
+
+    /**
+     * Save Spreadsheet as html to variable.
+     *
+     * @return string
+     */
+    public function generateHtmlAll()
     {
         // garbage collect
         $this->spreadsheet->garbageCollect();
@@ -163,31 +196,41 @@ class Html extends BaseWriter
         // Build CSS
         $this->buildCSS(!$this->useInlineCss);
 
-        // Open file
-        $fileHandle = fopen($pFilename, 'wb+');
-        if ($fileHandle === false) {
-            throw new WriterException("Could not open file $pFilename for writing.");
-        }
+        $html = '';
 
         // Write headers
-        fwrite($fileHandle, $this->generateHTMLHeader(!$this->useInlineCss));
+        $html .= $this->generateHTMLHeader(!$this->useInlineCss);
 
         // Write navigation (tabs)
         if ((!$this->isPdf) && ($this->generateSheetNavigationBlock)) {
-            fwrite($fileHandle, $this->generateNavigation());
+            $html .= $this->generateNavigation();
         }
 
         // Write data
-        fwrite($fileHandle, $this->generateSheetData());
+        $html .= $this->generateSheetData();
 
         // Write footer
-        fwrite($fileHandle, $this->generateHTMLFooter());
-
-        // Close file
-        fclose($fileHandle);
+        $html .= $this->generateHTMLFooter();
+        $callback = $this->editHtmlCallback;
+        if ($callback) {
+            $html = $callback($html);
+        }
 
         Calculation::setArrayReturnType($saveArrayReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+        return $html;
+    }
+
+    /**
+     * 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 setEditHtmlCallback(?callable $callback): void
+    {
+        $this->editHtmlCallback = $callback;
     }
 
     /**
@@ -199,17 +242,7 @@ class Html extends BaseWriter
      */
     private function mapVAlign($vAlign)
     {
-        switch ($vAlign) {
-            case Alignment::VERTICAL_BOTTOM:
-                return 'bottom';
-            case Alignment::VERTICAL_TOP:
-                return 'top';
-            case Alignment::VERTICAL_CENTER:
-            case Alignment::VERTICAL_JUSTIFY:
-                return 'middle';
-            default:
-                return 'baseline';
-        }
+        return Alignment::VERTICAL_ALIGNMENT_FOR_HTML[$vAlign] ?? '';
     }
 
     /**
@@ -217,77 +250,44 @@ class Html extends BaseWriter
      *
      * @param string $hAlign Horizontal alignment
      *
-     * @return false|string
+     * @return string
      */
     private function mapHAlign($hAlign)
     {
-        switch ($hAlign) {
-            case Alignment::HORIZONTAL_GENERAL:
-                return false;
-            case Alignment::HORIZONTAL_LEFT:
-                return 'left';
-            case Alignment::HORIZONTAL_RIGHT:
-                return 'right';
-            case Alignment::HORIZONTAL_CENTER:
-            case Alignment::HORIZONTAL_CENTER_CONTINUOUS:
-                return 'center';
-            case Alignment::HORIZONTAL_JUSTIFY:
-                return 'justify';
-            default:
-                return false;
-        }
+        return Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$hAlign] ?? '';
     }
 
+    const BORDER_ARR = [
+        Border::BORDER_NONE => 'none',
+        Border::BORDER_DASHDOT => '1px dashed',
+        Border::BORDER_DASHDOTDOT => '1px dotted',
+        Border::BORDER_DASHED => '1px dashed',
+        Border::BORDER_DOTTED => '1px dotted',
+        Border::BORDER_DOUBLE => '3px double',
+        Border::BORDER_HAIR => '1px solid',
+        Border::BORDER_MEDIUM => '2px solid',
+        Border::BORDER_MEDIUMDASHDOT => '2px dashed',
+        Border::BORDER_MEDIUMDASHDOTDOT => '2px dotted',
+        Border::BORDER_SLANTDASHDOT => '2px dashed',
+        Border::BORDER_THICK => '3px solid',
+    ];
+
     /**
      * Map border style.
      *
-     * @param int $borderStyle Sheet index
+     * @param int|string $borderStyle Sheet index
      *
      * @return string
      */
     private function mapBorderStyle($borderStyle)
     {
-        switch ($borderStyle) {
-            case Border::BORDER_NONE:
-                return 'none';
-            case Border::BORDER_DASHDOT:
-                return '1px dashed';
-            case Border::BORDER_DASHDOTDOT:
-                return '1px dotted';
-            case Border::BORDER_DASHED:
-                return '1px dashed';
-            case Border::BORDER_DOTTED:
-                return '1px dotted';
-            case Border::BORDER_DOUBLE:
-                return '3px double';
-            case Border::BORDER_HAIR:
-                return '1px solid';
-            case Border::BORDER_MEDIUM:
-                return '2px solid';
-            case Border::BORDER_MEDIUMDASHDOT:
-                return '2px dashed';
-            case Border::BORDER_MEDIUMDASHDOTDOT:
-                return '2px dotted';
-            case Border::BORDER_MEDIUMDASHED:
-                return '2px dashed';
-            case Border::BORDER_SLANTDASHDOT:
-                return '2px dashed';
-            case Border::BORDER_THICK:
-                return '3px solid';
-            case Border::BORDER_THIN:
-                return '1px solid';
-            default:
-                // map others to thin
-                return '1px solid';
-        }
+        return array_key_exists($borderStyle, self::BORDER_ARR) ? self::BORDER_ARR[$borderStyle] : '1px solid';
     }
 
     /**
      * Get sheet index.
-     *
-     * @return int
      */
-    public function getSheetIndex()
+    public function getSheetIndex(): ?int
     {
         return $this->sheetIndex;
     }
@@ -295,13 +295,13 @@ class Html extends BaseWriter
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex($sheetIndex)
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
@@ -319,13 +319,13 @@ class Html extends BaseWriter
     /**
      * 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($generateSheetNavigationBlock)
     {
-        $this->generateSheetNavigationBlock = (bool) $pValue;
+        $this->generateSheetNavigationBlock = (bool) $generateSheetNavigationBlock;
 
         return $this;
     }
@@ -342,84 +342,143 @@ class Html extends BaseWriter
         return $this;
     }
 
+    private static function generateMeta(?string $val, string $desc): string
+    {
+        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?
-     *
-     * @throws WriterException
+     * @param bool $includeStyles Include styles?
      *
      * @return string
      */
-    public function generateHTMLHeader($pIncludeStyles = false)
+    public function generateHTMLHeader($includeStyles = false)
     {
         // Construct HTML
         $properties = $this->spreadsheet->getProperties();
-        $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
-        $html .= '<html>' . PHP_EOL;
+        $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . PHP_EOL;
+        $html .= '<html xmlns="http://www.w3.org/1999/xhtml">' . PHP_EOL;
         $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;
-        if ($properties->getTitle() > '') {
-            $html .= '      <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
-        }
-        if ($properties->getCreator() > '') {
-            $html .= '      <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getTitle() > '') {
-            $html .= '      <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getDescription() > '') {
-            $html .= '      <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getSubject() > '') {
-            $html .= '      <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getKeywords() > '') {
-            $html .= '      <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getCategory() > '') {
-            $html .= '      <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getCompany() > '') {
-            $html .= '      <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
-        }
-        if ($properties->getManager() > '') {
-            $html .= '      <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . 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(), Settings::htmlEntityFlags()) . '</title>' . PHP_EOL;
+        $html .= self::generateMeta($properties->getCreator(), 'author');
+        $html .= self::generateMeta($properties->getTitle(), 'title');
+        $html .= self::generateMeta($properties->getDescription(), 'description');
+        $html .= self::generateMeta($properties->getSubject(), 'subject');
+        $html .= self::generateMeta($properties->getKeywords(), 'keywords');
+        $html .= self::generateMeta($properties->getCategory(), 'category');
+        $html .= self::generateMeta($properties->getCompany(), 'company');
+        $html .= self::generateMeta($properties->getManager(), 'manager');
+        $html .= self::generateMeta($properties->getLastModifiedBy(), 'lastModifiedBy');
+        $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");
+            }
         }
 
-        if ($pIncludeStyles) {
-            $html .= $this->generateStyles(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(): array
+    {
+        // Ensure that Spans have been calculated?
+        $this->calculateSpans();
+
+        // Fetch sheets
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets = [$this->spreadsheet->getSheet($this->sheetIndex)];
+        }
+
+        return $sheets;
+    }
+
+    private function generateSheetStarts(Worksheet $sheet, int $rowMin): array
+    {
+        // calculate start of <tbody>, <thead>
+        $tbodyStart = $rowMin;
+        $theadStart = $theadEnd = 0; // default: no <thead>    no </thead>
+        if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
+
+            // we can only support repeating rows that start at top row
+            if ($rowsToRepeatAtTop[0] == 1) {
+                $theadStart = $rowsToRepeatAtTop[0];
+                $theadEnd = $rowsToRepeatAtTop[1];
+                $tbodyStart = $rowsToRepeatAtTop[1] + 1;
+            }
+        }
+
+        return [$theadStart, $theadEnd, $tbodyStart];
+    }
+
+    private function generateSheetTags(int $row, int $theadStart, int $theadEnd, int $tbodyStart): array
+    {
+        // <thead> ?
+        $startTag = ($row == $theadStart) ? ('        <thead>' . PHP_EOL) : '';
+        if (!$startTag) {
+            $startTag = ($row == $tbodyStart) ? ('        <tbody>' . PHP_EOL) : '';
+        }
+        $endTag = ($row == $theadEnd) ? ('        </thead>' . PHP_EOL) : '';
+        $cellType = ($row >= $tbodyStart) ? 'td' : 'th';
+
+        return [$cellType, $startTag, $endTag];
+    }
+
     /**
      * Generate sheet data.
      *
-     * @throws WriterException
-     *
      * @return string
      */
     public function generateSheetData()
     {
-        // Ensure that Spans have been calculated?
-        if ($this->sheetIndex !== null || !$this->spansAreCalculated) {
-            $this->calculateSpans();
-        }
-
-        // Fetch sheets
-        $sheets = [];
-        if ($this->sheetIndex === null) {
-            $sheets = $this->spreadsheet->getAllSheets();
-        } else {
-            $sheets[] = $this->spreadsheet->getSheet($this->sheetIndex);
-        }
+        $sheets = $this->generateSheetPrep();
 
         // Construct HTML
         $html = '';
@@ -431,80 +490,43 @@ class Html extends BaseWriter
             $html .= $this->generateTableHeader($sheet);
 
             // Get worksheet dimension
-            $dimension = explode(':', $sheet->calculateWorksheetDimension());
-            $dimension[0] = Coordinate::coordinateFromString($dimension[0]);
-            $dimension[0][0] = Coordinate::columnIndexFromString($dimension[0][0]);
-            $dimension[1] = Coordinate::coordinateFromString($dimension[1]);
-            $dimension[1][0] = Coordinate::columnIndexFromString($dimension[1][0]);
+            [$min, $max] = explode(':', $sheet->calculateWorksheetDataDimension());
+            [$minCol, $minRow] = Coordinate::indexesFromString($min);
+            [$maxCol, $maxRow] = Coordinate::indexesFromString($max);
 
-            // row min,max
-            $rowMin = $dimension[0][1];
-            $rowMax = $dimension[1][1];
-
-            // calculate start of <tbody>, <thead>
-            $tbodyStart = $rowMin;
-            $theadStart = $theadEnd = 0; // default: no <thead>    no </thead>
-            if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-                $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
-
-                // we can only support repeating rows that start at top row
-                if ($rowsToRepeatAtTop[0] == 1) {
-                    $theadStart = $rowsToRepeatAtTop[0];
-                    $theadEnd = $rowsToRepeatAtTop[1];
-                    $tbodyStart = $rowsToRepeatAtTop[1] + 1;
-                }
-            }
+            [$theadStart, $theadEnd, $tbodyStart] = $this->generateSheetStarts($sheet, $minRow);
 
             // Loop through cells
-            $row = $rowMin - 1;
-            while ($row++ < $rowMax) {
-                // <thead> ?
-                if ($row == $theadStart) {
-                    $html .= '        <thead>' . PHP_EOL;
-                    $cellType = 'th';
-                }
-
-                // <tbody> ?
-                if ($row == $tbodyStart) {
-                    $html .= '        <tbody>' . PHP_EOL;
-                    $cellType = 'td';
-                }
+            $row = $minRow - 1;
+            while ($row++ < $maxRow) {
+                [$cellType, $startTag, $endTag] = $this->generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart);
+                $html .= $startTag;
 
                 // Write row if there are HTML table cells in it
                 if (!isset($this->isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
                     // Start a new rowData
                     $rowData = [];
                     // Loop through columns
-                    $column = $dimension[0][0];
-                    while ($column <= $dimension[1][0]) {
+                    $column = $minCol;
+                    while ($column <= $maxCol) {
                         // Cell exists?
-                        if ($sheet->cellExistsByColumnAndRow($column, $row)) {
-                            $rowData[$column] = Coordinate::stringFromColumnIndex($column) . $row;
-                        } else {
-                            $rowData[$column] = '';
-                        }
-                        ++$column;
+                        $cellAddress = Coordinate::stringFromColumnIndex($column) . $row;
+                        $rowData[$column++] = ($sheet->getCellCollection()->has($cellAddress)) ? $cellAddress : '';
                     }
                     $html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType);
                 }
 
-                // </thead> ?
-                if ($row == $theadEnd) {
-                    $html .= '        </thead>' . PHP_EOL;
-                }
+                $html .= $endTag;
             }
+            --$row;
             $html .= $this->extendRowsForChartsAndImages($sheet, $row);
 
-            // Close table body.
-            $html .= '        </tbody>' . PHP_EOL;
-
             // Write table footer
             $html .= $this->generateTableFooter();
-
             // Writing PDF?
-            if ($this->isPdf) {
+            if ($this->isPdf && $this->useInlineCss) {
                 if ($this->sheetIndex === null && $sheetId + 1 < $this->spreadsheet->getSheetCount()) {
-                    $html .= '<div style="page-break-before:always" />';
+                    $html .= '<div style="page-break-before:always" ></div>';
                 }
             }
 
@@ -518,8 +540,6 @@ class Html extends BaseWriter
     /**
      * Generate sheet tabs.
      *
-     * @throws WriterException
-     *
      * @return string
      */
     public function generateNavigation()
@@ -553,13 +573,24 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function extendRowsForChartsAndImages(Worksheet $pSheet, $row)
+    /**
+     * 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.
+     *
+     * @param int $row Row to check for charts
+     *
+     * @return array
+     */
+    private function extendRowsForCharts(Worksheet $worksheet, int $row)
     {
         $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]);
@@ -573,122 +604,144 @@ class Html extends BaseWriter
             }
         }
 
-        foreach ($pSheet->getDrawingCollection() as $drawing) {
-            if ($drawing instanceof Drawing) {
-                $imageTL = Coordinate::coordinateFromString($drawing->getCoordinates());
-                $imageCol = Coordinate::columnIndexFromString($imageTL[0]);
-                if ($imageTL[1] > $rowMax) {
-                    $rowMax = $imageTL[1];
-                    if ($imageCol > Coordinate::columnIndexFromString($colMax)) {
-                        $colMax = $imageTL[0];
-                    }
+        return [$rowMax, $colMax, $anyfound];
+    }
+
+    private function extendRowsForChartsAndImages(Worksheet $worksheet, int $row): string
+    {
+        [$rowMax, $colMax, $anyfound] = $this->extendRowsForCharts($worksheet, $row);
+
+        foreach ($worksheet->getDrawingCollection() as $drawing) {
+            if ($drawing instanceof Drawing && $drawing->getPath() === '') {
+                continue;
+            }
+            $anyfound = true;
+            $imageTL = Coordinate::coordinateFromString($drawing->getCoordinates());
+            $imageCol = Coordinate::columnIndexFromString($imageTL[0]);
+            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) {
+        if ($row === $rowMax || !$anyfound) {
             return '';
         }
 
         $html = '';
         ++$colMax;
-
+        ++$row;
         while ($row <= $rowMax) {
             $html .= '<tr>';
             for ($col = 'A'; $col != $colMax; ++$col) {
-                $html .= '<td>';
-                $html .= $this->writeImageInCell($pSheet, $col . $row);
-                if ($this->includeCharts) {
-                    $html .= $this->writeChartInCell($pSheet, $col . $row);
+                $htmlx = $this->writeImageInCell($worksheet, $col . $row);
+                $htmlx .= $this->includeCharts ? $this->writeChartInCell($worksheet, $col . $row) : '';
+                if ($htmlx) {
+                    $html .= "<td class='style0' style='position: relative;'>$htmlx</td>";
+                } else {
+                    $html .= "<td class='style0'></td>";
                 }
-                $html .= '</td>';
             }
             ++$row;
-            $html .= '</tr>';
+            $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, bool $mpdf = false)
+    {
+        // Windows filename
+        if (substr($filename, 1, 2) === ':\\') {
+            $protocol = $mpdf ? '' : 'file:///';
+            $filename = $protocol . str_replace('\\', '/', $filename);
+        }
+
+        return $filename;
+    }
+
     /**
      * Generate image tag in cell.
      *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
+     * @param Worksheet $worksheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
      * @param string $coordinates Cell coordinates
      *
      * @return string
      */
-    private function writeImageInCell(Worksheet $pSheet, $coordinates)
+    private function writeImageInCell(Worksheet $worksheet, $coordinates)
     {
         // Construct HTML
         $html = '';
 
         // Write images
-        foreach ($pSheet->getDrawingCollection() as $drawing) {
-            if ($drawing instanceof Drawing) {
-                if ($drawing->getCoordinates() == $coordinates) {
-                    $filename = $drawing->getPath();
+        foreach ($worksheet->getDrawingCollection() as $drawing) {
+            if ($drawing->getCoordinates() != $coordinates) {
+                continue;
+            }
+            $filedesc = $drawing->getDescription();
+            $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded image';
+            if ($drawing instanceof Drawing && $drawing->getPath() !== '') {
+                $filename = $drawing->getPath();
 
-                    // Strip off eventual '.'
-                    if (substr($filename, 0, 1) == '.') {
-                        $filename = substr($filename, 1);
-                    }
+                // Strip off eventual '.'
+                $filename = (string) preg_replace('/^[.]/', '', $filename);
 
-                    // Prepend images root
-                    $filename = $this->getImagesRoot() . $filename;
+                // Prepend images root
+                $filename = $this->getImagesRoot() . $filename;
 
-                    // Strip off eventual '.'
-                    if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') {
-                        $filename = substr($filename, 1);
-                    }
+                // Strip off eventual '.' if followed by non-/
+                $filename = (string) preg_replace('@^[.]([^/])@', '$1', $filename);
 
-                    // Convert UTF8 data to PCDATA
-                    $filename = htmlspecialchars($filename);
+                // Convert UTF8 data to PCDATA
+                $filename = htmlspecialchars($filename, Settings::htmlEntityFlags());
 
-                    $html .= PHP_EOL;
-                    if ((!$this->embedImages) || ($this->isPdf)) {
-                        $imageData = $filename;
-                    } else {
-                        $imageDetails = getimagesize($filename);
-                        if ($fp = fopen($filename, 'rb', 0)) {
-                            $picture = '';
-                            while (!feof($fp)) {
-                                $picture .= fread($fp, 1024);
-                            }
-                            fclose($fp);
-                            // base64 encode the binary data, then break it
-                            // into chunks according to RFC 2045 semantics
-                            $base64 = chunk_split(base64_encode($picture));
-                            $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
-                        } else {
-                            $imageData = $filename;
+                $html .= PHP_EOL;
+                $imageData = self::winFileToUrl($filename, $this->isMPdf);
+
+                if ($this->embedImages || substr($imageData, 0, 6) === 'zip://') {
+                    $imageData = 'data:,';
+                    $picture = @file_get_contents($filename);
+                    if ($picture !== false) {
+                        $mimeContentType = (string) @mime_content_type($filename);
+                        if (substr($mimeContentType, 0, 6) === 'image/') {
+                            // base64 encode the binary data
+                            $base64 = base64_encode($picture);
+                            $imageData = 'data:' . $mimeContentType . ';base64,' . $base64;
                         }
                     }
-
-                    $html .= '<div style="position: relative;">';
-                    $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 . '" border="0" />';
-                    $html .= '</div>';
                 }
+
+                $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) {
-                if ($drawing->getCoordinates() != $coordinates) {
-                    continue;
+                $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 = (string) ob_get_contents(); //  Instead, output above is saved to $contents
+                    ob_end_clean(); //  End the output buffer.
+
+                    $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
+                    //  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;left: ' .
+                    $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px;position: absolute; z-index: 1;" />';
                 }
-                ob_start(); //  Let's start output buffering.
-                imagepng($drawing->getImageResource()); //  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
-                ob_end_clean(); //  End the output buffer.
-
-                $dataUri = 'data:image/jpeg;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
-                //  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 src="' . $dataUri . '" style="max-width:100%;width:' . $drawing->getWidth() . 'px;" />';
             }
         }
 
@@ -697,43 +750,37 @@ class Html extends BaseWriter
 
     /**
      * Generate chart tag in cell.
-     *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-     * @param string $coordinates Cell coordinates
-     *
-     * @return string
+     * This code should be exercised by sample:
+     * Chart/32_Chart_read_write_PDF.php.
      */
-    private function writeChartInCell(Worksheet $pSheet, $coordinates)
+    private function writeChartInCell(Worksheet $worksheet, string $coordinates): string
     {
         // Construct HTML
         $html = '';
 
         // Write charts
-        foreach ($pSheet->getChartCollection() as $chart) {
+        foreach ($worksheet->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;
+                        return '';
                     }
 
                     $html .= PHP_EOL;
-                    $imageDetails = getimagesize($chartFileName);
-                    if ($fp = fopen($chartFileName, 'rb', 0)) {
-                        $picture = fread($fp, filesize($chartFileName));
-                        fclose($fp);
-                        // base64 encode the binary data, then break it
-                        // into chunks according to RFC 2045 semantics
-                        $base64 = chunk_split(base64_encode($picture));
+                    $imageDetails = getimagesize($chartFileName) ?: [];
+                    $filedesc = $chart->getTitle();
+                    $filedesc = $filedesc ? $filedesc->getCaptionText() : '';
+                    $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded chart';
+                    $picture = file_get_contents($chartFileName);
+                    if ($picture !== false) {
+                        $base64 = base64_encode($picture);
                         $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
 
-                        $html .= '<div style="position: relative;">';
-                        $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 . '" border="0" />' . PHP_EOL;
-                        $html .= '</div>';
-
-                        unlink($chartFileName);
+                        $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);
                 }
             }
         }
@@ -747,8 +794,6 @@ class Html extends BaseWriter
      *
      * @param bool $generateSurroundingHTML Generate surrounding HTML tags? (&lt;style&gt; and &lt;/style&gt;)
      *
-     * @throws WriterException
-     *
      * @return string
      */
     public function generateStyles($generateSurroundingHTML = true)
@@ -762,7 +807,7 @@ class Html extends BaseWriter
         // Start styles
         if ($generateSurroundingHTML) {
             $html .= '    <style type="text/css">' . PHP_EOL;
-            $html .= '      html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL;
+            $html .= (array_key_exists('html', $css)) ? ('      html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL) : '';
         }
 
         // Write all other styles
@@ -771,6 +816,7 @@ class Html extends BaseWriter
                 $html .= '      ' . $styleName . ' { ' . $this->assembleCSS($styleDefinition) . ' }' . PHP_EOL;
             }
         }
+        $html .= $this->generatePageDeclarations(false);
 
         // End styles
         if ($generateSurroundingHTML) {
@@ -781,13 +827,87 @@ class Html extends BaseWriter
         return $html;
     }
 
+    private function buildCssRowHeights(Worksheet $sheet, array &$css, int $sheetIndex): void
+    {
+        // Calculate row heights
+        foreach ($sheet->getRowDimensions() as $rowDimension) {
+            $row = $rowDimension->getRowIndex() - 1;
+
+            // table.sheetN tr.rowYYYYYY { }
+            $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = [];
+
+            if ($rowDimension->getRowHeight() != -1) {
+                $pt_height = $rowDimension->getRowHeight();
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
+            }
+            if ($rowDimension->getVisible() === false) {
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
+            }
+        }
+    }
+
+    private function buildCssPerSheet(Worksheet $sheet, array &$css): void
+    {
+        // Calculate hash code
+        $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';
+        }
+
+        // Build styles
+        // Calculate column widths
+        $sheet->calculateColumnWidths();
+
+        // col elements, initialize
+        $highestColumnIndex = Coordinate::columnIndexFromString($sheet->getHighestColumn()) - 1;
+        $column = -1;
+        while ($column++ < $highestColumnIndex) {
+            $this->columnWidths[$sheetIndex][$column] = 42; // approximation
+            $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
+        }
+
+        // col elements, loop through columnDimensions and set width
+        foreach ($sheet->getColumnDimensions() as $columnDimension) {
+            $column = Coordinate::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
+            $width = SharedDrawing::cellDimensionToPixels($columnDimension->getWidth(), $this->defaultFont);
+            $width = SharedDrawing::pixelsToPoints($width);
+            if ($columnDimension->getVisible() === false) {
+                $css['table.sheet' . $sheetIndex . ' .column' . $column]['display'] = 'none';
+            }
+            if ($width >= 0) {
+                $this->columnWidths[$sheetIndex][$column] = $width;
+                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
+            }
+        }
+
+        // Default row height
+        $rowDimension = $sheet->getDefaultRowDimension();
+
+        // table.sheetN tr { }
+        $css['table.sheet' . $sheetIndex . ' tr'] = [];
+
+        if ($rowDimension->getRowHeight() == -1) {
+            $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
+        } else {
+            $pt_height = $rowDimension->getRowHeight();
+        }
+        $css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
+        if ($rowDimension->getVisible() === false) {
+            $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none';
+            $css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
+        }
+
+        $this->buildCssRowHeights($sheet, $css, $sheetIndex);
+    }
+
     /**
      * Build CSS styles.
      *
      * @param bool $generateSurroundingHTML Generate surrounding HTML style? (html { })
      *
-     * @throws WriterException
-     *
      * @return array
      */
     public function buildCSS($generateSurroundingHTML = true)
@@ -798,9 +918,7 @@ class Html extends BaseWriter
         }
 
         // Ensure that spans have been calculated
-        if (!$this->spansAreCalculated) {
-            $this->calculateSpans();
-        }
+        $this->calculateSpans();
 
         // Construct CSS
         $css = [];
@@ -834,13 +952,6 @@ class Html extends BaseWriter
 
         // table { }
         $css['table']['border-collapse'] = 'collapse';
-        if (!$this->isPdf) {
-            $css['table']['page-break-after'] = 'always';
-        }
-
-        // .gridlines td { }
-        $css['.gridlines td']['border'] = '1px dotted black';
-        $css['.gridlines th']['border'] = '1px dotted black';
 
         // .b {}
         $css['.b']['text-align'] = 'center'; // BOOL
@@ -862,8 +973,8 @@ class Html extends BaseWriter
 
         // 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
@@ -876,71 +987,7 @@ class Html extends BaseWriter
 
         // Build styles per sheet
         foreach ($sheets as $sheet) {
-            // Calculate hash code
-            $sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-            // Build styles
-            // Calculate column widths
-            $sheet->calculateColumnWidths();
-
-            // col elements, initialize
-            $highestColumnIndex = Coordinate::columnIndexFromString($sheet->getHighestColumn()) - 1;
-            $column = -1;
-            while ($column++ < $highestColumnIndex) {
-                $this->columnWidths[$sheetIndex][$column] = 42; // approximation
-                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
-            }
-
-            // col elements, loop through columnDimensions and set width
-            foreach ($sheet->getColumnDimensions() as $columnDimension) {
-                if (($width = SharedDrawing::cellDimensionToPixels($columnDimension->getWidth(), $this->defaultFont)) >= 0) {
-                    $width = SharedDrawing::pixelsToPoints($width);
-                    $column = Coordinate::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
-                    $this->columnWidths[$sheetIndex][$column] = $width;
-                    $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
-
-                    if ($columnDimension->getVisible() === false) {
-                        $css['table.sheet' . $sheetIndex . ' .column' . $column]['visibility'] = 'collapse';
-                        $css['table.sheet' . $sheetIndex . ' .column' . $column]['display'] = 'none'; // target IE6+7
-                    }
-                }
-            }
-
-            // Default row height
-            $rowDimension = $sheet->getDefaultRowDimension();
-
-            // table.sheetN tr { }
-            $css['table.sheet' . $sheetIndex . ' tr'] = [];
-
-            if ($rowDimension->getRowHeight() == -1) {
-                $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
-            } else {
-                $pt_height = $rowDimension->getRowHeight();
-            }
-            $css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
-            if ($rowDimension->getVisible() === false) {
-                $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none';
-                $css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
-            }
-
-            // Calculate row heights
-            foreach ($sheet->getRowDimensions() as $rowDimension) {
-                $row = $rowDimension->getRowIndex() - 1;
-
-                // table.sheetN tr.rowYYYYYY { }
-                $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = [];
-
-                if ($rowDimension->getRowHeight() == -1) {
-                    $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
-                } else {
-                    $pt_height = $rowDimension->getRowHeight();
-                }
-                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
-                if ($rowDimension->getVisible() === false) {
-                    $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
-                    $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
-                }
-            }
+            $this->buildCssPerSheet($sheet, $css);
         }
 
         // Cache
@@ -955,39 +1002,47 @@ class Html extends BaseWriter
     /**
      * Create CSS style.
      *
-     * @param Style $pStyle
-     *
      * @return array
      */
-    private function createCSSStyle(Style $pStyle)
+    private function createCSSStyle(Style $style)
     {
         // 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
+     * Create CSS style.
      *
      * @return array
      */
-    private function createCSSStyleAlignment(Alignment $pStyle)
+    private function createCSSStyleAlignment(Alignment $alignment)
     {
         // Construct CSS
         $css = [];
 
         // Create CSS
-        $css['vertical-align'] = $this->mapVAlign($pStyle->getVertical());
-        if ($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->isMPdf) {
+                $css['text-rotate'] = "$rotation";
+            } else {
+                $css['transform'] = "rotate({$rotation}deg)";
             }
         }
 
@@ -995,91 +1050,89 @@ class Html extends BaseWriter
     }
 
     /**
-     * Create CSS style (\PhpOffice\PhpSpreadsheet\Style\Font).
-     *
-     * @param Font $pStyle
+     * Create CSS style.
      *
      * @return array
      */
-    private function createCSSStyleFont(Font $pStyle)
+    private function createCSSStyleFont(Font $font)
     {
         // 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).
+     * Create CSS style.
      *
-     * @param Borders $pStyle Borders
+     * @param Borders $borders Borders
      *
      * @return array
      */
-    private function createCSSStyleBorders(Borders $pStyle)
+    private function createCSSStyleBorders(Borders $borders)
     {
         // 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());
+        $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());
 
         return $css;
     }
 
     /**
-     * Create CSS style (Border).
+     * Create CSS style.
      *
-     * @param Border $pStyle Border
-     *
-     * @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 == 'none') ? '' : ' !important');
     }
 
     /**
      * Create CSS style (Fill).
      *
-     * @param Fill $pStyle Fill
+     * @param Fill $fill Fill
      *
      * @return array
      */
-    private function createCSSStyleFill(Fill $pStyle)
+    private function createCSSStyleFill(Fill $fill)
     {
         // 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;
     }
@@ -1087,7 +1140,7 @@ class Html extends BaseWriter
     /**
      * Generate HTML footer.
      */
-    public function generateHTMLFooter()
+    public function generateHTMLFooter(): string
     {
         // Construct HTML
         $html = '';
@@ -1097,49 +1150,70 @@ class Html extends BaseWriter
         return $html;
     }
 
+    private function generateTableTagInline(Worksheet $worksheet, string $id): string
+    {
+        $style = isset($this->cssStyles['table']) ?
+            $this->assembleCSS($this->cssStyles['table']) : '';
+
+        $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) {
+            $html = "    <table border='0' cellpadding='0' $id cellspacing='0' style='$style' class='gridlines'>" . PHP_EOL;
+        } elseif ($prntgrid) {
+            $html = "    <table border='0' cellpadding='0' $id cellspacing='0' style='$style' class='gridlinesp'>" . PHP_EOL;
+        } else {
+            $html = "    <table border='0' cellpadding='1' $id cellspacing='0' style='$style'>" . PHP_EOL;
+        }
+
+        return $html;
+    }
+
+    private function generateTableTag(Worksheet $worksheet, string $id, string &$html, int $sheetIndex): void
+    {
+        if (!$this->useInlineCss) {
+            $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($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)
+    private function generateTableHeader(Worksheet $worksheet, $showid = true)
     {
-        $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
 
         // Construct HTML
         $html = '';
-        if ($this->useEmbeddedCSS) {
-            $html .= $this->setMargins($pSheet);
-        }
-
-        if (!$this->useInlineCss) {
-            $gridlines = $pSheet->getShowGridlines() ? ' gridlines' : '';
-            $html .= '    <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+        $id = $showid ? "id='sheet$sheetIndex'" : '';
+        if ($showid) {
+            $html .= "<div style='page: page$sheetIndex'>" . PHP_EOL;
         } else {
-            $style = isset($this->cssStyles['table']) ?
-                $this->assembleCSS($this->cssStyles['table']) : '';
-
-            if ($this->isPdf && $pSheet->getShowGridlines()) {
-                $html .= '    <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="1" style="' . $style . '">' . PHP_EOL;
-            } else {
-                $html .= '    <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
-            }
+            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>" . PHP_EOL;
         }
 
+        $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->isPdf) {
-                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]) : '';
-                    $html .= '        <col style="' . $style . '">' . PHP_EOL;
-                }
+            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]) : '';
+                $html .= '        <col style="' . $style . '" />' . PHP_EOL;
             }
         }
 
@@ -1149,251 +1223,334 @@ class Html extends BaseWriter
     /**
      * Generate table footer.
      */
-    private function generateTableFooter()
+    private function generateTableFooter(): string
     {
-        return '    </table>' . PHP_EOL;
+        return '    </tbody></table>' . PHP_EOL . '</div>' . PHP_EOL;
     }
 
     /**
-     * Generate row.
+     * Generate row start.
      *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-     * @param array $pValues Array containing cells in a row
-     * @param int $pRow Row number (0-based)
-     * @param string $cellType eg: 'td'
-     *
-     * @throws WriterException
+     * @param int $sheetIndex Sheet index (0-based)
+     * @param int $row row number
      *
      * @return string
      */
-    private function generateRow(Worksheet $pSheet, array $pValues, $pRow, $cellType)
+    private function generateRowStart(Worksheet $worksheet, $sheetIndex, $row)
     {
-        // Construct HTML
         $html = '';
-
-        // Sheet index
-        $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-
-        // Dompdf and breaks
-        if ($this->isPdf && 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();
-
-                // insert page break
-                $html .= '<div style="page-break-before:always" />';
+                if ($this->isPdf && $this->useInlineCss) {
+                    $html .= '<div style="page-break-before:always" />';
+                }
 
                 // open table again: <table> + <col> etc.
-                $html .= $this->generateTableHeader($pSheet);
+                $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;
         }
 
+        return $html;
+    }
+
+    private function generateRowCellCss(Worksheet $worksheet, string $cellAddress, int $row, int $columnNumber): array
+    {
+        $cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
+        $coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
+        if (!$this->useInlineCss) {
+            $cssClass = 'column' . $columnNumber;
+        } else {
+            $cssClass = [];
+            // The statements below do nothing.
+            // Commenting out the code rather than deleting it
+            // in case someone can figure out what their intent was.
+            //if ($cellType == 'th') {
+            //    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
+            //        $this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
+            //    }
+            //} else {
+            //    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
+            //        $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
+            //    }
+            //}
+            // End of mystery statements.
+        }
+
+        return [$cell, $cssClass, $coordinate];
+    }
+
+    private function generateRowCellDataValueRich(Cell $cell, string &$cellData): void
+    {
+        // Loop through rich text elements
+        $elements = $cell->getValue()->getRichTextElements();
+        foreach ($elements as $element) {
+            // Rich text start?
+            if ($element instanceof Run) {
+                $cellEnd = '';
+                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>';
+                    }
+                }
+
+                // Convert UTF8 data to PCDATA
+                $cellText = $element->getText();
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
+
+                $cellData .= $cellEnd;
+
+                $cellData .= '</span>';
+            } else {
+                // Convert UTF8 data to PCDATA
+                $cellText = $element->getText();
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
+            }
+        }
+    }
+
+    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, string &$cellData): void
+    {
+        if ($cell->getValue() instanceof RichText) {
+            $this->generateRowCellDataValueRich($cell, $cellData);
+        } else {
+            $origData = $this->preCalculateFormulas ? $cell->getCalculatedValue() : $cell->getValue();
+            $formatCode = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
+
+            $cellData = NumberFormat::toFormattedString(
+                $origData ?? '',
+                $formatCode ?? NumberFormat::FORMAT_GENERAL,
+                [$this, 'formatColor']
+            );
+
+            if ($cellData === $origData) {
+                $cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
+            }
+            if ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
+                $cellData = '<sup>' . $cellData . '</sup>';
+            } elseif ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
+                $cellData = '<sub>' . $cellData . '</sub>';
+            }
+        }
+    }
+
+    /**
+     * @param null|Cell|string $cell
+     * @param array|string $cssClass
+     */
+    private function generateRowCellData(Worksheet $worksheet, $cell, &$cssClass, string $cellType): string
+    {
+        $cellData = '&nbsp;';
+        if ($cell instanceof Cell) {
+            $cellData = '';
+            // Don't know what this does, and no test cases.
+            //if ($cell->getParent() === null) {
+            //    $cell->attach($worksheet);
+            //}
+            // Value
+            $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 = (string) preg_replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
+
+            // convert newline "\n" to '<br>'
+            $cellData = nl2br($cellData);
+
+            // Extend CSS class?
+            if (!$this->useInlineCss && is_string($cssClass)) {
+                $cssClass .= ' style' . $cell->getXfIndex();
+                $cssClass .= ' ' . $cell->getDataType();
+            } elseif (is_array($cssClass)) {
+                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()]);
+                    }
+                }
+
+                // General horizontal alignment: Actual horizontal alignment depends on dataType
+                $sharedStyle = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex());
+                if (
+                    $sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
+                    && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
+                ) {
+                    $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
+                }
+            }
+        } else {
+            // Use default borders for empty cell
+            if (is_string($cssClass)) {
+                $cssClass .= ' style0';
+            }
+        }
+
+        return $cellData;
+    }
+
+    private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
+    {
+        return $this->includeCharts ? $this->writeChartInCell($worksheet, $coordinate) : '';
+    }
+
+    private function generateRowSpans(string $html, int $rowSpan, int $colSpan): string
+    {
+        $html .= ($colSpan > 1) ? (' colspan="' . $colSpan . '"') : '';
+        $html .= ($rowSpan > 1) ? (' rowspan="' . $rowSpan . '"') : '';
+
+        return $html;
+    }
+
+    /**
+     * @param array|string $cssClass
+     */
+    private function generateRowWriteCell(string &$html, Worksheet $worksheet, string $coordinate, string $cellType, string $cellData, int $colSpan, int $rowSpan, $cssClass, int $colNum, int $sheetIndex, int $row): void
+    {
+        // Image?
+        $htmlx = $this->writeImageInCell($worksheet, $coordinate);
+        // Chart?
+        $htmlx .= $this->generateRowIncludeCharts($worksheet, $coordinate);
+        // Column start
+        $html .= '            <' . $cellType;
+        if (!$this->useInlineCss && !$this->isPdf && is_string($cssClass)) {
+            $html .= ' class="' . $cssClass . '"';
+            if ($htmlx) {
+                $html .= " style='position: relative;'";
+            }
+        } else {
+            //** Necessary redundant code for the sake of \PhpOffice\PhpSpreadsheet\Writer\Pdf **
+            // 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 = is_array($cssClass) ? $cssClass : [];
+            } else {
+                if (is_string($cssClass)) {
+                    $html .= ' class="' . $cssClass . '"';
+                }
+                $xcssClass = [];
+            }
+            $width = 0;
+            $i = $colNum - 1;
+            $e = $colNum + $colSpan - 1;
+            while ($i++ < $e) {
+                if (isset($this->columnWidths[$sheetIndex][$i])) {
+                    $width += $this->columnWidths[$sheetIndex][$i];
+                }
+            }
+            $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' . $row]['height'])) {
+                $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'];
+                $xcssClass['height'] = $height;
+            }
+            //** end of redundant code **
+
+            if ($htmlx) {
+                $xcssClass['position'] = 'relative';
+            }
+            $html .= ' style="' . $this->assembleCSS($xcssClass) . '"';
+        }
+        $html = $this->generateRowSpans($html, $rowSpan, $colSpan);
+
+        $html .= '>';
+        $html .= $htmlx;
+
+        $html .= $this->writeComment($worksheet, $coordinate);
+
+        // Cell data
+        $html .= $cellData;
+
+        // Column end
+        $html .= '</' . $cellType . '>' . PHP_EOL;
+    }
+
+    /**
+     * Generate row.
+     *
+     * @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 $worksheet, array $values, $row, $cellType)
+    {
+        // Sheet index
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
+        $html = $this->generateRowStart($worksheet, $sheetIndex, $row);
+        $generateDiv = $this->isMPdf && $worksheet->getRowDimension($row + 1)->getVisible() === false;
+        if ($generateDiv) {
+            $html .= '<div style="visibility:hidden; display:none;">' . PHP_EOL;
+        }
+
         // Write cells
         $colNum = 0;
-        foreach ($pValues as $cellAddress) {
-            $cell = ($cellAddress > '') ? $pSheet->getCell($cellAddress) : '';
-            $coordinate = Coordinate::stringFromColumnIndex($colNum + 1) . ($pRow + 1);
-            if (!$this->useInlineCss) {
-                $cssClass = 'column' . $colNum;
-            } else {
-                $cssClass = [];
-                if ($cellType == 'th') {
-                    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
-                        $this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
-                    }
-                } else {
-                    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
-                        $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
-                    }
-                }
-            }
-            $colSpan = 1;
-            $rowSpan = 1;
+        foreach ($values as $cellAddress) {
+            [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum);
 
-            // initialize
-            $cellData = '&nbsp;';
-
-            // Cell
-            if ($cell instanceof Cell) {
-                $cellData = '';
-                if ($cell->getParent() === null) {
-                    $cell->attach($pSheet);
-                }
-                // Value
-                if ($cell->getValue() instanceof RichText) {
-                    // Loop through rich text elements
-                    $elements = $cell->getValue()->getRichTextElements();
-                    foreach ($elements as $element) {
-                        // Rich text start?
-                        if ($element instanceof Run) {
-                            $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
-
-                            if ($element->getFont()->getSuperscript()) {
-                                $cellData .= '<sup>';
-                            } elseif ($element->getFont()->getSubscript()) {
-                                $cellData .= '<sub>';
-                            }
-                        }
-
-                        // Convert UTF8 data to PCDATA
-                        $cellText = $element->getText();
-                        $cellData .= htmlspecialchars($cellText);
-
-                        if ($element instanceof Run) {
-                            if ($element->getFont()->getSuperscript()) {
-                                $cellData .= '</sup>';
-                            } elseif ($element->getFont()->getSubscript()) {
-                                $cellData .= '</sub>';
-                            }
-
-                            $cellData .= '</span>';
-                        }
-                    }
-                } else {
-                    if ($this->preCalculateFormulas) {
-                        $cellData = NumberFormat::toFormattedString(
-                            $cell->getCalculatedValue(),
-                            $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
-                            [$this, 'formatColor']
-                        );
-                    } else {
-                        $cellData = NumberFormat::toFormattedString(
-                            $cell->getValue(),
-                            $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
-                            [$this, 'formatColor']
-                        );
-                    }
-                    $cellData = htmlspecialchars($cellData);
-                    if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
-                        $cellData = '<sup>' . $cellData . '</sup>';
-                    } elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
-                        $cellData = '<sub>' . $cellData . '</sub>';
-                    }
-                }
-
-                // 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);
-
-                // convert newline "\n" to '<br>'
-                $cellData = nl2br($cellData);
-
-                // Extend CSS class?
-                if (!$this->useInlineCss) {
-                    $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()]);
-                        }
-                    }
-
-                    // General horizontal alignment: Actual horizontal alignment depends on dataType
-                    $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
-                    if ($sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
-                        && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
-                    ) {
-                        $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
-                    }
-                }
-            }
+            // Cell Data
+            $cellData = $this->generateRowCellData($worksheet, $cell, $cssClass, $cellType);
 
             // Hyperlink?
-            if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-                $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
+            if ($worksheet->hyperlinkExists($coordinate) && !$worksheet->getHyperlink($coordinate)->isInternal()) {
+                $url = $worksheet->getHyperlink($coordinate)->getUrl();
+                $urldecode = strtolower(html_entity_decode(trim($url), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, '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();
                 }
             }
 
             // Write
             if ($writeCell) {
-                // Column start
-                $html .= '            <' . $cellType;
-                if (!$this->useInlineCss) {
-                    $html .= ' class="' . $cssClass . '"';
-                } else {
-                    //** Necessary redundant code for the sake of \PhpOffice\PhpSpreadsheet\Writer\Pdf **
-                    // We must explicitly write the width of the <td> element because TCPDF
-                    // does not recognize e.g. <col style="width:42pt">
-                    $width = 0;
-                    $i = $colNum - 1;
-                    $e = $colNum + $colSpan - 1;
-                    while ($i++ < $e) {
-                        if (isset($this->columnWidths[$sheetIndex][$i])) {
-                            $width += $this->columnWidths[$sheetIndex][$i];
-                        }
-                    }
-                    $cssClass['width'] = $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'];
-                        $cssClass['height'] = $height;
-                    }
-                    //** end of redundant code **
-
-                    $html .= ' style="' . $this->assembleCSS($cssClass) . '"';
-                }
-                if ($colSpan > 1) {
-                    $html .= ' colspan="' . $colSpan . '"';
-                }
-                if ($rowSpan > 1) {
-                    $html .= ' rowspan="' . $rowSpan . '"';
-                }
-                $html .= '>';
-
-                $html .= $this->writeComment($pSheet, $coordinate);
-
-                // Image?
-                $html .= $this->writeImageInCell($pSheet, $coordinate);
-
-                // Chart?
-                if ($this->includeCharts) {
-                    $html .= $this->writeChartInCell($pSheet, $coordinate);
-                }
-
-                // Cell data
-                $html .= $cellData;
-
-                // Column end
-                $html .= '</' . $cellType . '>' . PHP_EOL;
+                $this->generateRowWriteCell($html, $worksheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $row);
             }
 
             // Next column
@@ -1401,6 +1558,9 @@ class Html extends BaseWriter
         }
 
         // Write row end
+        if ($generateDiv) {
+            $html .= '</div>' . PHP_EOL;
+        }
         $html .= '          </tr>' . PHP_EOL;
 
         // Return
@@ -1410,14 +1570,12 @@ class Html extends BaseWriter
     /**
      * Takes array where of CSS properties / values and converts to CSS string.
      *
-     * @param array $pValue
-     *
      * @return string
      */
-    private function assembleCSS(array $pValue = [])
+    private function assembleCSS(array $values = [])
     {
         $pairs = [];
-        foreach ($pValue as $property => $value) {
+        foreach ($values as $property => $value) {
             $pairs[] = $property . ':' . $value;
         }
         $string = implode('; ', $pairs);
@@ -1438,13 +1596,13 @@ class Html extends BaseWriter
     /**
      * Set images root.
      *
-     * @param string $pValue
+     * @param string $imagesRoot
      *
      * @return $this
      */
-    public function setImagesRoot($pValue)
+    public function setImagesRoot($imagesRoot)
     {
-        $this->imagesRoot = $pValue;
+        $this->imagesRoot = $imagesRoot;
 
         return $this;
     }
@@ -1462,13 +1620,13 @@ class Html extends BaseWriter
     /**
      * Set embed images.
      *
-     * @param bool $pValue
+     * @param bool $embedImages
      *
      * @return $this
      */
-    public function setEmbedImages($pValue)
+    public function setEmbedImages($embedImages)
     {
-        $this->embedImages = $pValue;
+        $this->embedImages = $embedImages;
 
         return $this;
     }
@@ -1486,13 +1644,13 @@ class Html extends BaseWriter
     /**
      * Set use inline CSS?
      *
-     * @param bool $pValue
+     * @param bool $useInlineCss
      *
      * @return $this
      */
-    public function setUseInlineCss($pValue)
+    public function setUseInlineCss($useInlineCss)
     {
-        $this->useInlineCss = $pValue;
+        $this->useInlineCss = $useInlineCss;
 
         return $this;
     }
@@ -1501,6 +1659,10 @@ class Html extends BaseWriter
      * Get use embedded CSS?
      *
      * @return bool
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated no longer used
      */
     public function getUseEmbeddedCSS()
     {
@@ -1510,13 +1672,17 @@ class Html extends BaseWriter
     /**
      * Set use embedded CSS?
      *
-     * @param bool $pValue
+     * @param bool $useEmbeddedCSS
      *
      * @return $this
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated no longer used
      */
-    public function setUseEmbeddedCSS($pValue)
+    public function setUseEmbeddedCSS($useEmbeddedCSS)
     {
-        $this->useEmbeddedCSS = $pValue;
+        $this->useEmbeddedCSS = $useEmbeddedCSS;
 
         return $this;
     }
@@ -1524,39 +1690,42 @@ class Html extends BaseWriter
     /**
      * Add color to formatted string as inline style.
      *
-     * @param string $pValue Plain formatted value without color
-     * @param string $pFormat Format code
+     * @param string $value Plain formatted value without color
+     * @param string $format Format code
      *
      * @return string
      */
-    public function formatColor($pValue, $pFormat)
+    public function formatColor($value, $format)
     {
         // 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;
     }
 
     /**
      * Calculate information about HTML colspan and rowspan which is not always the same as Excel's.
      */
-    private function calculateSpans()
+    private function calculateSpans(): void
     {
+        if ($this->spansAreCalculated) {
+            return;
+        }
         // 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
@@ -1574,11 +1743,11 @@ class Html extends BaseWriter
                 $first = $cells[0];
                 $last = $cells[1];
 
-                [$fc, $fr] = Coordinate::coordinateFromString($first);
-                $fc = Coordinate::columnIndexFromString($fc) - 1;
+                [$fc, $fr] = Coordinate::indexesFromString($first);
+                $fc = $fc - 1;
 
-                [$lc, $lr] = Coordinate::coordinateFromString($last);
-                $lc = Coordinate::columnIndexFromString($lc) - 1;
+                [$lc, $lr] = Coordinate::indexesFromString($last);
+                $lc = $lc - 1;
 
                 // loop through the individual cells in the individual merge
                 $r = $fr - 1;
@@ -1606,34 +1775,7 @@ class Html extends BaseWriter
                 }
             }
 
-            // 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.
-            $countColumns = Coordinate::columnIndexFromString($sheet->getHighestColumn());
-            foreach ($candidateSpannedRow as $rowIndex) {
-                if (isset($this->isSpannedCell[$sheetIndex][$rowIndex])) {
-                    if (count($this->isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
-                        $this->isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
-                    }
-                }
-            }
-
-            // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
-            if (isset($this->isSpannedRow[$sheetIndex])) {
-                foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
-                    $adjustedBaseCells = [];
-                    $c = -1;
-                    $e = $countColumns - 1;
-                    while ($c++ < $e) {
-                        $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
-
-                        if (!in_array($baseCell, $adjustedBaseCells)) {
-                            // subtract rowspan by 1
-                            --$this->isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
-                            $adjustedBaseCells[] = $baseCell;
-                        }
-                    }
-                }
-            }
+            $this->calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRow);
 
             // TODO: Same for columns
         }
@@ -1642,28 +1784,36 @@ class Html extends BaseWriter
         $this->spansAreCalculated = true;
     }
 
-    private function setMargins(Worksheet $pSheet)
+    private function calculateSpansOmitRows(Worksheet $sheet, int $sheetIndex, array $candidateSpannedRow): void
     {
-        $htmlPage = '@page { ';
-        $htmlBody = 'body { ';
+        // 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.
+        $countColumns = Coordinate::columnIndexFromString($sheet->getHighestColumn());
+        foreach ($candidateSpannedRow as $rowIndex) {
+            if (isset($this->isSpannedCell[$sheetIndex][$rowIndex])) {
+                if (count($this->isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
+                    $this->isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
+                }
+            }
+        }
 
-        $left = StringHelper::formatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
-        $htmlPage .= 'margin-left: ' . $left;
-        $htmlBody .= 'margin-left: ' . $left;
-        $right = StringHelper::formatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
-        $htmlPage .= 'margin-right: ' . $right;
-        $htmlBody .= 'margin-right: ' . $right;
-        $top = StringHelper::formatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
-        $htmlPage .= 'margin-top: ' . $top;
-        $htmlBody .= 'margin-top: ' . $top;
-        $bottom = StringHelper::formatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
-        $htmlPage .= 'margin-bottom: ' . $bottom;
-        $htmlBody .= 'margin-bottom: ' . $bottom;
+        // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
+        if (isset($this->isSpannedRow[$sheetIndex])) {
+            foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
+                $adjustedBaseCells = [];
+                $c = -1;
+                $e = $countColumns - 1;
+                while ($c++ < $e) {
+                    $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
 
-        $htmlPage .= "}\n";
-        $htmlBody .= "}\n";
-
-        return "<style>\n" . $htmlPage . $htmlBody . "</style>\n";
+                    if (!in_array($baseCell, $adjustedBaseCells, true)) {
+                        // subtract rowspan by 1
+                        --$this->isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
+                        $adjustedBaseCells[] = $baseCell;
+                    }
+                }
+            }
+        }
     }
 
     /**
@@ -1671,20 +1821,99 @@ class Html extends BaseWriter
      *
      * @see https://github.com/LibreOffice/core/blob/9fc9bf3240f8c62ad7859947ab8a033ac1fe93fa/sc/source/filter/html/htmlexp.cxx#L1073-L1092
      *
-     * @param Worksheet $pSheet
      * @param string $coordinate
      *
      * @return string
      */
-    private function writeComment(Worksheet $pSheet, $coordinate)
+    private function writeComment(Worksheet $worksheet, $coordinate)
     {
         $result = '';
-        if (!$this->isPdf && isset($pSheet->getComments()[$coordinate])) {
-            $result .= '<a class="comment-indicator"></a>';
-            $result .= '<div class="comment">' . nl2br($pSheet->getComment($coordinate)->getText()->getPlainText()) . '</div>';
-            $result .= PHP_EOL;
+        if (!$this->isPdf && isset($worksheet->getComments()[$coordinate])) {
+            $sanitizer = new HTMLPurifier();
+            $cachePath = File::sysGetTempDir() . '/phpsppur';
+            if (is_dir($cachePath) || mkdir($cachePath)) {
+                $sanitizer->config->set('Cache.SerializerPath', $cachePath);
+            }
+            $sanitizedString = $sanitizer->purify($worksheet->getComment($coordinate)->getText()->getPlainText());
+            if ($sanitizedString !== '') {
+                $result .= '<a class="comment-indicator"></a>';
+                $result .= '<div class="comment">' . nl2br($sanitizedString) . '</div>';
+                $result .= PHP_EOL;
+            }
         }
 
         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)
+    {
+        // Ensure that Spans have been calculated?
+        $this->calculateSpans();
+
+        // Fetch sheets
+        $sheets = [];
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets[] = $this->spreadsheet->getSheet($this->sheetIndex);
+        }
+
+        // Construct HTML
+        $htmlPage = $generateSurroundingHTML ? ('<style type="text/css">' . PHP_EOL) : '';
+
+        // Loop all sheets
+        $sheetId = 0;
+        foreach ($sheets as $worksheet) {
+            $htmlPage .= "@page page$sheetId { ";
+            $left = StringHelper::formatNumber($worksheet->getPageMargins()->getLeft()) . 'in; ';
+            $htmlPage .= 'margin-left: ' . $left;
+            $right = StringHelper::FormatNumber($worksheet->getPageMargins()->getRight()) . 'in; ';
+            $htmlPage .= 'margin-right: ' . $right;
+            $top = StringHelper::FormatNumber($worksheet->getPageMargins()->getTop()) . 'in; ';
+            $htmlPage .= 'margin-top: ' . $top;
+            $bottom = StringHelper::FormatNumber($worksheet->getPageMargins()->getBottom()) . 'in; ';
+            $htmlPage .= 'margin-bottom: ' . $bottom;
+            $orientation = $this->getOrientation() ?? $worksheet->getPageSetup()->getOrientation();
+            if ($orientation === PageSetup::ORIENTATION_LANDSCAPE) {
+                $htmlPage .= 'size: landscape; ';
+            } elseif ($orientation === PageSetup::ORIENTATION_PORTRAIT) {
+                $htmlPage .= 'size: portrait; ';
+            }
+            $htmlPage .= '}' . PHP_EOL;
+            ++$sheetId;
+        }
+        $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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
index 448b532fc..a4bd5d522 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
@@ -6,10 +6,14 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 interface IWriter
 {
+    public const SAVE_WITH_CHARTS = 1;
+
+    public const DISABLE_PRECALCULATE_FORMULAE = 2;
+
     /**
      * IWriter constructor.
      *
-     * @param Spreadsheet $spreadsheet
+     * @param Spreadsheet $spreadsheet The spreadsheet that we want to save using this Writer
      */
     public function __construct(Spreadsheet $spreadsheet);
 
@@ -27,11 +31,11 @@ interface IWriter
      *        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
+     * @param bool $includeCharts
      *
      * @return IWriter
      */
-    public function setIncludeCharts($pValue);
+    public function setIncludeCharts($includeCharts);
 
     /**
      * Get Pre-Calculate Formulas flag
@@ -50,20 +54,23 @@ interface IWriter
      *        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
      */
-    public function setPreCalculateFormulas($pValue);
+    public function setPreCalculateFormulas($precalculateFormulas);
 
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param 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 \PhpOffice\PhpSpreadsheet\Writer\Exception
+     * @throws Exception
      */
-    public function save($pFilename);
+    public function save($filename, int $flags = 0): void;
 
     /**
      * Get use disk caching where possible?
@@ -75,14 +82,12 @@ interface IWriter
     /**
      * Set use disk caching where possible?
      *
-     * @param bool $pValue
-     * @param string $pDirectory Disk caching directory
-     *
-     * @throws Exception when directory does not exist
+     * @param bool $useDiskCache
+     * @param string $cacheDirectory Disk caching directory
      *
      * @return IWriter
      */
-    public function setUseDiskCaching($pValue, $pDirectory = null);
+    public function setUseDiskCaching($useDiskCache, $cacheDirectory = null);
 
     /**
      * Get disk caching directory.
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
index 43659fa08..c9e0ba839 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer;
 
-use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Content;
@@ -12,17 +11,11 @@ use PhpOffice\PhpSpreadsheet\Writer\Ods\Mimetype;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Settings;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Styles;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Thumbnails;
-use ZipArchive;
+use ZipStream\Exception\OverflowException;
+use ZipStream\ZipStream;
 
 class Ods extends BaseWriter
 {
-    /**
-     * Private writer parts.
-     *
-     * @var Ods\WriterPart[]
-     */
-    private $writerParts = [];
-
     /**
      * Private PhpSpreadsheet.
      *
@@ -30,136 +23,151 @@ class Ods extends BaseWriter
      */
     private $spreadSheet;
 
+    /**
+     * @var Content
+     */
+    private $writerPartContent;
+
+    /**
+     * @var Meta
+     */
+    private $writerPartMeta;
+
+    /**
+     * @var MetaInf
+     */
+    private $writerPartMetaInf;
+
+    /**
+     * @var Mimetype
+     */
+    private $writerPartMimetype;
+
+    /**
+     * @var Settings
+     */
+    private $writerPartSettings;
+
+    /**
+     * @var Styles
+     */
+    private $writerPartStyles;
+
+    /**
+     * @var Thumbnails
+     */
+    private $writerPartThumbnails;
+
     /**
      * Create a new Ods.
-     *
-     * @param Spreadsheet $spreadsheet
      */
     public function __construct(Spreadsheet $spreadsheet)
     {
         $this->setSpreadsheet($spreadsheet);
 
-        $writerPartsArray = [
-            'content' => Content::class,
-            'meta' => Meta::class,
-            'meta_inf' => MetaInf::class,
-            'mimetype' => Mimetype::class,
-            'settings' => Settings::class,
-            'styles' => Styles::class,
-            'thumbnails' => Thumbnails::class,
-        ];
-
-        foreach ($writerPartsArray as $writer => $class) {
-            $this->writerParts[$writer] = new $class($this);
-        }
+        $this->writerPartContent = new Content($this);
+        $this->writerPartMeta = new Meta($this);
+        $this->writerPartMetaInf = new MetaInf($this);
+        $this->writerPartMimetype = new Mimetype($this);
+        $this->writerPartSettings = new Settings($this);
+        $this->writerPartStyles = new Styles($this);
+        $this->writerPartThumbnails = new Thumbnails($this);
     }
 
-    /**
-     * Get writer part.
-     *
-     * @param string $pPartName Writer part name
-     *
-     * @return null|Ods\WriterPart
-     */
-    public function getWriterPart($pPartName)
+    public function getWriterPartContent(): Content
     {
-        if ($pPartName != '' && isset($this->writerParts[strtolower($pPartName)])) {
-            return $this->writerParts[strtolower($pPartName)];
-        }
+        return $this->writerPartContent;
+    }
 
-        return null;
+    public function getWriterPartMeta(): Meta
+    {
+        return $this->writerPartMeta;
+    }
+
+    public function getWriterPartMetaInf(): MetaInf
+    {
+        return $this->writerPartMetaInf;
+    }
+
+    public function getWriterPartMimetype(): Mimetype
+    {
+        return $this->writerPartMimetype;
+    }
+
+    public function getWriterPartSettings(): Settings
+    {
+        return $this->writerPartSettings;
+    }
+
+    public function getWriterPartStyles(): Styles
+    {
+        return $this->writerPartStyles;
+    }
+
+    public function getWriterPartThumbnails(): Thumbnails
+    {
+        return $this->writerPartThumbnails;
     }
 
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param string $pFilename
-     *
-     * @throws WriterException
+     * @param resource|string $filename
      */
-    public function save($pFilename)
+    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();
 
-        // If $pFilename is php://output or php://stdout, make it a temporary file...
-        $originalFilename = $pFilename;
-        if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-            $pFilename = @tempnam(File::sysGetTempDir(), 'phpxltmp');
-            if ($pFilename == '') {
-                $pFilename = $originalFilename;
-            }
-        }
+        $this->openFileHandle($filename);
 
-        $zip = $this->createZip($pFilename);
+        $zip = $this->createZip();
 
-        $zip->addFromString('META-INF/manifest.xml', $this->getWriterPart('meta_inf')->writeManifest());
-        $zip->addFromString('Thumbnails/thumbnail.png', $this->getWriterPart('thumbnails')->writeThumbnail());
-        $zip->addFromString('content.xml', $this->getWriterPart('content')->write());
-        $zip->addFromString('meta.xml', $this->getWriterPart('meta')->write());
-        $zip->addFromString('mimetype', $this->getWriterPart('mimetype')->write());
-        $zip->addFromString('settings.xml', $this->getWriterPart('settings')->write());
-        $zip->addFromString('styles.xml', $this->getWriterPart('styles')->write());
+        $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('styles.xml', $this->getWriterPartstyles()->write());
 
         // Close file
-        if ($zip->close() === false) {
-            throw new WriterException("Could not close zip file $pFilename.");
+        try {
+            $zip->finish();
+        } catch (OverflowException $e) {
+            throw new WriterException('Could not close resource.');
         }
 
-        // If a temporary file was used, copy it to the correct file stream
-        if ($originalFilename != $pFilename) {
-            if (copy($pFilename, $originalFilename) === false) {
-                throw new WriterException("Could not copy temporary zip file $pFilename to $originalFilename.");
-            }
-            @unlink($pFilename);
-        }
+        $this->maybeCloseFileHandle();
     }
 
     /**
      * Create zip object.
      *
-     * @param string $pFilename
-     *
-     * @throws WriterException
-     *
-     * @return ZipArchive
+     * @return ZipStream
      */
-    private function createZip($pFilename)
+    private function createZip()
     {
-        // Create new ZIP file and open it for writing
-        $zip = new ZipArchive();
-
-        if (file_exists($pFilename)) {
-            unlink($pFilename);
-        }
         // Try opening the ZIP file
-        if ($zip->open($pFilename, ZipArchive::OVERWRITE) !== true) {
-            if ($zip->open($pFilename, ZipArchive::CREATE) !== true) {
-                throw new WriterException("Could not open $pFilename for writing.");
-            }
+        if (!is_resource($this->fileHandle)) {
+            throw new WriterException('Could not open resource for writing.');
         }
 
-        return $zip;
+        // Create new ZIP stream
+        return ZipStream0::newZipStream($this->fileHandle);
     }
 
     /**
      * Get Spreadsheet object.
      *
-     * @throws WriterException
-     *
      * @return Spreadsheet
      */
     public function getSpreadsheet()
     {
-        if ($this->spreadSheet !== null) {
-            return $this->spreadSheet;
-        }
-
-        throw new WriterException('No PhpSpreadsheet assigned.');
+        return $this->spreadSheet;
     }
 
     /**
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
new file mode 100644
index 000000000..996ec1a54
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class AutoFilters
+{
+    /**
+     * @var XMLWriter
+     */
+    private $objWriter;
+
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    /** @var mixed */
+    private static $scrutinizerFalse = false;
+
+    public function write(): void
+    {
+        $wrapperWritten = self::$scrutinizerFalse;
+        $sheetCount = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $this->spreadsheet->getSheet($i);
+            $autofilter = $worksheet->getAutoFilter();
+            if ($autofilter !== null && !empty($autofilter->getRange())) {
+                if ($wrapperWritten === false) {
+                    $this->objWriter->startElement('table:database-ranges');
+                    $wrapperWritten = true;
+                }
+                $this->objWriter->startElement('table:database-range');
+                $this->objWriter->writeAttribute('table:orientation', 'column');
+                $this->objWriter->writeAttribute('table:display-filter-buttons', 'true');
+                $this->objWriter->writeAttribute(
+                    'table:target-range-address',
+                    $this->formatRange($worksheet, $autofilter)
+                );
+                $this->objWriter->endElement();
+            }
+        }
+
+        if ($wrapperWritten === true) {
+            $this->objWriter->endElement();
+        }
+    }
+
+    protected function formatRange(Worksheet $worksheet, Autofilter $autofilter): string
+    {
+        $title = $worksheet->getTitle();
+        $range = $autofilter->getRange();
+
+        return "'{$title}'.{$range}";
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
index 2f543be51..b0829bf1d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
@@ -6,14 +6,11 @@ use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 
 /**
- * @category   PhpSpreadsheet
- *
- * @copyright  Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
  * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
  */
 class Comment
 {
-    public static function write(XMLWriter $objWriter, Cell $cell)
+    public static function write(XMLWriter $objWriter, Cell $cell): void
     {
         $comments = $cell->getWorksheet()->getComments();
         if (!isset($comments[$cell->getCoordinate()])) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
new file mode 100644
index 000000000..4d46a5e14
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
@@ -0,0 +1,259 @@
+<?php
+
+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\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';
+
+    /** @var XMLWriter */
+    private $writer;
+
+    public function __construct(XMLWriter $writer)
+    {
+        $this->writer = $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';
+    }
+
+    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';
+    }
+
+    private function writeFillStyle(Fill $fill): void
+    {
+        switch ($fill->getFillType()) {
+            case Fill::FILL_SOLID:
+                $this->writer->writeAttribute('fo:background-color', sprintf(
+                    '#%s',
+                    strtolower($fill->getStartColor()->getRGB())
+                ));
+
+                break;
+            case Fill::FILL_GRADIENT_LINEAR:
+            case Fill::FILL_GRADIENT_PATH:
+                /// TODO :: To be implemented
+                break;
+            case Fill::FILL_NONE:
+            default:
+        }
+    }
+
+    private function writeCellProperties(CellStyle $style): void
+    {
+        // Align
+        $hAlign = $style->getAlignment()->getHorizontal();
+        $vAlign = $style->getAlignment()->getVertical();
+        $wrap = $style->getAlignment()->getWrapText();
+
+        $this->writer->startElement('style:table-cell-properties');
+        if (!empty($vAlign) || $wrap) {
+            if (!empty($vAlign)) {
+                $vAlign = $this->mapVerticalAlignment($vAlign);
+                $this->writer->writeAttribute('style:vertical-align', $vAlign);
+            }
+            if ($wrap) {
+                $this->writer->writeAttribute('fo:wrap-option', 'wrap');
+            }
+        }
+        $this->writer->writeAttribute('style:rotation-align', 'none');
+
+        // Fill
+        $this->writeFillStyle($style->getFill());
+
+        $this->writer->endElement();
+
+        if (!empty($hAlign)) {
+            $hAlign = $this->mapHorizontalAlignment($hAlign);
+            $this->writer->startElement('style:paragraph-properties');
+            $this->writer->writeAttribute('fo:text-align', $hAlign);
+            $this->writer->endElement();
+        }
+    }
+
+    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';
+    }
+
+    protected function writeTextProperties(CellStyle $style): void
+    {
+        // Font
+        $this->writer->startElement('style:text-properties');
+
+        $font = $style->getFont();
+
+        if ($font->getBold()) {
+            $this->writer->writeAttribute('fo:font-weight', 'bold');
+            $this->writer->writeAttribute('style:font-weight-complex', 'bold');
+            $this->writer->writeAttribute('style:font-weight-asian', 'bold');
+        }
+
+        if ($font->getItalic()) {
+            $this->writer->writeAttribute('fo:font-style', 'italic');
+        }
+
+        $this->writer->writeAttribute('fo:color', sprintf('#%s', $font->getColor()->getRGB()));
+
+        if ($family = $font->getName()) {
+            $this->writer->writeAttribute('fo:font-family', $family);
+        }
+
+        if ($size = $font->getSize()) {
+            $this->writer->writeAttribute('fo:font-size', sprintf('%.1Fpt', $size));
+        }
+
+        if ($font->getUnderline() && $font->getUnderline() !== Font::UNDERLINE_NONE) {
+            $this->writer->writeAttribute('style:text-underline-style', 'solid');
+            $this->writer->writeAttribute('style:text-underline-width', 'auto');
+            $this->writer->writeAttribute('style:text-underline-color', 'font-color');
+
+            $underline = $this->mapUnderlineStyle($font);
+            $this->writer->writeAttribute('style:text-underline-type', $underline);
+        }
+
+        $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');
+        $this->writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX . $style->getIndex());
+        $this->writer->writeAttribute('style:family', 'table-cell');
+        $this->writer->writeAttribute('style:parent-style-name', 'Default');
+
+        // Alignment, fill colour, etc
+        $this->writeCellProperties($style);
+
+        // style:text-properties
+        $this->writeTextProperties($style);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
index dea5100f5..e0a729ab8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -7,36 +7,41 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-use PhpOffice\PhpSpreadsheet\Style\Font;
 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;
 
 /**
- * @category   PhpSpreadsheet
- *
- * @method Ods getParentWriter
- *
- * @copyright  Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
  * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
  */
 class Content extends WriterPart
 {
     const NUMBER_COLS_REPEATED_MAX = 1024;
     const NUMBER_ROWS_REPEATED_MAX = 1048576;
-    const CELL_STYLE_PREFIX = 'ce';
+
+    /** @var Formula */
+    private $formulaConvertor;
+
+    /**
+     * Set parent Ods writer.
+     */
+    public function __construct(Ods $writer)
+    {
+        parent::__construct($writer);
+
+        $this->formulaConvertor = new Formula($this->getParentWriter()->getSpreadsheet()->getDefinedNames());
+    }
 
     /**
      * Write content.xml to XML format.
      *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function write()
+    public function write(): string
     {
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -98,7 +103,10 @@ class Content extends WriterPart
 
         $this->writeSheets($objWriter);
 
-        $objWriter->writeElement('table:named-expressions');
+        (new AutoFilters($objWriter, $this->getParentWriter()->getSpreadsheet()))->write();
+        // Defined names (ranges and formulae)
+        (new NamedExpressions($objWriter, $this->getParentWriter()->getSpreadsheet(), $this->formulaConvertor))->write();
+
         $objWriter->endElement();
         $objWriter->endElement();
         $objWriter->endElement();
@@ -108,78 +116,86 @@ class Content extends WriterPart
 
     /**
      * Write sheets.
-     *
-     * @param XMLWriter $objWriter
      */
-    private function writeSheets(XMLWriter $objWriter)
+    private function writeSheets(XMLWriter $objWriter): void
     {
-        $spreadsheet = $this->getParentWriter()->getSpreadsheet(); // @var $spreadsheet Spreadsheet
-
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet(); /** @var Spreadsheet $spreadsheet */
         $sheetCount = $spreadsheet->getSheetCount();
-        for ($i = 0; $i < $sheetCount; ++$i) {
+        for ($sheetIndex = 0; $sheetIndex < $sheetCount; ++$sheetIndex) {
             $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();
         }
     }
 
     /**
      * Write rows of the specified sheet.
-     *
-     * @param XMLWriter $objWriter
-     * @param Worksheet $sheet
      */
-    private function writeRows(XMLWriter $objWriter, Worksheet $sheet)
+    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->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.
-     *
-     * @param XMLWriter $objWriter
-     * @param Row $row
-     *
-     * @throws Exception
      */
-    private function writeCells(XMLWriter $objWriter, Row $row)
+    private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void
     {
         $numberColsRepeated = self::NUMBER_COLS_REPEATED_MAX;
         $prevColumn = -1;
-        $cells = $row->getCellIterator();
-        while ($cells->valid()) {
+        foreach ($cells as $cell) {
             /** @var \PhpOffice\PhpSpreadsheet\Cell\Cell $cell */
-            $cell = $cells->current();
             $column = Coordinate::columnIndexFromString($cell->getColumn()) - 1;
 
             $this->writeCellSpan($objWriter, $column, $prevColumn);
@@ -189,7 +205,7 @@ class Content extends WriterPart
             // Style XF
             $style = $cell->getXfIndex();
             if ($style !== null) {
-                $objWriter->writeAttribute('table:style-name', self::CELL_STYLE_PREFIX . $style);
+                $objWriter->writeAttribute('table:style-name', Style::CELL_STYLE_PREFIX . $style);
             }
 
             switch ($cell->getDataType()) {
@@ -200,7 +216,10 @@ class Content extends WriterPart
 
                     break;
                 case DataType::TYPE_ERROR:
-                    throw new Exception('Writing of error not implemented yet.');
+                    $objWriter->writeAttribute('table:formula', 'of:=#NULL!');
+                    $objWriter->writeAttribute('office:value-type', 'string');
+                    $objWriter->writeAttribute('office:string-value', '');
+                    $objWriter->writeElement('text:p', '#NULL!');
 
                     break;
                 case DataType::TYPE_FORMULA:
@@ -212,7 +231,7 @@ class Content extends WriterPart
                             // don't do anything
                         }
                     }
-                    $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue());
+                    $objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValue()));
                     if (is_numeric($formulaValue)) {
                         $objWriter->writeAttribute('office:value-type', 'float');
                     } else {
@@ -221,10 +240,6 @@ class Content extends WriterPart
                     $objWriter->writeAttribute('office:value', $formulaValue);
                     $objWriter->writeElement('text:p', $formulaValue);
 
-                    break;
-                case DataType::TYPE_INLINE:
-                    throw new Exception('Writing of inline not implemented yet.');
-
                     break;
                 case DataType::TYPE_NUMERIC:
                     $objWriter->writeAttribute('office:value-type', 'float');
@@ -232,6 +247,8 @@ class Content extends WriterPart
                     $objWriter->writeElement('text:p', $cell->getValue());
 
                     break;
+                case DataType::TYPE_INLINE:
+                    // break intentionally omitted
                 case DataType::TYPE_STRING:
                     $objWriter->writeAttribute('office:value-type', 'string');
                     $objWriter->writeElement('text:p', $cell->getValue());
@@ -241,13 +258,13 @@ class Content extends WriterPart
             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');
@@ -258,138 +275,71 @@ class Content extends WriterPart
     /**
      * Write span.
      *
-     * @param XMLWriter $objWriter
      * @param int $curColumn
      * @param int $prevColumn
      */
-    private function writeCellSpan(XMLWriter $objWriter, $curColumn, $prevColumn)
+    private function writeCellSpan(XMLWriter $objWriter, $curColumn, $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();
         }
     }
 
     /**
      * Write XF cell styles.
-     *
-     * @param XMLWriter $writer
-     * @param Spreadsheet $spreadsheet
      */
-    private function writeXfStyles(XMLWriter $writer, Spreadsheet $spreadsheet)
+    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) {
-            $writer->startElement('style:style');
-            $writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX . $style->getIndex());
-            $writer->writeAttribute('style:family', 'table-cell');
-            $writer->writeAttribute('style:parent-style-name', 'Default');
-
-            // style:text-properties
-
-            // Font
-            $writer->startElement('style:text-properties');
-
-            $font = $style->getFont();
-
-            if ($font->getBold()) {
-                $writer->writeAttribute('fo:font-weight', 'bold');
-                $writer->writeAttribute('style:font-weight-complex', 'bold');
-                $writer->writeAttribute('style:font-weight-asian', 'bold');
-            }
-
-            if ($font->getItalic()) {
-                $writer->writeAttribute('fo:font-style', 'italic');
-            }
-
-            if ($color = $font->getColor()) {
-                $writer->writeAttribute('fo:color', sprintf('#%s', $color->getRGB()));
-            }
-
-            if ($family = $font->getName()) {
-                $writer->writeAttribute('fo:font-family', $family);
-            }
-
-            if ($size = $font->getSize()) {
-                $writer->writeAttribute('fo:font-size', sprintf('%.1Fpt', $size));
-            }
-
-            if ($font->getUnderline() && $font->getUnderline() != Font::UNDERLINE_NONE) {
-                $writer->writeAttribute('style:text-underline-style', 'solid');
-                $writer->writeAttribute('style:text-underline-width', 'auto');
-                $writer->writeAttribute('style:text-underline-color', 'font-color');
-
-                switch ($font->getUnderline()) {
-                    case Font::UNDERLINE_DOUBLE:
-                        $writer->writeAttribute('style:text-underline-type', 'double');
-
-                        break;
-                    case Font::UNDERLINE_SINGLE:
-                        $writer->writeAttribute('style:text-underline-type', 'single');
-
-                        break;
-                }
-            }
-
-            $writer->endElement(); // Close style:text-properties
-
-            // style:table-cell-properties
-
-            $writer->startElement('style:table-cell-properties');
-            $writer->writeAttribute('style:rotation-align', 'none');
-
-            // Fill
-            if ($fill = $style->getFill()) {
-                switch ($fill->getFillType()) {
-                    case Fill::FILL_SOLID:
-                        $writer->writeAttribute('fo:background-color', sprintf(
-                            '#%s',
-                            strtolower($fill->getStartColor()->getRGB())
-                        ));
-
-                        break;
-                    case Fill::FILL_GRADIENT_LINEAR:
-                    case Fill::FILL_GRADIENT_PATH:
-                        /// TODO :: To be implemented
-                        break;
-                    case Fill::FILL_NONE:
-                    default:
-                }
-            }
-
-            $writer->endElement(); // Close style:table-cell-properties
-
-            // End
-
-            $writer->endElement(); // Close style:style
+            $styleWriter->write($style);
         }
     }
 
     /**
      * Write attributes for merged cell.
-     *
-     * @param XMLWriter $objWriter
-     * @param Cell $cell
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    private function writeCellMerge(XMLWriter $objWriter, Cell $cell)
+    private function writeCellMerge(XMLWriter $objWriter, Cell $cell): void
     {
         if (!$cell->isMergeRangeValueCell()) {
             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 = $end[1] - $start[1] + 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
new file mode 100644
index 000000000..cc2d2f435
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+
+class Formula
+{
+    /** @var array */
+    private $definedNames = [];
+
+    /**
+     * @param DefinedName[] $definedNames
+     */
+    public function __construct(array $definedNames)
+    {
+        foreach ($definedNames as $definedName) {
+            $this->definedNames[] = $definedName->getName();
+        }
+    }
+
+    public function convertFormula(string $formula, string $worksheetName = ''): string
+    {
+        $formula = $this->convertCellReferences($formula, $worksheetName);
+        $formula = $this->convertDefinedNames($formula);
+
+        if (substr($formula, 0, 1) !== '=') {
+            $formula = '=' . $formula;
+        }
+
+        return 'of:' . $formula;
+    }
+
+    private function convertDefinedNames(string $formula): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+        $values = array_column($splitRanges[0], 0);
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $value = $values[$splitCount];
+
+            if (in_array($value, $this->definedNames, true)) {
+                $formula = substr($formula, 0, $offset) . '$$' . $value . substr($formula, $offset + $length);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function convertCellReferences(string $formula, string $worksheetName): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        // Replace any commas in the formula with semi-colons for Ods
+        // If by chance there are commas in worksheet names, then they will be "fixed" again in the loop
+        //    because we've already extracted worksheet names with our preg_match_all()
+        $formula = str_replace(',', ';', $formula);
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($formula[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $worksheet = $worksheetName;
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "['" . str_replace("'", "''", $worksheet) . "'";
+            } elseif (substr($formula, $offset - 1, 1) !== ':') {
+                $newRange = '[';
+            }
+            $newRange .= '.';
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+            // close the wrapping [] unless this is the first part of a range
+            $newRange .= substr($formula, $offset + $length, 1) !== ':' ? ']' : '';
+
+            $formula = substr($formula, 0, $offset) . $newRange . substr($formula, $offset + $length);
+        }
+
+        return $formula;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
index ffe5eff79..16f7c8b54 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
@@ -10,17 +12,11 @@ class Meta extends WriterPart
     /**
      * Write meta.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function write(Spreadsheet $spreadsheet = null)
+    public function write(): string
     {
-        if (!$spreadsheet) {
-            $spreadsheet = $this->getParentWriter()->getSpreadsheet();
-        }
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
 
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -47,15 +43,24 @@ class Meta extends WriterPart
 
         $objWriter->writeElement('meta:initial-creator', $spreadsheet->getProperties()->getCreator());
         $objWriter->writeElement('dc:creator', $spreadsheet->getProperties()->getCreator());
-        $objWriter->writeElement('meta:creation-date', date(DATE_W3C, $spreadsheet->getProperties()->getCreated()));
-        $objWriter->writeElement('dc:date', date(DATE_W3C, $spreadsheet->getProperties()->getCreated()));
+        $created = $spreadsheet->getProperties()->getCreated();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $objWriter->writeElement('meta:creation-date', $date->format(DATE_W3C));
+        $created = $spreadsheet->getProperties()->getModified();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $objWriter->writeElement('dc:date', $date->format(DATE_W3C));
         $objWriter->writeElement('dc:title', $spreadsheet->getProperties()->getTitle());
         $objWriter->writeElement('dc:description', $spreadsheet->getProperties()->getDescription());
         $objWriter->writeElement('dc:subject', $spreadsheet->getProperties()->getSubject());
-        $keywords = explode(' ', $spreadsheet->getProperties()->getKeywords());
-        foreach ($keywords as $keyword) {
-            $objWriter->writeElement('meta:keyword', $keyword);
-        }
+        $objWriter->writeElement('meta:keyword', $spreadsheet->getProperties()->getKeywords());
+        // Don't know if this changed over time, but the keywords are all
+        //  in a single declaration now.
+        //$keywords = explode(' ', $spreadsheet->getProperties()->getKeywords());
+        //foreach ($keywords as $keyword) {
+        //    $objWriter->writeElement('meta:keyword', $keyword);
+        //}
 
         //<meta:document-statistic meta:table-count="XXX" meta:cell-count="XXX" meta:object-count="XXX"/>
         $objWriter->startElement('meta:user-defined');
@@ -68,10 +73,50 @@ class Meta extends WriterPart
         $objWriter->writeRaw($spreadsheet->getProperties()->getCategory());
         $objWriter->endElement();
 
+        self::writeDocPropsCustom($objWriter, $spreadsheet);
+
         $objWriter->endElement();
 
         $objWriter->endElement();
 
         return $objWriter->getData();
     }
+
+    private static function writeDocPropsCustom(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
+        foreach ($customPropertyList as $key => $customProperty) {
+            $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
+            $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
+
+            $objWriter->startElement('meta:user-defined');
+            $objWriter->writeAttribute('meta:name', $customProperty);
+
+            switch ($propertyType) {
+                case Properties::PROPERTY_TYPE_INTEGER:
+                case Properties::PROPERTY_TYPE_FLOAT:
+                    $objWriter->writeAttribute('meta:value-type', 'float');
+                    $objWriter->writeRawData($propertyValue);
+
+                    break;
+                case Properties::PROPERTY_TYPE_BOOLEAN:
+                    $objWriter->writeAttribute('meta:value-type', 'boolean');
+                    $objWriter->writeRawData($propertyValue ? 'true' : 'false');
+
+                    break;
+                case Properties::PROPERTY_TYPE_DATE:
+                    $objWriter->writeAttribute('meta:value-type', 'date');
+                    $dtobj = Date::dateTimeFromTimestamp($propertyValue ?? 0);
+                    $objWriter->writeRawData($dtobj->format(DATE_W3C));
+
+                    break;
+                default:
+                    $objWriter->writeRawData($propertyValue);
+
+                    break;
+            }
+
+            $objWriter->endElement();
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
index 1ec9d1eb4..f3f0d5fc9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
@@ -9,11 +9,9 @@ class MetaInf extends WriterPart
     /**
      * Write META-INF/manifest.xml to XML format.
      *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function writeManifest()
+    public function write(): string
     {
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php
index d0fed2b37..e109e6e7e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php
@@ -2,18 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-
 class Mimetype extends WriterPart
 {
     /**
      * Write mimetype to plain text format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return string XML Output
      */
-    public function write(Spreadsheet $spreadsheet = null)
+    public function write(): string
     {
         return 'application/vnd.oasis.opendocument.spreadsheet';
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
new file mode 100644
index 000000000..e309dab11
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedExpressions
+{
+    /** @var XMLWriter */
+    private $objWriter;
+
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
+    /** @var Formula */
+    private $formulaConvertor;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet, Formula $formulaConvertor)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+        $this->formulaConvertor = $formulaConvertor;
+    }
+
+    public function write(): string
+    {
+        $this->objWriter->startElement('table:named-expressions');
+        $this->writeExpressions();
+        $this->objWriter->endElement();
+
+        return '';
+    }
+
+    private function writeExpressions(): void
+    {
+        $definedNames = $this->spreadsheet->getDefinedNames();
+
+        foreach ($definedNames as $definedName) {
+            if ($definedName->isFormula()) {
+                $this->objWriter->startElement('table:named-expression');
+                $this->writeNamedFormula($definedName, $this->spreadsheet->getActiveSheet());
+            } else {
+                $this->objWriter->startElement('table:named-range');
+                $this->writeNamedRange($definedName);
+            }
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    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(), $title)
+        );
+        $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
+            $definedName,
+            "'" . $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,
+            $baseCell
+        ));
+        $this->objWriter->writeAttribute('table:cell-range-address', $this->convertAddress($definedName, $definedName->getValue()));
+    }
+
+    private function convertAddress(DefinedName $definedName, string $address): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $address,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($address[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $ws = $definedName->getWorksheet();
+                    if ($ws !== null) {
+                        $worksheet = $ws->getTitle();
+                    }
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'.";
+            }
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+
+            $address = substr($address, 0, $offset) . $newRange . substr($address, $offset + $length);
+        }
+
+        if (substr($address, 0, 1) === '=') {
+            $address = substr($address, 1);
+        }
+
+        return $address;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
index 18f7ee6d5..06445591c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
@@ -2,23 +2,21 @@
 
 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
 {
     /**
      * Write settings.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function write(Spreadsheet $spreadsheet = null)
+    public function write(): string
     {
-        $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
             $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
         } else {
@@ -41,14 +39,114 @@ class Settings extends WriterPart
         $objWriter->writeAttribute('config:name', 'ooo:view-settings');
         $objWriter->startElement('config:config-item-map-indexed');
         $objWriter->writeAttribute('config:name', 'Views');
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $objWriter->startElement('config:config-item-map-entry');
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
+
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', 'ViewId');
+        $objWriter->writeAttribute('config:type', 'string');
+        $objWriter->text('view1');
+        $objWriter->endElement(); // ViewId
+        $objWriter->startElement('config:config-item-map-named');
+
+        $this->writeAllWorksheetSettings($objWriter, $spreadsheet);
+
+        $wstitle = $spreadsheet->getActiveSheet()->getTitle();
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', 'ActiveTable');
+        $objWriter->writeAttribute('config:type', 'string');
+        $objWriter->text($wstitle);
+        $objWriter->endElement(); // config:config-item ActiveTable
+
+        $objWriter->endElement(); // config:config-item-map-entry
+        $objWriter->endElement(); // config:config-item-map-indexed Views
+        $objWriter->endElement(); // config:config-item-set ooo:view-settings
         $objWriter->startElement('config:config-item-set');
         $objWriter->writeAttribute('config:name', 'ooo:configuration-settings');
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $objWriter->endElement(); // config:config-item-set ooo:configuration-settings
+        $objWriter->endElement(); // office:settings
+        $objWriter->endElement(); // office:document-settings
 
         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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php
index eaf5cad95..448b1eff1 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php
@@ -3,20 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 class Styles extends WriterPart
 {
     /**
      * Write styles.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function write(Spreadsheet $spreadsheet = null)
+    public function write(): string
     {
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php
index a29a14adb..db9579d0c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php
@@ -2,18 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-
 class Thumbnails extends WriterPart
 {
     /**
      * Write Thumbnails/thumbnail.png to PNG format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return string XML Output
      */
-    public function writeThumbnail(Spreadsheet $spreadsheet = null)
+    public function write(): string
     {
         return '';
     }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
index 3e2f96841..17d5d1693 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
@@ -25,11 +25,11 @@ abstract class WriterPart
 
     /**
      * Set parent Ods writer.
-     *
-     * @param Ods $writer
      */
     public function __construct(Ods $writer)
     {
         $this->parentWriter = $writer;
     }
+
+    abstract public function write(): string;
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
index d91845603..493bbba3e 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
@@ -27,24 +26,17 @@ abstract class Pdf extends Html
     /**
      * Orientation (Over-ride).
      *
-     * @var string
+     * @var ?string
      */
     protected $orientation;
 
     /**
      * Paper size (Over-ride).
      *
-     * @var int
+     * @var ?int
      */
     protected $paperSize;
 
-    /**
-     * Temporary storage for Save Array Return type.
-     *
-     * @var string
-     */
-    private $saveArrayReturnType;
-
     /**
      * Paper Sizes xRef List.
      *
@@ -127,8 +119,9 @@ abstract class Pdf extends Html
     public function __construct(Spreadsheet $spreadsheet)
     {
         parent::__construct($spreadsheet);
-        $this->setUseInlineCss(true);
-        $this->tempDir = File::sysGetTempDir();
+        //$this->setUseInlineCss(true);
+        $this->tempDir = File::sysGetTempDir() . '/phpsppdf';
+        $this->isPdf = true;
     }
 
     /**
@@ -162,7 +155,7 @@ abstract class Pdf extends Html
     /**
      * Get Paper Size.
      *
-     * @return int
+     * @return ?int
      */
     public function getPaperSize()
     {
@@ -172,23 +165,21 @@ abstract class Pdf extends Html
     /**
      * Set Paper Size.
      *
-     * @param string $pValue Paper size see PageSetup::PAPERSIZE_*
+     * @param int $paperSize Paper size see PageSetup::PAPERSIZE_*
      *
      * @return self
      */
-    public function setPaperSize($pValue)
+    public function setPaperSize($paperSize)
     {
-        $this->paperSize = $pValue;
+        $this->paperSize = $paperSize;
 
         return $this;
     }
 
     /**
      * Get Orientation.
-     *
-     * @return string
      */
-    public function getOrientation()
+    public function getOrientation(): ?string
     {
         return $this->orientation;
     }
@@ -196,13 +187,13 @@ abstract class Pdf extends Html
     /**
      * Set Orientation.
      *
-     * @param string $pValue Page orientation see PageSetup::ORIENTATION_*
+     * @param string $orientation Page orientation see PageSetup::ORIENTATION_*
      *
      * @return self
      */
-    public function setOrientation($pValue)
+    public function setOrientation($orientation)
     {
-        $this->orientation = $pValue;
+        $this->orientation = $orientation;
 
         return $this;
     }
@@ -220,18 +211,16 @@ abstract class Pdf extends Html
     /**
      * Set temporary storage directory.
      *
-     * @param string $pValue Temporary storage directory
-     *
-     * @throws WriterException when directory does not exist
+     * @param string $temporaryDirectory Temporary storage directory
      *
      * @return self
      */
-    public function setTempDir($pValue)
+    public function setTempDir($temporaryDirectory)
     {
-        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;
@@ -240,44 +229,23 @@ abstract class Pdf extends Html
     /**
      * Save Spreadsheet to PDF file, pre-save.
      *
-     * @param string $pFilename Name of the file to save as
-     *
-     * @throws WriterException
+     * @param string $filename Name of the file to save as
      *
      * @return resource
      */
-    protected function prepareForSave($pFilename)
+    protected function prepareForSave($filename)
     {
-        //  garbage collect
-        $this->spreadsheet->garbageCollect();
-
-        $this->saveArrayReturnType = Calculation::getArrayReturnType();
-        Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
-
         //  Open file
-        $fileHandle = fopen($pFilename, 'w');
-        if ($fileHandle === false) {
-            throw new WriterException("Could not open file $pFilename for writing.");
-        }
+        $this->openFileHandle($filename);
 
-        //  Set PDF
-        $this->isPdf = true;
-        //  Build CSS
-        $this->buildCSS(true);
-
-        return $fileHandle;
+        return $this->fileHandle;
     }
 
     /**
      * Save PhpSpreadsheet to PDF file, post-save.
-     *
-     * @param resource $fileHandle
      */
-    protected function restoreStateAfterSave($fileHandle)
+    protected function restoreStateAfterSave(): void
     {
-        //  Close file
-        fclose($fileHandle);
-
-        Calculation::setArrayReturnType($this->saveArrayReturnType);
+        $this->maybeCloseFileHandle();
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
index 3c3044d71..690b0c54a 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -7,6 +7,13 @@ use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 class Dompdf extends Pdf
 {
+    /**
+     * embed images, or link to images.
+     *
+     * @var bool
+     */
+    protected $embedImages = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
@@ -20,59 +27,34 @@ class Dompdf extends Pdf
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename)
+    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(strtolower($paperSize), $orientation);
+        $pdf->setPaper($paperSize, $orientation);
 
-        $pdf->loadHtml(
-            $this->generateHTMLHeader(false) .
-            $this->generateSheetData() .
-            $this->generateHTMLFooter()
-        );
+        $pdf->loadHtml($this->generateHTMLAll());
         $pdf->render();
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output());
+        fwrite($fileHandle, $pdf->output() ?? '');
 
-        parent::restoreStateAfterSave($fileHandle);
+        parent::restoreStateAfterSave();
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
index fd2664a82..d0ce9ed45 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 class Mpdf extends Pdf
 {
+    /** @var bool */
+    protected $isMPdf = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
@@ -23,52 +26,24 @@ class Mpdf extends Pdf
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     * @throws PhpSpreadsheetException
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename)
+    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];
+        $config = ['tempDir' => $this->tempDir . '/mpdf'];
         $pdf = $this->createExternalWriterInstance($config);
         $ortmp = $orientation;
-        $pdf->_setPageSize(strtoupper($paperSize), $ortmp);
+        $pdf->_setPageSize($paperSize, $ortmp);
         $pdf->DefOrientation = $orientation;
         $pdf->AddPageByArray([
             'orientation' => $orientation,
@@ -85,17 +60,23 @@ class Mpdf extends Pdf
         $pdf->SetKeywords($this->spreadsheet->getProperties()->getKeywords());
         $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
 
-        $pdf->WriteHTML($this->generateHTMLHeader(false));
-        $html = $this->generateSheetData();
+        $html = $this->generateHTMLAll();
+        $bodyLocation = strpos($html, Html::BODY_LINE);
+        // Make sure first data presented to Mpdf includes body tag
+        //   so that Mpdf doesn't parse it as content. Issue 2432.
+        if ($bodyLocation !== false) {
+            $bodyLocation += strlen(Html::BODY_LINE);
+            $pdf->WriteHTML(substr($html, 0, $bodyLocation));
+            $html = substr($html, $bodyLocation);
+        }
         foreach (\array_chunk(\explode(PHP_EOL, $html), 1000) as $lines) {
             $pdf->WriteHTML(\implode(PHP_EOL, $lines));
         }
-        $pdf->WriteHTML($this->generateHTMLFooter());
 
         //  Write to file
         fwrite($fileHandle, $pdf->Output('', 'S'));
 
-        parent::restoreStateAfterSave($fileHandle);
+        parent::restoreStateAfterSave();
     }
 
     /**
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
index 8a97b8fed..aefc6b56d 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
@@ -2,17 +2,29 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 class Tcpdf extends Pdf
 {
+    /**
+     * Create a new PDF Writer instance.
+     *
+     * @param Spreadsheet $spreadsheet Spreadsheet object
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        parent::__construct($spreadsheet);
+        $this->setUseInlineCss(true);
+    }
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
      * @param string $orientation Page orientation
      * @param string $unit Unit measure
-     * @param string $paperSize Paper size
+     * @param array|string $paperSize Paper size
      *
      * @return \TCPDF implementation
      */
@@ -24,44 +36,22 @@ class Tcpdf extends Pdf
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename)
+    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);
@@ -77,11 +67,7 @@ class Tcpdf extends Pdf
 
         //  Set the appropriate font
         $pdf->SetFont($this->getFont());
-        $pdf->writeHTML(
-            $this->generateHTMLHeader(false) .
-            $this->generateSheetData() .
-            $this->generateHTMLFooter()
-        );
+        $pdf->writeHTML($this->generateHTMLAll());
 
         //  Document info
         $pdf->SetTitle($this->spreadsheet->getProperties()->getTitle());
@@ -91,8 +77,8 @@ class Tcpdf extends Pdf
         $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output($pFilename, 'S'));
+        fwrite($fileHandle, $pdf->output('', 'S'));
 
-        parent::restoreStateAfterSave($fileHandle);
+        parent::restoreStateAfterSave();
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
index 6932eb1ac..e0480a5a3 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
@@ -4,10 +4,10 @@ namespace PhpOffice\PhpSpreadsheet\Writer;
 
 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;
@@ -23,7 +23,9 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
-use RuntimeException;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Parser;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Worksheet;
 
 class Xls extends BaseWriter
 {
@@ -65,7 +67,7 @@ class Xls extends BaseWriter
     /**
      * Formula parser.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Parser
+     * @var Parser
      */
     private $parser;
 
@@ -79,24 +81,24 @@ class Xls extends BaseWriter
     /**
      * Basic OLE object summary information.
      *
-     * @var array
+     * @var string
      */
     private $summaryInformation;
 
     /**
      * Extended OLE object document summary information.
      *
-     * @var array
+     * @var string
      */
     private $documentSummaryInformation;
 
     /**
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook
+     * @var Workbook
      */
     private $writerWorkbook;
 
     /**
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Worksheet[]
+     * @var Worksheet[]
      */
     private $writerWorksheets;
 
@@ -109,18 +111,18 @@ class Xls extends BaseWriter
     {
         $this->spreadsheet = $spreadsheet;
 
-        $this->parser = new Xls\Parser();
+        $this->parser = new Xls\Parser($spreadsheet);
     }
 
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     * @param resource|string $filename
      */
-    public function save($pFilename)
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+
         // garbage collect
         $this->spreadsheet->garbageCollect();
 
@@ -159,15 +161,18 @@ class Xls extends BaseWriter
 
         // 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 +201,14 @@ class Xls extends BaseWriter
 
         $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);
         }
@@ -219,9 +224,12 @@ class Xls extends BaseWriter
             $arrRootData[] = $OLE_DocumentSummaryInformation;
         }
 
-        $root = new Root(time(), time(), $arrRootData);
+        $time = $this->spreadsheet->getProperties()->getModified();
+        $root = new Root($time, $time, $arrRootData);
         // save the OLE file
-        $root->save($pFilename);
+        $this->openFileHandle($filename);
+        $root->save($this->fileHandle);
+        $this->maybeCloseFileHandle();
 
         Functions::setReturnDateType($saveDateReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
@@ -230,7 +238,7 @@ class Xls extends BaseWriter
     /**
      * Build the Worksheet Escher objects.
      */
-    private function buildWorksheetEschers()
+    private function buildWorksheetEschers(): void
     {
         // 1-based index to BstoreContainer
         $blipIndex = 0;
@@ -239,9 +247,7 @@ class Xls extends BaseWriter
 
         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();
@@ -256,7 +262,7 @@ class Xls extends BaseWriter
             $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);
 
@@ -268,7 +274,7 @@ class Xls extends BaseWriter
             $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
@@ -290,7 +296,7 @@ class Xls extends BaseWriter
 
                 // 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
@@ -311,14 +317,16 @@ class Xls extends BaseWriter
 
                 $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
@@ -347,7 +355,7 @@ class Xls extends BaseWriter
 
                     // 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
@@ -389,13 +397,104 @@ class Xls extends BaseWriter
         }
     }
 
-    /**
-     * Build the Escher object corresponding to the MSODRAWINGGROUP record.
-     */
-    private function buildWorkbookEscher()
+    private function processMemoryDrawing(BstoreContainer &$bstoreContainer, MemoryDrawing $drawing, string $renderingFunctionx): void
     {
-        $escher = null;
+        switch ($renderingFunctionx) {
+            case MemoryDrawing::RENDERING_JPEG:
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $renderingFunction = 'imagejpeg';
 
+                break;
+            default:
+                $blipType = BSE::BLIPTYPE_PNG;
+                $renderingFunction = 'imagepng';
+
+                break;
+        }
+
+        ob_start();
+        call_user_func($renderingFunction, $drawing->getImageResource());
+        $blipData = ob_get_contents();
+        ob_end_clean();
+
+        $blip = new Blip();
+        $blip->setData("$blipData");
+
+        $BSE = new BSE();
+        $BSE->setBlipType($blipType);
+        $BSE->setBlip($blip);
+
+        $bstoreContainer->addBSE($BSE);
+    }
+
+    private function processDrawing(BstoreContainer &$bstoreContainer, Drawing $drawing): void
+    {
+        $blipType = 0;
+        $blipData = '';
+        $filename = $drawing->getPath();
+
+        $imageSize = getimagesize($filename);
+        $imageFormat = empty($imageSize) ? 0 : ($imageSize[2] ?? 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($newImage);
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+            case 2: // JPEG
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $blipData = file_get_contents($filename);
+
+                break;
+            case 3: // PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                $blipData = file_get_contents($filename);
+
+                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($newImage);
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+        }
+        if ($blipData) {
+            $blip = new Blip();
+            $blip->setData($blipData);
+
+            $BSE = new BSE();
+            $BSE->setBlipType($blipType);
+            $BSE->setBlip($blip);
+
+            $bstoreContainer->addBSE($BSE);
+        }
+    }
+
+    private function processBaseDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing): void
+    {
+        if ($drawing instanceof Drawing && $drawing->getPath() !== '') {
+            $this->processDrawing($bstoreContainer, $drawing);
+        } elseif ($drawing instanceof MemoryDrawing) {
+            $this->processMemoryDrawing($bstoreContainer, $drawing, $drawing->getRenderingFunction());
+        }
+    }
+
+    private function checkForDrawings(): bool
+    {
         // any drawings in this workbook?
         $found = false;
         foreach ($this->spreadsheet->getAllSheets() as $sheet) {
@@ -406,8 +505,16 @@ class Xls extends BaseWriter
             }
         }
 
+        return $found;
+    }
+
+    /**
+     * Build the Escher object corresponding to the MSODRAWINGGROUP record.
+     */
+    private function buildWorkbookEscher(): void
+    {
         // nothing to do if there are no drawings
-        if (!$found) {
+        if (!$this->checkForDrawings()) {
             return;
         }
 
@@ -429,17 +536,16 @@ class Xls extends BaseWriter
         foreach ($this->spreadsheet->getAllsheets() as $sheet) {
             $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
 
-            if (count($sheet->getDrawingCollection()) > 0) {
-                ++$countDrawings;
+            $addCount = 0;
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                $addCount = 1;
+                ++$sheetCountShapes;
+                ++$totalCountShapes;
 
-                foreach ($sheet->getDrawingCollection() as $drawing) {
-                    ++$sheetCountShapes;
-                    ++$totalCountShapes;
-
-                    $spId = $sheetCountShapes | ($this->spreadsheet->getIndex($sheet) + 1) << 10;
-                    $spIdMax = max($spId, $spIdMax);
-                }
+                $spId = $sheetCountShapes | ($this->spreadsheet->getIndex($sheet) + 1) << 10;
+                $spIdMax = max($spId, $spIdMax);
             }
+            $countDrawings += $addCount;
         }
 
         $dggContainer->setSpIdMax($spIdMax + 1);
@@ -453,83 +559,7 @@ class Xls extends BaseWriter
         // the BSE's (all the images)
         foreach ($this->spreadsheet->getAllsheets() as $sheet) {
             foreach ($sheet->getDrawingCollection() as $drawing) {
-                if (!extension_loaded('gd')) {
-                    throw new RuntimeException('Saving images in xls requires gd extension');
-                }
-                if ($drawing instanceof Drawing) {
-                    $filename = $drawing->getPath();
-
-                    [$imagesx, $imagesy, $imageFormat] = getimagesize($filename);
-
-                    switch ($imageFormat) {
-                        case 1: // GIF, not supported by BIFF8, we convert to PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            ob_start();
-                            imagepng(imagecreatefromgif($filename));
-                            $blipData = ob_get_contents();
-                            ob_end_clean();
-
-                            break;
-                        case 2: // JPEG
-                            $blipType = BSE::BLIPTYPE_JPEG;
-                            $blipData = file_get_contents($filename);
-
-                            break;
-                        case 3: // PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            $blipData = file_get_contents($filename);
-
-                            break;
-                        case 6: // Windows DIB (BMP), we convert to PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            ob_start();
-                            imagepng(SharedDrawing::imagecreatefrombmp($filename));
-                            $blipData = ob_get_contents();
-                            ob_end_clean();
-
-                            break;
-                        default:
-                            continue 2;
-                    }
-
-                    $blip = new Blip();
-                    $blip->setData($blipData);
-
-                    $BSE = new BSE();
-                    $BSE->setBlipType($blipType);
-                    $BSE->setBlip($blip);
-
-                    $bstoreContainer->addBSE($BSE);
-                } elseif ($drawing instanceof MemoryDrawing) {
-                    switch ($drawing->getRenderingFunction()) {
-                        case MemoryDrawing::RENDERING_JPEG:
-                            $blipType = BSE::BLIPTYPE_JPEG;
-                            $renderingFunction = 'imagejpeg';
-
-                            break;
-                        case MemoryDrawing::RENDERING_GIF:
-                        case MemoryDrawing::RENDERING_PNG:
-                        case MemoryDrawing::RENDERING_DEFAULT:
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            $renderingFunction = 'imagepng';
-
-                            break;
-                    }
-
-                    ob_start();
-                    call_user_func($renderingFunction, $drawing->getImageResource());
-                    $blipData = ob_get_contents();
-                    ob_end_clean();
-
-                    $blip = new Blip();
-                    $blip->setData($blipData);
-
-                    $BSE = new BSE();
-                    $BSE->setBlipType($blipType);
-                    $BSE->setBlip($blip);
-
-                    $bstoreContainer->addBSE($BSE);
-                }
+                $this->processBaseDrawing($bstoreContainer, $drawing);
             }
         }
 
@@ -578,8 +608,8 @@ class Xls extends BaseWriter
         ++$dataSection_NumProps;
 
         // GKPIDDSI_CATEGORY : Category
-        if ($this->spreadsheet->getProperties()->getCategory()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCategory();
+        $dataProp = $this->spreadsheet->getProperties()->getCategory();
+        if ($dataProp) {
             $dataSection[] = [
                 'summary' => ['pack' => 'V', 'data' => 0x02],
                 'offset' => ['pack' => 'V'],
@@ -707,16 +737,12 @@ class Xls extends BaseWriter
 
                 $dataSection_Content_Offset += 4 + 4;
             } elseif ($dataProp['type']['data'] == 0x0B) { // Boolean
-                if ($dataProp['data']['data'] == false) {
-                    $dataSection_Content .= pack('V', 0x0000);
-                } else {
-                    $dataSection_Content .= pack('V', 0x0001);
-                }
+                $dataSection_Content .= pack('V', (int) $dataProp['data']['data']);
                 $dataSection_Content_Offset += 4 + 4;
             } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
                 // Null-terminated string
                 $dataProp['data']['data'] .= chr(0);
-                $dataProp['data']['length'] += 1;
+                ++$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));
                 $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
@@ -725,12 +751,13 @@ class Xls extends BaseWriter
                 $dataSection_Content .= $dataProp['data']['data'];
 
                 $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-            } 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'];
+                /* 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;
+                    $dataSection_Content_Offset += 4 + 8;
+                */
             } else {
-                // Data Type Not Used at the moment
                 $dataSection_Content .= $dataProp['data']['data'];
 
                 $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
@@ -752,6 +779,35 @@ class Xls extends BaseWriter
         return $data;
     }
 
+    /**
+     * @param float|int $dataProp
+     */
+    private function writeSummaryPropOle($dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => OLE::localDateToOLE($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
+    private function writeSummaryProp(string $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
     /**
      * Build the OLE Part for Summary Information.
      *
@@ -792,94 +848,16 @@ class Xls extends BaseWriter
         ];
         ++$dataSection_NumProps;
 
-        //    Title
-        if ($this->spreadsheet->getProperties()->getTitle()) {
-            $dataProp = $this->spreadsheet->getProperties()->getTitle();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x02],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Subject
-        if ($this->spreadsheet->getProperties()->getSubject()) {
-            $dataProp = $this->spreadsheet->getProperties()->getSubject();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x03],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Author (Creator)
-        if ($this->spreadsheet->getProperties()->getCreator()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCreator();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x04],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Keywords
-        if ($this->spreadsheet->getProperties()->getKeywords()) {
-            $dataProp = $this->spreadsheet->getProperties()->getKeywords();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x05],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Comments (Description)
-        if ($this->spreadsheet->getProperties()->getDescription()) {
-            $dataProp = $this->spreadsheet->getProperties()->getDescription();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x06],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Last Saved By (LastModifiedBy)
-        if ($this->spreadsheet->getProperties()->getLastModifiedBy()) {
-            $dataProp = $this->spreadsheet->getProperties()->getLastModifiedBy();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x08],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Created Date/Time
-        if ($this->spreadsheet->getProperties()->getCreated()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCreated();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x0C],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                'data' => ['data' => OLE::localDateToOLE($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Modified Date/Time
-        if ($this->spreadsheet->getProperties()->getModified()) {
-            $dataProp = $this->spreadsheet->getProperties()->getModified();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x0D],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                'data' => ['data' => OLE::localDateToOLE($dataProp)],
-            ];
-            ++$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);
+
         //    Security
         $dataSection[] = [
             'summary' => ['pack' => 'V', 'data' => 0x13],
@@ -912,7 +890,7 @@ class Xls extends BaseWriter
             } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
                 // Null-terminated string
                 $dataProp['data']['data'] .= chr(0);
-                $dataProp['data']['length'] += 1;
+                ++$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));
                 $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
index 3b2eb9af2..9d961b712 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
@@ -42,14 +42,14 @@ class BIFFwriter
     /**
      * The byte order of this architecture. 0 => little endian, 1 => big endian.
      *
-     * @var int
+     * @var ?int
      */
     private static $byteOrder;
 
     /**
      * The string containing the data of the BIFF stream.
      *
-     * @var string
+     * @var null|string
      */
     public $_data;
 
@@ -109,7 +109,7 @@ class BIFFwriter
      *
      * @param string $data binary data to append
      */
-    protected function append($data)
+    protected function append($data): void
     {
         if (strlen($data) - 4 > $this->limit) {
             $data = $this->addContinue($data);
@@ -142,7 +142,7 @@ class BIFFwriter
      * @param int $type type of BIFF file to write: 0x0005 Workbook,
      *                       0x0010 Worksheet
      */
-    protected function storeBof($type)
+    protected function storeBof($type): void
     {
         $record = 0x0809; // Record identifier    (BIFF5-BIFF8)
         $length = 0x0010;
@@ -163,7 +163,7 @@ class BIFFwriter
     /**
      * Writes Excel EOF record to indicate the end of a BIFF stream.
      */
-    protected function storeEof()
+    protected function storeEof(): void
     {
         $record = 0x000A; // Record identifier
         $length = 0x0000; // Number of bytes to follow
@@ -175,7 +175,7 @@ class BIFFwriter
     /**
      * 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
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
new file mode 100644
index 000000000..7e9b3cfa4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+
+class CellDataValidation
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static $validationTypeMap = [
+        DataValidation::TYPE_NONE => 0x00,
+        DataValidation::TYPE_WHOLE => 0x01,
+        DataValidation::TYPE_DECIMAL => 0x02,
+        DataValidation::TYPE_LIST => 0x03,
+        DataValidation::TYPE_DATE => 0x04,
+        DataValidation::TYPE_TIME => 0x05,
+        DataValidation::TYPE_TEXTLENGTH => 0x06,
+        DataValidation::TYPE_CUSTOM => 0x07,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    protected static $errorStyleMap = [
+        DataValidation::STYLE_STOP => 0x00,
+        DataValidation::STYLE_WARNING => 0x01,
+        DataValidation::STYLE_INFORMATION => 0x02,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    protected static $operatorMap = [
+        DataValidation::OPERATOR_BETWEEN => 0x00,
+        DataValidation::OPERATOR_NOTBETWEEN => 0x01,
+        DataValidation::OPERATOR_EQUAL => 0x02,
+        DataValidation::OPERATOR_NOTEQUAL => 0x03,
+        DataValidation::OPERATOR_GREATERTHAN => 0x04,
+        DataValidation::OPERATOR_LESSTHAN => 0x05,
+        DataValidation::OPERATOR_GREATERTHANOREQUAL => 0x06,
+        DataValidation::OPERATOR_LESSTHANOREQUAL => 0x07,
+    ];
+
+    public static function type(DataValidation $dataValidation): int
+    {
+        $validationType = $dataValidation->getType();
+
+        if (is_string($validationType) && array_key_exists($validationType, self::$validationTypeMap)) {
+            return self::$validationTypeMap[$validationType];
+        }
+
+        return self::$validationTypeMap[DataValidation::TYPE_NONE];
+    }
+
+    public static function errorStyle(DataValidation $dataValidation): int
+    {
+        $errorStyle = $dataValidation->getErrorStyle();
+
+        if (is_string($errorStyle) && array_key_exists($errorStyle, self::$errorStyleMap)) {
+            return self::$errorStyleMap[$errorStyle];
+        }
+
+        return self::$errorStyleMap[DataValidation::STYLE_STOP];
+    }
+
+    public static function operator(DataValidation $dataValidation): int
+    {
+        $operator = $dataValidation->getOperator();
+
+        if (is_string($operator) && array_key_exists($operator, self::$operatorMap)) {
+            return self::$operatorMap[$operator];
+        }
+
+        return self::$operatorMap[DataValidation::OPERATOR_BETWEEN];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
new file mode 100644
index 000000000..0f78b8c5d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+class ConditionalHelper
+{
+    /**
+     * Formula parser.
+     *
+     * @var Parser
+     */
+    protected $parser;
+
+    /**
+     * @var mixed
+     */
+    protected $condition;
+
+    /**
+     * @var string
+     */
+    protected $cellRange;
+
+    /**
+     * @var null|string
+     */
+    protected $tokens;
+
+    /**
+     * @var int
+     */
+    protected $size;
+
+    public function __construct(Parser $parser)
+    {
+        $this->parser = $parser;
+    }
+
+    /**
+     * @param mixed $condition
+     */
+    public function processCondition($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 {
+                $formula = Wizard\WizardAbstract::reverseAdjustCellRef((string) $condition, $cellRange);
+                $this->parser->parse($formula);
+                $this->tokens = $this->parser->toReversePolish();
+                $this->size = strlen($this->tokens ?? '');
+            } catch (PhpSpreadsheetException $e) {
+                // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
new file mode 100644
index 000000000..7a864f50f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+class ErrorCode
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static $errorCodeMap = [
+        '#NULL!' => 0x00,
+        '#DIV/0!' => 0x07,
+        '#VALUE!' => 0x0F,
+        '#REF!' => 0x17,
+        '#NAME?' => 0x1D,
+        '#NUM!' => 0x24,
+        '#N/A' => 0x2A,
+    ];
+
+    public static function error(string $errorCode): int
+    {
+        if (array_key_exists($errorCode, self::$errorCodeMap)) {
+            return self::$errorCodeMap[$errorCode];
+        }
+
+        return 0;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
index 1ee2e9047..3786ee8c9 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
+++ b/libraries/phpspreadsheet/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;
@@ -15,11 +16,15 @@ class Escher
 {
     /**
      * The object we are writing.
+     *
+     * @var Blip|BSE|BstoreContainer|DgContainer|DggContainer|Escher|SpContainer|SpgrContainer
      */
     private $object;
 
     /**
      * The written binary data.
+     *
+     * @var string
      */
     private $data;
 
@@ -58,11 +63,11 @@ class Escher
         $this->data = '';
 
         switch (get_class($this->object)) {
-            case \PhpOffice\PhpSpreadsheet\Shared\Escher::class:
-                if ($dggContainer = $this->object->getDggContainer()) {
+            case SharedEscher::class:
+                if ($dggContainer = $this->object->/** @scrutinizer ignore-call */ getDggContainer()) {
                     $writer = new self($dggContainer);
                     $this->data = $writer->close();
-                } elseif ($dgContainer = $this->object->getDgContainer()) {
+                } elseif ($dgContainer = $this->object->/** @scrutinizer ignore-call */ getDgContainer()) {
                     $writer = new self($dgContainer);
                     $this->data = $writer->close();
                     $this->spOffsets = $writer->getSpOffsets();
@@ -88,13 +93,14 @@ class Escher
                 $dggData =
                     pack(
                         'VVVV',
-                        $this->object->getSpIdMax(), // maximum shape identifier increased by one
-                        $this->object->getCDgSaved() + 1, // number of file identifier clusters increased by one
-                        $this->object->getCSpSaved(),
-                        $this->object->getCDgSaved() // count total number of drawings saved
+                        $this->object->/** @scrutinizer ignore-call */ getSpIdMax(), // maximum shape identifier increased by one
+                        $this->object->/** @scrutinizer ignore-call */ getCDgSaved() + 1, // number of file identifier clusters increased by one
+                        $this->object->/** @scrutinizer ignore-call */ getCSpSaved(),
+                        $this->object->/** @scrutinizer ignore-call */ getCDgSaved() // count total number of drawings saved
                     );
 
                 // add file identifier clusters (one per drawing)
+                /** @scrutinizer ignore-call */
                 $IDCLs = $this->object->getIDCLs();
 
                 foreach ($IDCLs as $dgId => $maxReducedSpId) {
@@ -105,7 +111,7 @@ class Escher
                 $innerData .= $header . $dggData;
 
                 // write the bstoreContainer
-                if ($bstoreContainer = $this->object->getBstoreContainer()) {
+                if ($bstoreContainer = $this->object->/** @scrutinizer ignore-call */ getBstoreContainer()) {
                     $writer = new self($bstoreContainer);
                     $innerData .= $writer->close();
                 }
@@ -131,7 +137,7 @@ class Escher
                 $innerData = '';
 
                 // treat the inner data
-                if ($BSECollection = $this->object->getBSECollection()) {
+                if ($BSECollection = $this->object->/** @scrutinizer ignore-call */ getBSECollection()) {
                     foreach ($BSECollection as $BSE) {
                         $writer = new self($BSE);
                         $innerData .= $writer->close();
@@ -140,7 +146,7 @@ class Escher
 
                 // write the record
                 $recVer = 0xF;
-                $recInstance = count($this->object->getBSECollection());
+                $recInstance = count($this->object->/** @scrutinizer ignore-call */ getBSECollection());
                 $recType = 0xF001;
                 $length = strlen($innerData);
 
@@ -159,7 +165,7 @@ class Escher
                 $innerData = '';
 
                 // here we treat the inner data
-                if ($blip = $this->object->getBlip()) {
+                if ($blip = $this->object->/** @scrutinizer ignore-call */ getBlip()) {
                     $writer = new self($blip);
                     $innerData .= $writer->close();
                 }
@@ -167,7 +173,9 @@ class Escher
                 // initialize
                 $data = '';
 
+                /** @scrutinizer ignore-call */
                 $btWin32 = $this->object->getBlipType();
+                /** @scrutinizer ignore-call */
                 $btMacOS = $this->object->getBlipType();
                 $data .= pack('CC', $btWin32, $btMacOS);
 
@@ -188,6 +196,7 @@ class Escher
 
                 // write the record
                 $recVer = 0x2;
+                /** @scrutinizer ignore-call */
                 $recInstance = $this->object->getBlipType();
                 $recType = 0xF007;
                 $length = strlen($data);
@@ -206,7 +215,7 @@ class Escher
                 // this is an atom record
 
                 // write the record
-                switch ($this->object->getParent()->getBlipType()) {
+                switch ($this->object->/** @scrutinizer ignore-call */ getParent()->/** @scrutinizer ignore-call */ getBlipType()) {
                     case BSE::BLIPTYPE_JPEG:
                         // initialize
                         $innerData = '';
@@ -217,7 +226,7 @@ class Escher
                         $tag = 0xFF; // todo
                         $innerData .= pack('C', $tag);
 
-                        $innerData .= $this->object->getData();
+                        $innerData .= $this->object->/** @scrutinizer ignore-call */ getData();
 
                         $recVer = 0x0;
                         $recInstance = 0x46A;
@@ -244,7 +253,7 @@ class Escher
                         $tag = 0xFF; // todo
                         $innerData .= pack('C', $tag);
 
-                        $innerData .= $this->object->getData();
+                        $innerData .= $this->object->/** @scrutinizer ignore-call */ getData();
 
                         $recVer = 0x0;
                         $recInstance = 0x6E0;
@@ -272,6 +281,7 @@ class Escher
 
                 // write the dg
                 $recVer = 0x0;
+                /** @scrutinizer ignore-call */
                 $recInstance = $this->object->getDgId();
                 $recType = 0xF008;
                 $length = 8;
@@ -282,11 +292,11 @@ class Escher
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
                 // number of shapes in this drawing (including group shape)
-                $countShapes = count($this->object->getSpgrContainer()->getChildren());
-                $innerData .= $header . pack('VV', $countShapes, $this->object->getLastSpId());
+                $countShapes = count($this->object->/** @scrutinizer ignore-call */ getSpgrContainerOrThrow()->getChildren());
+                $innerData .= $header . pack('VV', $countShapes, $this->object->/** @scrutinizer ignore-call */ getLastSpId());
 
                 // write the spgrContainer
-                if ($spgrContainer = $this->object->getSpgrContainer()) {
+                if ($spgrContainer = $this->object->/** @scrutinizer ignore-call */ getSpgrContainer()) {
                     $writer = new self($spgrContainer);
                     $innerData .= $writer->close();
 
@@ -329,7 +339,7 @@ class Escher
                 $spTypes = [];
 
                 // treat the inner data
-                foreach ($this->object->getChildren() as $spContainer) {
+                foreach ($this->object->/** @scrutinizer ignore-call */ getChildren() as $spContainer) {
                     $writer = new self($spContainer);
                     $spData = $writer->close();
                     $innerData .= $spData;
@@ -364,7 +374,7 @@ class Escher
                 // build the data
 
                 // write group shape record, if necessary?
-                if ($this->object->getSpgr()) {
+                if ($this->object->/** @scrutinizer ignore-call */ getSpgr()) {
                     $recVer = 0x1;
                     $recInstance = 0x0000;
                     $recType = 0xF009;
@@ -377,10 +387,12 @@ class Escher
 
                     $data .= $header . pack('VVVV', 0, 0, 0, 0);
                 }
+                /** @scrutinizer ignore-call */
                 $this->spTypes[] = ($this->object->getSpType());
 
                 // write the shape record
                 $recVer = 0x2;
+                /** @scrutinizer ignore-call */
                 $recInstance = $this->object->getSpType(); // shape type
                 $recType = 0xF00A;
                 $length = 0x00000008;
@@ -390,16 +402,16 @@ class Escher
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $data .= $header . pack('VV', $this->object->getSpId(), $this->object->getSpgr() ? 0x0005 : 0x0A00);
+                $data .= $header . pack('VV', $this->object->/** @scrutinizer ignore-call */ getSpId(), $this->object->/** @scrutinizer ignore-call */ getSpgr() ? 0x0005 : 0x0A00);
 
                 // the options
-                if ($this->object->getOPTCollection()) {
+                if ($this->object->/** @scrutinizer ignore-call */ getOPTCollection()) {
                     $optData = '';
 
                     $recVer = 0x3;
-                    $recInstance = count($this->object->getOPTCollection());
+                    $recInstance = count($this->object->/** @scrutinizer ignore-call */ getOPTCollection());
                     $recType = 0xF00B;
-                    foreach ($this->object->getOPTCollection() as $property => $value) {
+                    foreach ($this->object->/** @scrutinizer ignore-call */ getOPTCollection() as $property => $value) {
                         $optData .= pack('vV', $property, $value);
                     }
                     $length = strlen($optData);
@@ -412,36 +424,38 @@ class Escher
                 }
 
                 // the client anchor
-                if ($this->object->getStartCoordinates()) {
-                    $clientAnchorData = '';
-
+                if ($this->object->/** @scrutinizer ignore-call */ getStartCoordinates()) {
                     $recVer = 0x0;
                     $recInstance = 0x0;
                     $recType = 0xF010;
 
                     // start coordinates
-                    [$column, $row] = Coordinate::coordinateFromString($this->object->getStartCoordinates());
-                    $c1 = Coordinate::columnIndexFromString($column) - 1;
+                    [$column, $row] = Coordinate::indexesFromString($this->object->/** @scrutinizer ignore-call */ getStartCoordinates());
+                    $c1 = $column - 1;
                     $r1 = $row - 1;
 
                     // start offsetX
+                    /** @scrutinizer ignore-call */
                     $startOffsetX = $this->object->getStartOffsetX();
 
                     // start offsetY
+                    /** @scrutinizer ignore-call */
                     $startOffsetY = $this->object->getStartOffsetY();
 
                     // end coordinates
-                    [$column, $row] = Coordinate::coordinateFromString($this->object->getEndCoordinates());
-                    $c2 = Coordinate::columnIndexFromString($column) - 1;
+                    [$column, $row] = Coordinate::indexesFromString($this->object->/** @scrutinizer ignore-call */ getEndCoordinates());
+                    $c2 = $column - 1;
                     $r2 = $row - 1;
 
                     // end offsetX
+                    /** @scrutinizer ignore-call */
                     $endOffsetX = $this->object->getEndOffsetX();
 
                     // end offsetY
+                    /** @scrutinizer ignore-call */
                     $endOffsetY = $this->object->getEndOffsetY();
 
-                    $clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
+                    $clientAnchorData = pack('vvvvvvvvv', $this->object->/** @scrutinizer ignore-call */ getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
 
                     $length = strlen($clientAnchorData);
 
@@ -453,7 +467,7 @@ class Escher
                 }
 
                 // the client data, just empty for now
-                if (!$this->object->getSpgr()) {
+                if (!$this->object->/** @scrutinizer ignore-call */ getSpgr()) {
                     $clientDataData = '';
 
                     $recVer = 0x0;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
index df37dcb56..1923200db 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
@@ -22,8 +22,6 @@ class Font
 
     /**
      * Constructor.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font
      */
     public function __construct(\PhpOffice\PhpSpreadsheet\Style\Font $font)
     {
@@ -36,11 +34,14 @@ class Font
      *
      * @param int $colorIndex
      */
-    public function setColorIndex($colorIndex)
+    public function setColorIndex($colorIndex): void
     {
         $this->colorIndex = $colorIndex;
     }
 
+    /** @var int */
+    private static $notImplemented = 0;
+
     /**
      * Get font record data.
      *
@@ -48,8 +49,8 @@ class Font
      */
     public function writeFont()
     {
-        $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()) {
@@ -60,7 +61,7 @@ class Font
             $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
@@ -89,12 +90,12 @@ class Font
             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);
@@ -104,14 +105,10 @@ class Font
 
     /**
      * 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 +118,7 @@ class Font
     /**
      * Map of BIFF2-BIFF8 codes for underline styles.
      *
-     * @var array of int
+     * @var int[]
      */
     private static $mapUnderline = [
         \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_NONE => 0x00,
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 598206284..f195ac782 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -2,7 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -76,9 +78,9 @@ class Parser
     /**
      * The parse tree to be generated.
      *
-     * @var string
+     * @var array|string
      */
-    private $parseTree;
+    public $parseTree;
 
     /**
      * Array of external sheets.
@@ -467,11 +469,16 @@ class Parser
         'BAHTTEXT' => [368, 1, 0, 0],
     ];
 
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
     /**
      * The class constructor.
      */
-    public function __construct()
+    public function __construct(Spreadsheet $spreadsheet)
     {
+        $this->spreadsheet = $spreadsheet;
+
         $this->currentCharacter = 0;
         $this->currentToken = ''; // The token we are working on.
         $this->formula = ''; // The formula to parse.
@@ -492,41 +499,60 @@ class Parser
     {
         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) or $token == '#N/A') {
+        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
             return $this->convertError($token);
+        }
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+            return $this->convertDefinedName($token);
+        }
         // commented so argument number can be processed correctly. See toReversePolish().
-        /*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
+        /*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)
-        } elseif ($token == 'arg') {
+        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");
@@ -542,7 +568,7 @@ class Parser
     private function convertNumber($num)
     {
         // Integer in the range 0..2**16-1
-        if ((preg_match('/^\\d+$/', $num)) and ($num <= 65535)) {
+        if ((preg_match('/^\\d+$/', $num)) && ($num <= 65535)) {
             return pack('Cv', $this->ptg['ptgInt'], $num);
         }
 
@@ -554,6 +580,11 @@ class Parser
         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.
      *
@@ -589,10 +620,9 @@ class Parser
         if ($args >= 0) {
             return pack('Cv', $this->ptg['ptgFuncV'], $this->functions[$token][0]);
         }
+
         // Variable number of args eg. SUM($i, $j, $k, ..).
-        if ($args == -1) {
-            return pack('CCv', $this->ptg['ptgFuncVarV'], $num_args, $this->functions[$token][0]);
-        }
+        return pack('CCv', $this->ptg['ptgFuncVarV'], $num_args, $this->functions[$token][0]);
     }
 
     /**
@@ -613,7 +643,6 @@ class Parser
             // 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);
@@ -739,6 +768,34 @@ class Parser
         return pack('C', 0xFF);
     }
 
+    /** @var bool */
+    private $tryDefinedName = false;
+
+    private function convertDefinedName(string $name): string
+    {
+        if (strlen($name) > 255) {
+            throw new WriterException('Defined Name is too long');
+        }
+
+        if ($this->tryDefinedName) {
+            // @codeCoverageIgnoreStart
+            $nameReference = 1;
+            foreach ($this->spreadsheet->getDefinedNames() as $definedName) {
+                if ($name === $definedName->getName()) {
+                    break;
+                }
+                ++$nameReference;
+            }
+
+            $ptgRef = pack('Cvxx', $this->ptg['ptgName'], $nameReference);
+
+            return $ptgRef;
+            // @codeCoverageIgnoreEnd
+        }
+
+        throw new WriterException('Cannot yet write formulae with defined names to Xls');
+    }
+
     /**
      * Look up the REF index that corresponds to an external sheet name
      * (or range). If it doesn't exist yet add it to the workbook's references
@@ -750,8 +807,7 @@ class Parser
      */
     private function getRefIndex($ext_ref)
     {
-        $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.
@@ -823,12 +879,12 @@ class Parser
      * called by the addWorksheet() method of the
      * \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook class.
      *
-     * @see \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook::addWorksheet()
-     *
      * @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()
      */
-    public function setExtSheet($name, $index)
+    public function setExtSheet($name, $index): void
     {
         $this->externalSheets[$name] = $index;
     }
@@ -885,7 +941,7 @@ class Parser
         $col2 = 65535; // FIXME: maximum possible value for Excel 5 (change this!!!)
 
         // FIXME: this changes for BIFF8
-        if (($row1 >= 65536) or ($row2 >= 65536)) {
+        if (($row1 >= 65536) || ($row2 >= 65536)) {
             throw new WriterException("Row in: $range greater than 65536 ");
         }
 
@@ -924,7 +980,7 @@ class Parser
         $col = 0;
         $col_ref_length = strlen($col_ref);
         for ($i = 0; $i < $col_ref_length; ++$i) {
-            $col += (ord($col_ref[$i]) - 64) * pow(26, $expn);
+            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn;
             --$expn;
         }
 
@@ -938,8 +994,9 @@ class Parser
     /**
      * Advance to the next valid token.
      */
-    private function advance()
+    private function advance(): void
     {
+        $token = '';
         $i = $this->currentCharacter;
         $formula_length = strlen($this->formula);
         // eat up white spaces
@@ -967,7 +1024,7 @@ class Parser
                 $this->currentCharacter = $i + 1;
                 $this->currentToken = $token;
 
-                return 1;
+                return;
             }
 
             if ($i < ($formula_length - 2)) {
@@ -1007,7 +1064,6 @@ class Parser
             case '%':
                 return $token;
 
-                break;
             case '>':
                 if ($this->lookAhead === '=') { // it's a GE token
                     break;
@@ -1015,55 +1071,71 @@ class Parser
 
                 return $token;
 
-                break;
             case '<':
                 // it's a LE or a NE token
-                if (($this->lookAhead === '=') or ($this->lookAhead === '>')) {
+                if (($this->lookAhead === '=') || ($this->lookAhead === '>')) {
                     break;
                 }
 
                 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) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($this->lookAhead !== '.') and ($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) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($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) and !preg_match('/\d/', $this->lookAhead) and ($this->lookAhead !== ':') and ($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) and !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) and !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) and (!is_numeric($token . $this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead !== '!') and ($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) and $this->lookAhead !== '"' and (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) or $token === '#N/A') {
-                    // If it's an error code
-                    return $token;
-                } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) and ($this->lookAhead === '(')) {
-                    // if it's a function call
-                    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 (substr($token, -1) === ')') {
+            //    It's an argument of some description (e.g. a named range),
+            //        precise nature yet to be determined
+            return $token;
+        }
+
+        return '';
     }
 
     /**
@@ -1118,10 +1190,6 @@ class Parser
             $this->advance();
             $result2 = $this->expression();
             $result = $this->createTree('ptgNE', $result, $result2);
-        } elseif ($this->currentToken == '&') {
-            $this->advance();
-            $result2 = $this->expression();
-            $result = $this->createTree('ptgConcat', $result, $result2);
         }
 
         return $result;
@@ -1150,21 +1218,18 @@ class Parser
             $this->advance();
 
             return $result;
-        // If it's an error code
-        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) or $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();
@@ -1172,9 +1237,16 @@ class Parser
             return $this->createTree('ptgUplus', $result2, '');
         }
         $result = $this->term();
-        while (($this->currentToken == '+') or
-               ($this->currentToken == '-') or
-               ($this->currentToken == '^')) {
+        while ($this->currentToken === '&') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgConcat', $result, $result2);
+        }
+        while (
+            ($this->currentToken == '+') ||
+            ($this->currentToken == '-') ||
+            ($this->currentToken == '^')
+        ) {
             if ($this->currentToken == '+') {
                 $this->advance();
                 $result2 = $this->term();
@@ -1197,9 +1269,9 @@ class Parser
      * This function just introduces a ptgParen element in the tree, so that Excel
      * doesn't get confused when working with a parenthesized formula afterwards.
      *
-     * @see fact()
-     *
      * @return array The parsed ptg'd tree
+     *
+     * @see fact()
      */
     private function parenthesizedExpression()
     {
@@ -1215,8 +1287,10 @@ class Parser
     private function term()
     {
         $result = $this->fact();
-        while (($this->currentToken == '*') or
-               ($this->currentToken == '/')) {
+        while (
+            ($this->currentToken == '*') ||
+            ($this->currentToken == '/')
+        ) {
             if ($this->currentToken == '*') {
                 $this->advance();
                 $result2 = $this->fact();
@@ -1243,13 +1317,15 @@ class Parser
      */
     private function fact()
     {
-        if ($this->currentToken === '(') {
+        $currentToken = $this->currentToken;
+        if ($currentToken === '(') {
             $this->advance(); // eat the "("
             $result = $this->parenthesizedExpression();
             if ($this->currentToken !== ')') {
                 throw new WriterException("')' token expected.");
             }
             $this->advance(); // eat the ")"
+
             return $result;
         }
         // if it's a reference
@@ -1258,41 +1334,49 @@ class Parser
             $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) or
-                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?
             $result = $this->createTree($this->currentToken, '', '');
             $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, '');
@@ -1303,10 +1387,23 @@ class Parser
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken)) {
+        }
+        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
             // if it's a function call
             return $this->func();
         }
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) {
+            $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);
     }
@@ -1344,12 +1441,13 @@ class Parser
         }
         $args = $this->functions[$function][1];
         // If fixed number of args eg. TIME($i, $j, $k). Check that the number of args is valid.
-        if (($args >= 0) and ($args != $num_args)) {
+        if (($args >= 0) && ($args != $num_args)) {
             throw new WriterException("Incorrect number of arguments in function $function() ");
         }
 
         $result = $this->createTree($function, $result, $num_args);
         $this->advance(); // eat the ")"
+
         return $result;
     }
 
@@ -1401,6 +1499,9 @@ class Parser
         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']);
@@ -1417,18 +1518,21 @@ class Parser
             $polish .= $converted_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']) and
-            !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) and
-            !preg_match('/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', $tree['value']) and
-            !is_numeric($tree['value']) and
-            !isset($this->ptg[$tree['value']])) {
+        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']])
+        ) {
             // left subtree for a function is always an array.
             if ($tree['left'] != '') {
                 $left_tree = $this->toReversePolish($tree['left']);
             } else {
                 $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
new file mode 100644
index 000000000..711d88d20
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class CellAlignment
+{
+    /**
+     * @var array<string, int>
+     */
+    private static $horizontalMap = [
+        Alignment::HORIZONTAL_GENERAL => 0,
+        Alignment::HORIZONTAL_LEFT => 1,
+        Alignment::HORIZONTAL_RIGHT => 3,
+        Alignment::HORIZONTAL_CENTER => 2,
+        Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
+        Alignment::HORIZONTAL_JUSTIFY => 5,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    private static $verticalMap = [
+        Alignment::VERTICAL_BOTTOM => 2,
+        Alignment::VERTICAL_TOP => 0,
+        Alignment::VERTICAL_CENTER => 1,
+        Alignment::VERTICAL_JUSTIFY => 3,
+    ];
+
+    public static function horizontal(Alignment $alignment): int
+    {
+        $horizontalAlignment = $alignment->getHorizontal();
+
+        if (is_string($horizontalAlignment) && array_key_exists($horizontalAlignment, self::$horizontalMap)) {
+            return self::$horizontalMap[$horizontalAlignment];
+        }
+
+        return self::$horizontalMap[Alignment::HORIZONTAL_GENERAL];
+    }
+
+    public static function wrap(Alignment $alignment): int
+    {
+        $wrap = $alignment->getWrapText();
+
+        return ($wrap === true) ? 1 : 0;
+    }
+
+    public static function vertical(Alignment $alignment): int
+    {
+        $verticalAlignment = $alignment->getVertical();
+
+        if (is_string($verticalAlignment) && array_key_exists($verticalAlignment, self::$verticalMap)) {
+            return self::$verticalMap[$verticalAlignment];
+        }
+
+        return self::$verticalMap[Alignment::VERTICAL_BOTTOM];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
new file mode 100644
index 000000000..bc1492065
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Border;
+
+class CellBorder
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static $styleMap = [
+        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 => 0x00,
+    ];
+
+    public static function style(Border $border): int
+    {
+        $borderStyle = $border->getBorderStyle();
+
+        if (is_string($borderStyle) && array_key_exists($borderStyle, self::$styleMap)) {
+            return self::$styleMap[$borderStyle];
+        }
+
+        return self::$styleMap[Border::BORDER_NONE];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
new file mode 100644
index 000000000..f5a8c4700
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+class CellFill
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static $fillStyleMap = [
+        Fill::FILL_NONE => 0x00,
+        Fill::FILL_SOLID => 0x01,
+        Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
+        Fill::FILL_PATTERN_DARKGRAY => 0x03,
+        Fill::FILL_PATTERN_LIGHTGRAY => 0x04,
+        Fill::FILL_PATTERN_DARKHORIZONTAL => 0x05,
+        Fill::FILL_PATTERN_DARKVERTICAL => 0x06,
+        Fill::FILL_PATTERN_DARKDOWN => 0x07,
+        Fill::FILL_PATTERN_DARKUP => 0x08,
+        Fill::FILL_PATTERN_DARKGRID => 0x09,
+        Fill::FILL_PATTERN_DARKTRELLIS => 0x0A,
+        Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
+        Fill::FILL_PATTERN_LIGHTVERTICAL => 0x0C,
+        Fill::FILL_PATTERN_LIGHTDOWN => 0x0D,
+        Fill::FILL_PATTERN_LIGHTUP => 0x0E,
+        Fill::FILL_PATTERN_LIGHTGRID => 0x0F,
+        Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
+        Fill::FILL_PATTERN_GRAY125 => 0x11,
+        Fill::FILL_PATTERN_GRAY0625 => 0x12,
+        Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
+        Fill::FILL_GRADIENT_PATH => 0x00,   // does not exist in BIFF8
+    ];
+
+    public static function style(Fill $fill): int
+    {
+        $fillStyle = $fill->getFillType();
+
+        if (is_string($fillStyle) && array_key_exists($fillStyle, self::$fillStyleMap)) {
+            return self::$fillStyleMap[$fillStyle];
+        }
+
+        return self::$fillStyleMap[Fill::FILL_NONE];
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
new file mode 100644
index 000000000..caf85c049
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
@@ -0,0 +1,90 @@
+<?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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index 41c8e64e2..3c68847aa 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -2,7 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
@@ -53,13 +55,13 @@ class Workbook extends BIFFwriter
     private $parser;
 
     /**
-     * The BIFF file size for the workbook.
+     * The BIFF file size for the workbook. Not currently used.
      *
      * @var int
      *
      * @see calcSheetOffsets()
      */
-    private $biffSize;
+    private $biffSize; // @phpstan-ignore-line
 
     /**
      * XF Writers.
@@ -161,16 +163,21 @@ class Workbook extends BIFFwriter
 
     /**
      * Color cache.
+     *
+     * @var array
      */
     private $colors;
 
     /**
      * Escher object corresponding to MSODRAWINGGROUP.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher
+     * @var null|\PhpOffice\PhpSpreadsheet\Shared\Escher
      */
     private $escher;
 
+    /** @var mixed */
+    private static $scrutinizerFalse = false;
+
     /**
      * Class constructor.
      *
@@ -222,7 +229,6 @@ class Workbook extends BIFFwriter
     /**
      * Add a new XF writer.
      *
-     * @param Style $style
      * @param bool $isStyleXf Is it a style XF?
      *
      * @return int Index to XF record
@@ -248,7 +254,7 @@ class Workbook extends BIFFwriter
         $xfWriter->setDiagColor($this->addColor($style->getBorders()->getDiagonal()->getColor()->getRGB()));
 
         // Add the number format if it is not a built-in one and not already added
-        if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
+        if ($style->getNumberFormat()->getBuiltInFormatCode() === self::$scrutinizerFalse) {
             $numberFormatHashCode = $style->getNumberFormat()->getHashCode();
 
             if (isset($this->addedNumberFormats[$numberFormatHashCode])) {
@@ -273,8 +279,6 @@ class Workbook extends BIFFwriter
     /**
      * Add a font to added fonts.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font
-     *
      * @return int Index to FONT record
      */
     public function addFont(\PhpOffice\PhpSpreadsheet\Style\Font $font)
@@ -343,7 +347,7 @@ class Workbook extends BIFFwriter
     /**
      * Sets the colour palette to the Excel 97+ default.
      */
-    private function setPaletteXl97()
+    private function setPaletteXl97(): void
     {
         $this->palette = [
             0x08 => [0x00, 0x00, 0x00, 0x00],
@@ -409,13 +413,13 @@ class Workbook extends BIFFwriter
      * 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)
     {
-        $this->worksheetSizes = $pWorksheetSizes;
+        $this->worksheetSizes = $worksheetSizes;
 
         // Calculate the number of selected worksheet tabs and call the finalization
         // methods for each worksheet
@@ -465,7 +469,7 @@ class Workbook extends BIFFwriter
     /**
      * Calculate offsets for Worksheet BOF records.
      */
-    private function calcSheetOffsets()
+    private function calcSheetOffsets(): void
     {
         $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
 
@@ -489,7 +493,7 @@ class Workbook extends BIFFwriter
     /**
      * Store the Excel FONT records.
      */
-    private function writeAllFonts()
+    private function writeAllFonts(): void
     {
         foreach ($this->fontWriters as $fontWriter) {
             $this->append($fontWriter->writeFont());
@@ -499,7 +503,7 @@ class Workbook extends BIFFwriter
     /**
      * Store user defined numerical formats i.e. FORMAT records.
      */
-    private function writeAllNumberFormats()
+    private function writeAllNumberFormats(): void
     {
         foreach ($this->numberFormats as $numberFormatIndex => $numberFormat) {
             $this->writeNumberFormat($numberFormat->getFormatCode(), $numberFormatIndex);
@@ -509,7 +513,7 @@ class Workbook extends BIFFwriter
     /**
      * Write all XF records.
      */
-    private function writeAllXfs()
+    private function writeAllXfs(): void
     {
         foreach ($this->xfWriters as $xfWriter) {
             $this->append($xfWriter->writeXf());
@@ -519,53 +523,96 @@ class Workbook extends BIFFwriter
     /**
      * Write all STYLE records.
      */
-    private function writeAllStyles()
+    private function writeAllStyles(): void
     {
         $this->writeStyle();
     }
 
+    private function parseDefinedNameValue(DefinedName $definedName): string
+    {
+        $definedRange = $definedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We should have a worksheet
+                    $worksheet = $definedName->getWorksheet() ? $definedName->getWorksheet()->getTitle() : null;
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+
+            if (!empty($column)) {
+                $newRange .= "\${$column}";
+            }
+            if (!empty($row)) {
+                $newRange .= "\${$row}";
+            }
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        return $definedRange;
+    }
+
     /**
      * 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 = '';
 
         // Named ranges
-        if (count($this->spreadsheet->getNamedRanges()) > 0) {
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        if (count($definedNames) > 0) {
             // Loop named ranges
-            $namedRanges = $this->spreadsheet->getNamedRanges();
-            foreach ($namedRanges as $namedRange) {
-                // Create absolute coordinate
-                $range = Coordinate::splitRange($namedRange->getRange());
-                $iMax = count($range);
-                for ($i = 0; $i < $iMax; ++$i) {
-                    $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteCoordinate($range[$i][0]);
-                    if (isset($range[$i][1])) {
-                        $range[$i][1] = Coordinate::absoluteCoordinate($range[$i][1]);
-                    }
-                }
-                $range = Coordinate::buildRange($range); // e.g. Sheet1!$A$1:$B$2
+            foreach ($definedNames as $definedName) {
+                $range = $this->parseDefinedNameValue($definedName);
 
                 // parse formula
                 try {
-                    $error = $this->parser->parse($range);
+                    $this->parser->parse($range);
                     $formulaData = $this->parser->toReversePolish();
 
                     // make sure tRef3d is of type tRef3dR (0x3A)
-                    if (isset($formulaData[0]) and ($formulaData[0] == "\x7A" or $formulaData[0] == "\x5A")) {
+                    if (isset($formulaData[0]) && ($formulaData[0] == "\x7A" || $formulaData[0] == "\x5A")) {
                         $formulaData = "\x3A" . substr($formulaData, 1);
                     }
 
-                    if ($namedRange->getLocalOnly()) {
+                    if ($definedName->getLocalOnly()) {
                         // local scope
-                        $scope = $this->spreadsheet->getIndex($namedRange->getScope()) + 1;
+                        $scopeWs = $definedName->getScope();
+                        $scope = ($scopeWs === null) ? 0 : ($this->spreadsheet->getIndex($scopeWs) + 1);
                     } else {
                         // global scope
                         $scope = 0;
                     }
-                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
+                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($definedName->getName(), $formulaData, $scope, false));
                 } catch (PhpSpreadsheetException $e) {
                     // do nothing
                 }
@@ -596,9 +643,8 @@ class Workbook extends BIFFwriter
 
                 // 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();
@@ -637,13 +683,13 @@ class Workbook extends BIFFwriter
                 $formulaData = '';
                 for ($j = 0; $j < $countPrintArea; ++$j) {
                     $printAreaRect = $printArea[$j]; // e.g. A3:J6
-                    $printAreaRect[0] = Coordinate::coordinateFromString($printAreaRect[0]);
-                    $printAreaRect[1] = Coordinate::coordinateFromString($printAreaRect[1]);
+                    $printAreaRect[0] = Coordinate::indexesFromString($printAreaRect[0]);
+                    $printAreaRect[1] = Coordinate::indexesFromString($printAreaRect[1]);
 
                     $print_rowmin = $printAreaRect[0][1] - 1;
                     $print_rowmax = $printAreaRect[1][1] - 1;
-                    $print_colmin = Coordinate::columnIndexFromString($printAreaRect[0][0]) - 1;
-                    $print_colmax = Coordinate::columnIndexFromString($printAreaRect[1][0]) - 1;
+                    $print_colmin = $printAreaRect[0][0] - 1;
+                    $print_colmax = $printAreaRect[1][0] - 1;
 
                     // construct formula data manually because parser does not recognize absolute 3d cell references
                     $formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
@@ -715,8 +761,8 @@ class Workbook extends BIFFwriter
      * Write a short NAME record.
      *
      * @param string $name
-     * @param string $sheetIndex 1-based sheet index the defined name applies to. 0 = global
-     * @param integer[][] $rangeBounds range boundaries
+     * @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
@@ -754,7 +800,7 @@ class Workbook extends BIFFwriter
     /**
      * Stores the CODEPAGE biff record.
      */
-    private function writeCodepage()
+    private function writeCodepage(): void
     {
         $record = 0x0042; // Record identifier
         $length = 0x0002; // Number of bytes to follow
@@ -769,7 +815,7 @@ class Workbook extends BIFFwriter
     /**
      * Write Excel BIFF WINDOW1 record.
      */
-    private function writeWindow1()
+    private function writeWindow1(): void
     {
         $record = 0x003D; // Record identifier
         $length = 0x0012; // Number of bytes to follow
@@ -798,10 +844,9 @@ class Workbook extends BIFFwriter
     /**
      * Writes Excel BIFF BOUNDSHEET record.
      *
-     * @param Worksheet $sheet Worksheet name
      * @param int $offset Location of worksheet BOF
      */
-    private function writeBoundSheet($sheet, $offset)
+    private function writeBoundSheet(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet, $offset): void
     {
         $sheetname = $sheet->getTitle();
         $record = 0x0085; // Record identifier
@@ -829,7 +874,7 @@ class Workbook extends BIFFwriter
         // 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);
@@ -842,7 +887,7 @@ class Workbook extends BIFFwriter
     /**
      * Write Internal SUPBOOK record.
      */
-    private function writeSupbookInternal()
+    private function writeSupbookInternal(): string
     {
         $record = 0x01AE; // Record identifier
         $length = 0x0004; // Bytes to follow
@@ -857,13 +902,13 @@ class Workbook extends BIFFwriter
      * 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) {
@@ -876,7 +921,7 @@ class Workbook extends BIFFwriter
     /**
      * Write Excel BIFF STYLE records.
      */
-    private function writeStyle()
+    private function writeStyle(): void
     {
         $record = 0x0293; // Record identifier
         $length = 0x0004; // Bytes to follow
@@ -896,7 +941,7 @@ class Workbook extends BIFFwriter
      * @param string $format Custom format string
      * @param int $ifmt Format index code
      */
-    private function writeNumberFormat($format, $ifmt)
+    private function writeNumberFormat($format, $ifmt): void
     {
         $record = 0x041E; // Record identifier
 
@@ -911,7 +956,7 @@ class Workbook extends BIFFwriter
     /**
      * Write DATEMODE record to indicate the date system in use (1904 or 1900).
      */
-    private function writeDateMode()
+    private function writeDateMode(): void
     {
         $record = 0x0022; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -963,7 +1008,7 @@ class Workbook extends BIFFwriter
     /**
      * Stores the PALETTE biff record.
      */
-    private function writePalette()
+    private function writePalette(): void
     {
         $aref = $this->palette;
 
@@ -1016,7 +1061,7 @@ class Workbook extends BIFFwriter
             $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;
@@ -1056,16 +1101,15 @@ class Workbook extends BIFFwriter
                     // 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;
 
@@ -1111,7 +1155,7 @@ class Workbook extends BIFFwriter
     /**
      * 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)) {
@@ -1130,21 +1174,17 @@ class Workbook extends BIFFwriter
 
     /**
      * 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)
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
     {
-        $this->escher = $pValue;
+        $this->escher = $escher;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 5a6fa61ac..aeedd08e7 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2,19 +2,18 @@
 
 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\Cell\DataValidation;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\RichText\Run;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\Xls;
-use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
@@ -56,6 +55,12 @@ use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 // */
 class Worksheet extends BIFFwriter
 {
+    /** @var int */
+    private static $always0 = 0;
+
+    /** @var int */
+    private static $always1 = 1;
+
     /**
      * Formula parser.
      *
@@ -63,13 +68,6 @@ class Worksheet extends BIFFwriter
      */
     private $parser;
 
-    /**
-     * Maximum number of characters for a string (LABEL record in BIFF5).
-     *
-     * @var int
-     */
-    private $xlsStringMaxLength;
-
     /**
      * Array containing format information for columns.
      *
@@ -77,13 +75,6 @@ class Worksheet extends BIFFwriter
      */
     private $columnInfo;
 
-    /**
-     * Array containing the selected area for the worksheet.
-     *
-     * @var array
-     */
-    private $selection;
-
     /**
      * The active pane for the worksheet.
      *
@@ -94,7 +85,7 @@ class Worksheet extends BIFFwriter
     /**
      * Whether to use outline.
      *
-     * @var int
+     * @var bool
      */
     private $outlineOn;
 
@@ -107,17 +98,19 @@ class Worksheet extends BIFFwriter
 
     /**
      * Whether to have outline summary below.
+     * Not currently used.
      *
      * @var bool
      */
-    private $outlineBelow;
+    private $outlineBelow; //* @phpstan-ignore-line
 
     /**
      * Whether to have outline summary at the right.
+     * Not currently used.
      *
      * @var bool
      */
-    private $outlineRight;
+    private $outlineRight; //* @phpstan-ignore-line
 
     /**
      * Reference to the total number of strings in the workbook.
@@ -142,6 +135,8 @@ class Worksheet extends BIFFwriter
 
     /**
      * Color cache.
+     *
+     * @var array
      */
     private $colors;
 
@@ -180,17 +175,10 @@ class Worksheet extends BIFFwriter
      */
     public $phpSheet;
 
-    /**
-     * Count cell style Xfs.
-     *
-     * @var int
-     */
-    private $countCellStyleXfs;
-
     /**
      * Escher object corresponding to MSODRAWING.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher
+     * @var null|\PhpOffice\PhpSpreadsheet\Shared\Escher
      */
     private $escher;
 
@@ -216,8 +204,8 @@ class Worksheet extends BIFFwriter
      *
      * @param int $str_total Total number of strings
      * @param int $str_unique Total number of unique strings
-     * @param array &$str_table String Table
-     * @param array &$colors Colour Table
+     * @param array $str_table String Table
+     * @param array $colors Colour Table
      * @param Parser $parser The formula parser created for the Workbook
      * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written
      * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet The worksheet to write
@@ -236,17 +224,15 @@ class Worksheet extends BIFFwriter
 
         $this->phpSheet = $phpSheet;
 
-        $this->xlsStringMaxLength = 255;
         $this->columnInfo = [];
-        $this->selection = [0, 0, 0, 0];
         $this->activePane = 3;
 
         $this->printHeaders = 0;
 
-        $this->outlineStyle = 0;
-        $this->outlineBelow = 1;
-        $this->outlineRight = 1;
-        $this->outlineOn = 1;
+        $this->outlineStyle = false;
+        $this->outlineBelow = true;
+        $this->outlineRight = true;
+        $this->outlineOn = true;
 
         $this->fontHashIndex = [];
 
@@ -258,17 +244,15 @@ class Worksheet extends BIFFwriter
         $maxC = $this->phpSheet->getHighestColumn();
 
         // Determine lowest and highest column and row
+        $this->firstRowIndex = $minR;
         $this->lastRowIndex = ($maxR > 65535) ? 65535 : $maxR;
 
         $this->firstColumnIndex = Coordinate::columnIndexFromString($minC);
         $this->lastColumnIndex = Coordinate::columnIndexFromString($maxC);
 
-//        if ($this->firstColumnIndex > 255) $this->firstColumnIndex = 255;
         if ($this->lastColumnIndex > 255) {
             $this->lastColumnIndex = 255;
         }
-
-        $this->countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
     }
 
     /**
@@ -277,13 +261,13 @@ class Worksheet extends BIFFwriter
      *
      * @see \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook::storeWorkbook()
      */
-    public function close()
+    public function close(): void
     {
         $phpSheet = $this->phpSheet;
 
         // 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);
@@ -302,7 +286,7 @@ class Worksheet extends BIFFwriter
 
         // 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();
@@ -392,12 +376,19 @@ class Worksheet extends BIFFwriter
         // Row dimensions
         foreach ($phpSheet->getRowDimensions() as $rowDimension) {
             $xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
-            $this->writeRow($rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel());
+            $this->writeRow(
+                $rowDimension->getRowIndex() - 1,
+                (int) $rowDimension->getRowHeight(),
+                $xfIndex,
+                !$rowDimension->getVisible(),
+                $rowDimension->getOutlineLevel()
+            );
         }
 
         // 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;
 
@@ -412,15 +403,16 @@ class Worksheet extends BIFFwriter
             $cVal = $cell->getValue();
             if ($cVal instanceof RichText) {
                 $arrcRun = [];
-                $str_len = StringHelper::countCharacters($cVal->getPlainText(), 'UTF-8');
                 $str_pos = 0;
                 $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
@@ -430,6 +422,7 @@ class Worksheet extends BIFFwriter
             } 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);
@@ -453,7 +446,7 @@ class Worksheet extends BIFFwriter
                             switch ($calctype) {
                                 case 'integer':
                                 case 'double':
-                                    $this->writeNumber($row, $column, $calculatedValue, $xfIndex);
+                                    $this->writeNumber($row, $column, (float) $calculatedValue, $xfIndex);
 
                                     break;
                                 case 'string':
@@ -461,7 +454,7 @@ class Worksheet extends BIFFwriter
 
                                     break;
                                 case 'boolean':
-                                    $this->writeBoolErr($row, $column, $calculatedValue, 0, $xfIndex);
+                                    $this->writeBoolErr($row, $column, (int) $calculatedValue, 0, $xfIndex);
 
                                     break;
                                 default:
@@ -475,7 +468,7 @@ class Worksheet extends BIFFwriter
 
                         break;
                     case DataType::TYPE_ERROR:
-                        $this->writeBoolErr($row, $column, self::mapErrorCode($cVal), 1, $xfIndex);
+                        $this->writeBoolErr($row, $column, ErrorCode::error($cVal), 1, $xfIndex);
 
                         break;
                 }
@@ -486,7 +479,7 @@ class Worksheet extends BIFFwriter
         $this->writeMsoDrawing();
 
         // Restoring active sheet.
-        $this->phpSheet->getParent()->setActiveSheetIndex($activeSheetIndex);
+        $this->phpSheet->getParentOrThrow()->setActiveSheetIndex($activeSheetIndex);
 
         // Write WINDOW2 record
         $this->writeWindow2();
@@ -510,8 +503,10 @@ class Worksheet extends BIFFwriter
         $this->writeMergedCells();
 
         // Hyperlinks
+        $phpParent = $phpSheet->getParent();
+        $hyperlinkbase = ($phpParent === null) ? '' : $phpParent->getProperties()->getHyperlinkBase();
         foreach ($phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
-            [$column, $row] = Coordinate::coordinateFromString($coordinate);
+            [$column, $row] = Coordinate::indexesFromString($coordinate);
 
             $url = $hyperlink->getUrl();
 
@@ -520,12 +515,17 @@ class Worksheet extends BIFFwriter
                 $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;
             }
 
-            $this->writeUrl($row - 1, Coordinate::columnIndexFromString($column) - 1, $url);
+            $this->writeUrl($row - 1, $column - 1, $url);
         }
 
         $this->writeDataValidity();
@@ -535,30 +535,44 @@ class Worksheet extends BIFFwriter
         $this->writeSheetProtection();
         $this->writeRangeProtection();
 
-        $arrConditionalStyles = $phpSheet->getConditionalStylesCollection();
+        // Write Conditional Formatting Rules and Styles
+        $this->writeConditionalFormatting();
+
+        $this->storeEof();
+    }
+
+    private function writeConditionalFormatting(): void
+    {
+        $conditionalFormulaHelper = new ConditionalHelper($this->parser);
+
+        $arrConditionalStyles = $this->phpSheet->getConditionalStylesCollection();
         if (!empty($arrConditionalStyles)) {
             $arrConditional = [];
-            // @todo CFRule & CFHeader
-            // Write CFHEADER record
-            $this->writeCFHeader();
+
             // Write ConditionalFormattingTable records
             foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
+                $cfHeaderWritten = false;
                 foreach ($conditionalStyles as $conditional) {
-                    if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
-                        || $conditional->getConditionType() == Conditional::CONDITION_CELLIS) {
-                        if (!isset($arrConditional[$conditional->getHashCode()])) {
+                    /** @var Conditional $conditional */
+                    if (
+                        $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) {
+                            $cfHeaderWritten = $this->writeCFHeader($cellCoordinate, $conditionalStyles);
+                        }
+                        if ($cfHeaderWritten === true && !isset($arrConditional[$conditional->getHashCode()])) {
                             // This hash code has been handled
                             $arrConditional[$conditional->getHashCode()] = true;
 
                             // Write CFRULE record
-                            $this->writeCFRule($conditional);
+                            $this->writeCFRule($conditionalFormulaHelper, $conditional, $cellCoordinate);
                         }
                     }
                 }
             }
         }
-
-        $this->storeEof();
     }
 
     /**
@@ -584,31 +598,30 @@ class Worksheet extends BIFFwriter
             $lastCell = $explodes[1];
         }
 
-        $firstCellCoordinates = Coordinate::coordinateFromString($firstCell); // e.g. [0, 1]
-        $lastCellCoordinates = Coordinate::coordinateFromString($lastCell); // e.g. [1, 6]
+        $firstCellCoordinates = Coordinate::indexesFromString($firstCell); // e.g. [0, 1]
+        $lastCellCoordinates = Coordinate::indexesFromString($lastCell); // e.g. [1, 6]
 
-        return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, Coordinate::columnIndexFromString($firstCellCoordinates[0]) - 1, Coordinate::columnIndexFromString($lastCellCoordinates[0]) - 1);
+        return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, $firstCellCoordinates[0] - 1, $lastCellCoordinates[0] - 1);
     }
 
     /**
-     * Retrieves data from memory in one chunk, or from disk in $buffer
+     * Retrieves data from memory in one chunk, or from disk
      * sized chunks.
      *
      * @return string The data
      */
     public function getData()
     {
-        $buffer = 4096;
-
         // Return data stored in memory
         if (isset($this->_data)) {
             $tmp = $this->_data;
-            unset($this->_data);
+            $this->_data = null;
 
             return $tmp;
         }
+
         // No data to return
-        return false;
+        return '';
     }
 
     /**
@@ -616,7 +629,7 @@ class Worksheet extends BIFFwriter
      *
      * @param int $print Whether to print the headers or not. Defaults to 1 (print).
      */
-    public function printRowColHeaders($print = 1)
+    public function printRowColHeaders($print = 1): void
     {
         $this->printHeaders = $print;
     }
@@ -630,17 +643,12 @@ class Worksheet extends BIFFwriter
      * @param bool $symbols_right
      * @param bool $auto_style
      */
-    public function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false)
+    public function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false): void
     {
         $this->outlineOn = $visible;
         $this->outlineBelow = $symbols_below;
         $this->outlineRight = $symbols_right;
         $this->outlineStyle = $auto_style;
-
-        // Ensure this is a boolean vale for Window2
-        if ($this->outlineOn) {
-            $this->outlineOn = 1;
-        }
     }
 
     /**
@@ -683,7 +691,7 @@ class Worksheet extends BIFFwriter
      * @param string $str The string
      * @param int $xfIndex Index to XF record
      */
-    private function writeString($row, $col, $str, $xfIndex)
+    private function writeString($row, $col, $str, $xfIndex): void
     {
         $this->writeLabelSst($row, $col, $str, $xfIndex);
     }
@@ -698,7 +706,7 @@ class Worksheet extends BIFFwriter
      * @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)
+    private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun): void
     {
         $record = 0x00FD; // Record identifier
         $length = 0x000A; // Bytes to follow
@@ -725,7 +733,7 @@ class Worksheet extends BIFFwriter
      * @param string $str The string to write
      * @param mixed $xfIndex The XF format index for the cell
      */
-    private function writeLabelSst($row, $col, $str, $xfIndex)
+    private function writeLabelSst($row, $col, $str, $xfIndex): void
     {
         $record = 0x00FD; // Record identifier
         $length = 0x000A; // Bytes to follow
@@ -779,7 +787,7 @@ class Worksheet extends BIFFwriter
      * @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 $isError Error or Boolean?
      * @param int $xfIndex
      *
      * @return int
@@ -801,6 +809,19 @@ class Worksheet extends BIFFwriter
     const WRITE_FORMULA_RANGE = -2;
     const WRITE_FORMULA_EXCEPTION = -3;
 
+    /** @var bool */
+    private static $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
@@ -822,7 +843,6 @@ class Worksheet extends BIFFwriter
     private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
     {
         $record = 0x0006; // Record identifier
-
         // Initialize possible additional value for STRING record that should be written after the FORMULA record?
         $stringValue = null;
 
@@ -840,7 +860,7 @@ class Worksheet extends BIFFwriter
                 $errorCodes = DataType::getErrorCodes();
                 if (isset($errorCodes[$calculatedValue])) {
                     // Error value
-                    $num = pack('CCCvCv', 0x02, 0x00, self::mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
+                    $num = pack('CCCvCv', 0x02, 0x00, ErrorCode::error($calculatedValue), 0x00, 0x00, 0xFFFF);
                 } elseif ($calculatedValue === '') {
                     // Empty string (and BIFF8)
                     $num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
@@ -872,7 +892,7 @@ class Worksheet extends BIFFwriter
 
         // Parse the formula using the parser in Parser.php
         try {
-            $error = $this->parser->parse($formula);
+            $this->parser->parse($formula);
             $formula = $this->parser->toReversePolish();
 
             $formlen = strlen($formula); // Length of the binary string
@@ -881,8 +901,8 @@ class Worksheet extends BIFFwriter
             $header = pack('vv', $record, $length);
 
             $data = pack('vvv', $row, $col, $xfIndex)
-                        . $num
-                        . pack('vVv', $grbit, $unknown, $formlen);
+                . $num
+                . pack('vVv', $grbit, $unknown, $formlen);
             $this->append($header . $data . $formula);
 
             // Append also a STRING record if necessary
@@ -892,6 +912,10 @@ class Worksheet extends BIFFwriter
 
             return self::WRITE_FORMULA_NORMAL;
         } catch (PhpSpreadsheetException $e) {
+            if (self::$allowThrow) {
+                throw $e;
+            }
+
             return self::WRITE_FORMULA_EXCEPTION;
         }
     }
@@ -901,7 +925,7 @@ class Worksheet extends BIFFwriter
      *
      * @param string $stringValue
      */
-    private function writeStringRecord($stringValue)
+    private function writeStringRecord($stringValue): void
     {
         $record = 0x0207; // Record identifier
         $data = StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
@@ -923,20 +947,14 @@ class Worksheet extends BIFFwriter
      * The hyperlink can be to a http, ftp, mail, internal sheet (not yet), or external
      * directory url.
      *
-     * Returns  0 : normal termination
-     *         -2 : row or column out of range
-     *         -3 : long string truncated to 255 chars
-     *
      * @param int $row Row
      * @param int $col Column
      * @param string $url URL string
-     *
-     * @return int
      */
-    private function writeUrl($row, $col, $url)
+    private function writeUrl($row, $col, $url): void
     {
         // Add start row and col to arg list
-        return $this->writeUrlRange($row, $col, $row, $col, $url);
+        $this->writeUrlRange($row, $col, $row, $col, $url);
     }
 
     /**
@@ -945,27 +963,25 @@ class Worksheet extends BIFFwriter
      * to be written. These are either, Web (http, ftp, mailto), Internal
      * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
      *
-     * @see writeUrl()
-     *
      * @param int $row1 Start row
      * @param int $col1 Start column
      * @param int $row2 End row
      * @param int $col2 End column
      * @param string $url URL string
      *
-     * @return int
+     * @see writeUrl()
      */
-    public function writeUrlRange($row1, $col1, $row2, $col2, $url)
+    private function writeUrlRange($row1, $col1, $row2, $col2, $url): void
     {
         // Check for internal/external sheet links or default to web link
         if (preg_match('[^internal:]', $url)) {
-            return $this->writeUrlInternal($row1, $col1, $row2, $col2, $url);
+            $this->writeUrlInternal($row1, $col1, $row2, $col2, $url);
         }
         if (preg_match('[^external:]', $url)) {
-            return $this->writeUrlExternal($row1, $col1, $row2, $col2, $url);
+            $this->writeUrlExternal($row1, $col1, $row2, $col2, $url);
         }
 
-        return $this->writeUrlWeb($row1, $col1, $row2, $col2, $url);
+        $this->writeUrlWeb($row1, $col1, $row2, $col2, $url);
     }
 
     /**
@@ -973,20 +989,17 @@ class Worksheet extends BIFFwriter
      * The link type ($options) is 0x03 is the same as absolute dir ref without
      * sheet. However it is differentiated by the $unknown2 data stream.
      *
-     * @see writeUrl()
-     *
      * @param int $row1 Start row
      * @param int $col1 Start column
      * @param int $row2 End row
      * @param int $col2 End column
      * @param string $url URL string
      *
-     * @return int
+     * @see writeUrl()
      */
-    public function writeUrlWeb($row1, $col1, $row2, $col2, $url)
+    public function writeUrlWeb($row1, $col1, $row2, $col2, $url): void
     {
         $record = 0x01B8; // Record identifier
-        $length = 0x00000; // Bytes to follow
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
@@ -996,6 +1009,8 @@ class Worksheet extends BIFFwriter
         $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";
 
@@ -1011,30 +1026,25 @@ class Worksheet extends BIFFwriter
 
         // Write the packed data
         $this->append($header . $data . $unknown1 . $options . $unknown2 . $url_len . $url);
-
-        return 0;
     }
 
     /**
      * Used to write internal reference hyperlinks such as "Sheet1!A1".
      *
-     * @see writeUrl()
-     *
      * @param int $row1 Start row
      * @param int $col1 Start column
      * @param int $row2 End row
      * @param int $col2 End column
      * @param string $url URL string
      *
-     * @return int
+     * @see writeUrl()
      */
-    public function writeUrlInternal($row1, $col1, $row2, $col2, $url)
+    private function writeUrlInternal($row1, $col1, $row2, $col2, $url): void
     {
         $record = 0x01B8; // Record identifier
-        $length = 0x00000; // Bytes to follow
 
         // 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');
@@ -1060,8 +1070,6 @@ class Worksheet extends BIFFwriter
 
         // Write the packed data
         $this->append($header . $data . $unknown1 . $options . $url_len . $url);
-
-        return 0;
     }
 
     /**
@@ -1071,31 +1079,27 @@ class Worksheet extends BIFFwriter
      * Note: Excel writes some relative links with the $dir_long string. We ignore
      * these cases for the sake of simpler code.
      *
-     * @see writeUrl()
-     *
      * @param int $row1 Start row
      * @param int $col1 Start column
      * @param int $row2 End row
      * @param int $col2 End column
      * @param string $url URL string
      *
-     * @return int
+     * @see writeUrl()
      */
-    public function writeUrlExternal($row1, $col1, $row2, $col2, $url)
+    private function writeUrlExternal($row1, $col1, $row2, $col2, $url): void
     {
         // Network drives are different. We will handle them separately
         // MS/Novell network drives and shares start with \\
         if (preg_match('[^external:\\\\]', $url)) {
-            return; //($this->writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
+            return;
         }
 
         $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"
@@ -1124,32 +1128,32 @@ class Worksheet extends BIFFwriter
         $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; /*.
+            $unknown1 .
+            $link_type .
+            $unknown2 .
+            $up_count .
+            $dir_short_len .
+            $dir_short .
+            $unknown3 .
+            $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .
@@ -1162,8 +1166,6 @@ class Worksheet extends BIFFwriter
 
         // Write the packed data
         $this->append($header . $data);
-
-        return 0;
     }
 
     /**
@@ -1176,7 +1178,7 @@ class Worksheet extends BIFFwriter
      * @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)
+    private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0): void
     {
         $record = 0x0208; // Record identifier
         $length = 0x0010; // Number of bytes to follow
@@ -1193,7 +1195,7 @@ class Worksheet extends BIFFwriter
         }
 
         // Use writeRow($row, null, $XF) to set XF format without setting height
-        if ($height != null) {
+        if ($height !== null) {
             $miyRw = $height * 20; // row height
         } else {
             $miyRw = 0xff; // default row height is 256
@@ -1206,7 +1208,7 @@ class Worksheet extends BIFFwriter
         // collapsed. The zero height flag, 0x20, is used to collapse a row.
 
         $grbit |= $level;
-        if ($hidden) {
+        if ($hidden === true) {
             $grbit |= 0x0030;
         }
         if ($height !== null) {
@@ -1225,7 +1227,7 @@ class Worksheet extends BIFFwriter
     /**
      * Writes Excel DIMENSIONS to define the area in which there is data.
      */
-    private function writeDimensions()
+    private function writeDimensions(): void
     {
         $record = 0x0200; // Record identifier
 
@@ -1239,12 +1241,11 @@ class Worksheet extends BIFFwriter
     /**
      * Write BIFF record Window2.
      */
-    private function writeWindow2()
+    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
 
@@ -1259,7 +1260,7 @@ class Worksheet extends BIFFwriter
         $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;
@@ -1291,7 +1292,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write BIFF record DEFAULTROWHEIGHT.
      */
-    private function writeDefaultRowHeight()
+    private function writeDefaultRowHeight(): void
     {
         $defaultRowHeight = $this->phpSheet->getDefaultRowDimension()->getRowHeight();
 
@@ -1313,7 +1314,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
      */
-    private function writeDefcol()
+    private function writeDefcol(): void
     {
         $defaultColWidth = 8;
 
@@ -1339,34 +1340,15 @@ class Worksheet extends BIFFwriter
      *                4 => Option flags.
      *                5 => Optional outline level
      */
-    private function writeColinfo($col_array)
+    private function writeColinfo($col_array): void
     {
-        if (isset($col_array[0])) {
-            $colFirst = $col_array[0];
-        }
-        if (isset($col_array[1])) {
-            $colLast = $col_array[1];
-        }
-        if (isset($col_array[2])) {
-            $coldx = $col_array[2];
-        } else {
-            $coldx = 8.43;
-        }
-        if (isset($col_array[3])) {
-            $xfIndex = $col_array[3];
-        } else {
-            $xfIndex = 15;
-        }
-        if (isset($col_array[4])) {
-            $grbit = $col_array[4];
-        } else {
-            $grbit = 0;
-        }
-        if (isset($col_array[5])) {
-            $level = $col_array[5];
-        } else {
-            $level = 0;
-        }
+        $colFirst = $col_array[0] ?? null;
+        $colLast = $col_array[1] ?? null;
+        $coldx = $col_array[2] ?? 8.43;
+        $xfIndex = $col_array[3] ?? 15;
+        $grbit = $col_array[4] ?? 0;
+        $level = $col_array[5] ?? 0;
+
         $record = 0x007D; // Record identifier
         $length = 0x000C; // Number of bytes to follow
 
@@ -1386,7 +1368,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write BIFF record SELECTION.
      */
-    private function writeSelection()
+    private function writeSelection(): void
     {
         // look up the selected cell range
         $selectedCells = Coordinate::splitRange($this->phpSheet->getSelectedCells());
@@ -1422,13 +1404,6 @@ class Worksheet extends BIFFwriter
         $irefAct = 0; // Active cell ref
         $cref = 1; // Number of refs
 
-        if (!isset($rwLast)) {
-            $rwLast = $rwFirst; // Last  row in reference
-        }
-        if (!isset($colLast)) {
-            $colLast = $colFirst; // Last  col in reference
-        }
-
         // Swap last row/col for first row/col as necessary
         if ($rwFirst > $rwLast) {
             [$rwFirst, $rwLast] = [$rwLast, $rwFirst];
@@ -1446,7 +1421,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the MERGEDCELLS records for all ranges of merged cells.
      */
-    private function writeMergedCells()
+    private function writeMergedCells(): void
     {
         $mergeCells = $this->phpSheet->getMergeCells();
         $countMergeCells = count($mergeCells);
@@ -1478,13 +1453,13 @@ class Worksheet extends BIFFwriter
             // extract the row and column indexes
             $range = Coordinate::splitRange($mergeCell);
             [$first, $last] = $range[0];
-            [$firstColumn, $firstRow] = Coordinate::coordinateFromString($first);
-            [$lastColumn, $lastRow] = Coordinate::coordinateFromString($last);
+            [$firstColumn, $firstRow] = Coordinate::indexesFromString($first);
+            [$lastColumn, $lastRow] = Coordinate::indexesFromString($last);
 
-            $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, Coordinate::columnIndexFromString($firstColumn) - 1, Coordinate::columnIndexFromString($lastColumn) - 1);
+            $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, $firstColumn - 1, $lastColumn - 1);
 
             // flush record if we have reached limit for number of merged cells, or reached final merged cell
-            if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
+            if ($j == $maxCountMergeCellsPerRecord || $i == $countMergeCells) {
                 $recordData = pack('v', $j) . $recordData;
                 $length = strlen($recordData);
                 $header = pack('vv', $record, $length);
@@ -1500,7 +1475,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write SHEETLAYOUT record.
      */
-    private function writeSheetLayout()
+    private function writeSheetLayout(): void
     {
         if (!$this->phpSheet->isTabColorSet()) {
             return;
@@ -1524,30 +1499,49 @@ class Worksheet extends BIFFwriter
         $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.
      */
-    private function writeSheetProtection()
+    private function writeSheetProtection(): void
     {
         // record identifier
         $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(
@@ -1571,10 +1565,10 @@ class Worksheet extends BIFFwriter
     /**
      * Write BIFF record RANGEPROTECTION.
      *
-     * Openoffice.org's Documentaion of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
+     * Openoffice.org's Documentation of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
      * Microsoft Office Excel 97-2007 Binary File Format Specification uses term FEAT for these records
      */
-    private function writeRangeProtection()
+    private function writeRangeProtection(): void
     {
         foreach ($this->phpSheet->getProtectedCells() as $range => $password) {
             // number of ranges, e.g. 'A1:B3 C20:D25'
@@ -1622,78 +1616,39 @@ class Worksheet extends BIFFwriter
      * Frozen panes are specified in terms of an integer number of rows and columns.
      * Thawed panes are specified in terms of Excel's units for rows and columns.
      */
-    private function writePanes()
+    private function writePanes(): void
     {
-        $panes = [];
-        if ($this->phpSheet->getFreezePane()) {
-            [$column, $row] = Coordinate::coordinateFromString($this->phpSheet->getFreezePane());
-            $panes[0] = Coordinate::columnIndexFromString($column) - 1;
-            $panes[1] = $row - 1;
-
-            [$leftMostColumn, $topRow] = Coordinate::coordinateFromString($this->phpSheet->getTopLeftCell());
-            //Coordinates are zero-based in xls files
-            $panes[2] = $topRow - 1;
-            $panes[3] = Coordinate::columnIndexFromString($leftMostColumn) - 1;
-        } else {
+        if (!$this->phpSheet->getFreezePane()) {
             // thaw panes
             return;
         }
 
-        $x = $panes[0] ?? null;
-        $y = $panes[1] ?? null;
-        $rwTop = $panes[2] ?? null;
-        $colLeft = $panes[3] ?? null;
-        if (count($panes) > 4) { // if Active pane was received
-            $pnnAct = $panes[4];
-        } else {
-            $pnnAct = null;
-        }
+        [$column, $row] = Coordinate::indexesFromString($this->phpSheet->getFreezePane());
+        $x = $column - 1;
+        $y = $row - 1;
+
+        [$leftMostColumn, $topRow] = Coordinate::indexesFromString($this->phpSheet->getTopLeftCell() ?? '');
+        //Coordinates are zero-based in xls files
+        $rwTop = $topRow - 1;
+        $colLeft = $leftMostColumn - 1;
+
         $record = 0x0041; // Record identifier
         $length = 0x000A; // Number of bytes to follow
 
-        // Code specific to frozen or thawed panes.
-        if ($this->phpSheet->getFreezePane()) {
-            // Set default values for $rwTop and $colLeft
-            if (!isset($rwTop)) {
-                $rwTop = $y;
-            }
-            if (!isset($colLeft)) {
-                $colLeft = $x;
-            }
-        } else {
-            // Set default values for $rwTop and $colLeft
-            if (!isset($rwTop)) {
-                $rwTop = 0;
-            }
-            if (!isset($colLeft)) {
-                $colLeft = 0;
-            }
-
-            // Convert Excel's row and column units to the internal units.
-            // The default row height is 12.75
-            // The default column width is 8.43
-            // The following slope and intersection values were interpolated.
-            //
-            $y = 20 * $y + 255;
-            $x = 113.879 * $x + 390;
-        }
-
         // Determine which pane should be active. There is also the undocumented
         // option to override this should it be necessary: may be removed later.
-        //
-        if (!isset($pnnAct)) {
-            if ($x != 0 && $y != 0) {
-                $pnnAct = 0; // Bottom right
-            }
-            if ($x != 0 && $y == 0) {
-                $pnnAct = 1; // Top right
-            }
-            if ($x == 0 && $y != 0) {
-                $pnnAct = 2; // Bottom left
-            }
-            if ($x == 0 && $y == 0) {
-                $pnnAct = 3; // Top left
-            }
+        $pnnAct = 0;
+        if ($x != 0 && $y != 0) {
+            $pnnAct = 0; // Bottom right
+        }
+        if ($x != 0 && $y == 0) {
+            $pnnAct = 1; // Top right
+        }
+        if ($x == 0 && $y != 0) {
+            $pnnAct = 2; // Bottom left
+        }
+        if ($x == 0 && $y == 0) {
+            $pnnAct = 3; // Top left
         }
 
         $this->activePane = $pnnAct; // Used in writeSelection
@@ -1706,20 +1661,17 @@ class Worksheet extends BIFFwriter
     /**
      * Store the page setup SETUP BIFF record.
      */
-    private function writeSetup()
+    private function writeSetup(): void
     {
         $record = 0x00A1; // Record identifier
         $length = 0x0022; // Number of bytes to follow
 
         $iPaperSize = $this->phpSheet->getPageSetup()->getPaperSize(); // Paper size
-
-        $iScale = $this->phpSheet->getPageSetup()->getScale() ?
-            $this->phpSheet->getPageSetup()->getScale() : 100; // Print scaling factor
+        $iScale = $this->phpSheet->getPageSetup()->getScale() ?: 100; // Print scaling factor
 
         $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
 
@@ -1728,11 +1680,12 @@ class Worksheet extends BIFFwriter
         $numFtr = $this->phpSheet->getPageMargins()->getFooter(); // Footer Margin
         $iCopies = 0x01; // Number of copies
 
-        $fLeftToRight = 0x0; // Print over then down
-
+        // Order of printing pages
+        $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() === PageSetup::PAGEORDER_DOWN_THEN_OVER
+            ? 0x0 : 0x1;
         // Page orientation
-        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE) ?
-            0x0 : 0x1;
+        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
+            ? 0x0 : 0x1;
 
         $fNoPls = 0x0; // Setup not read from printer
         $fNoColor = 0x0; // Print black and white
@@ -1767,7 +1720,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the header caption BIFF record.
      */
-    private function writeHeader()
+    private function writeHeader(): void
     {
         $record = 0x0014; // Record identifier
 
@@ -1791,7 +1744,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the footer caption BIFF record.
      */
-    private function writeFooter()
+    private function writeFooter(): void
     {
         $record = 0x0015; // Record identifier
 
@@ -1815,7 +1768,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the horizontal centering HCENTER BIFF record.
      */
-    private function writeHcenter()
+    private function writeHcenter(): void
     {
         $record = 0x0083; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1831,7 +1784,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the vertical centering VCENTER BIFF record.
      */
-    private function writeVcenter()
+    private function writeVcenter(): void
     {
         $record = 0x0084; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1846,7 +1799,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the LEFTMARGIN BIFF record.
      */
-    private function writeMarginLeft()
+    private function writeMarginLeft(): void
     {
         $record = 0x0026; // Record identifier
         $length = 0x0008; // Bytes to follow
@@ -1865,7 +1818,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the RIGHTMARGIN BIFF record.
      */
-    private function writeMarginRight()
+    private function writeMarginRight(): void
     {
         $record = 0x0027; // Record identifier
         $length = 0x0008; // Bytes to follow
@@ -1884,7 +1837,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the TOPMARGIN BIFF record.
      */
-    private function writeMarginTop()
+    private function writeMarginTop(): void
     {
         $record = 0x0028; // Record identifier
         $length = 0x0008; // Bytes to follow
@@ -1903,7 +1856,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the BOTTOMMARGIN BIFF record.
      */
-    private function writeMarginBottom()
+    private function writeMarginBottom(): void
     {
         $record = 0x0029; // Record identifier
         $length = 0x0008; // Bytes to follow
@@ -1922,7 +1875,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write the PRINTHEADERS BIFF record.
      */
-    private function writePrintHeaders()
+    private function writePrintHeaders(): void
     {
         $record = 0x002a; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1938,7 +1891,7 @@ class Worksheet extends BIFFwriter
      * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
      * GRIDSET record.
      */
-    private function writePrintGridlines()
+    private function writePrintGridlines(): void
     {
         $record = 0x002b; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1954,7 +1907,7 @@ class Worksheet extends BIFFwriter
      * Write the GRIDSET BIFF record. Must be used in conjunction with the
      * PRINTGRIDLINES record.
      */
-    private function writeGridset()
+    private function writeGridset(): void
     {
         $record = 0x0082; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1969,7 +1922,7 @@ class Worksheet extends BIFFwriter
     /**
      * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
      */
-    private function writeAutoFilterInfo()
+    private function writeAutoFilterInfo(): void
     {
         $record = 0x009D; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -1989,7 +1942,7 @@ class Worksheet extends BIFFwriter
      *
      * @see writeWsbool()
      */
-    private function writeGuts()
+    private function writeGuts(): void
     {
         $record = 0x0080; // Record identifier
         $length = 0x0008; // Bytes to follow
@@ -2033,7 +1986,7 @@ class Worksheet extends BIFFwriter
      * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
      * with the SETUP record.
      */
-    private function writeWsbool()
+    private function writeWsbool(): void
     {
         $record = 0x0081; // Record identifier
         $length = 0x0002; // Bytes to follow
@@ -2068,33 +2021,21 @@ class Worksheet extends BIFFwriter
     /**
      * Write the HORIZONTALPAGEBREAKS and VERTICALPAGEBREAKS BIFF records.
      */
-    private function writeBreaks()
+    private function writeBreaks(): void
     {
         // initialize
         $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
@@ -2151,10 +2092,10 @@ class Worksheet extends BIFFwriter
     /**
      * Set the Biff PROTECT record to indicate that the worksheet is protected.
      */
-    private function writeProtect()
+    private function writeProtect(): void
     {
         // Exit unless sheet protection has been specified
-        if (!$this->phpSheet->getProtection()->getSheet()) {
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
             return;
         }
 
@@ -2172,15 +2113,15 @@ class Worksheet extends BIFFwriter
     /**
      * Write SCENPROTECT.
      */
-    private function writeScenProtect()
+    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;
         }
 
@@ -2196,15 +2137,15 @@ class Worksheet extends BIFFwriter
     /**
      * Write OBJECTPROTECT.
      */
-    private function writeObjectProtect()
+    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;
         }
 
@@ -2220,10 +2161,10 @@ class Worksheet extends BIFFwriter
     /**
      * Write the worksheet PASSWORD record.
      */
-    private function writePassword()
+    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;
         }
 
@@ -2249,9 +2190,11 @@ class Worksheet extends BIFFwriter
      * @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)
+    public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1): void
     {
-        $bitmap_array = (is_resource($bitmap) ? $this->processBitmapGd($bitmap) : $this->processBitmap($bitmap));
+        $bitmap_array = (is_resource($bitmap) || $bitmap instanceof GdImage
+            ? $this->processBitmapGd($bitmap)
+            : $this->processBitmap($bitmap));
         [$width, $height, $size, $data] = $bitmap_array;
 
         // Scale the frame of the image.
@@ -2259,7 +2202,7 @@ class Worksheet extends BIFFwriter
         $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;
@@ -2322,7 +2265,7 @@ class Worksheet extends BIFFwriter
      * @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)
+    public function positionImage($col_start, $row_start, $x1, $y1, $width, $height): void
     {
         // Initialise end cell to the same as the start cell
         $col_end = $col_start; // Col containing lower right corner of object
@@ -2389,7 +2332,7 @@ class Worksheet extends BIFFwriter
      * @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)
+    private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB): void
     {
         $record = 0x005d; // Record identifier
         $length = 0x003c; // Bytes to follow
@@ -2457,7 +2400,7 @@ class Worksheet extends BIFFwriter
     /**
      * Convert a GD-image into the internal format.
      *
-     * @param resource $image The image to process
+     * @param GdImage|resource $image The image to process
      *
      * @return array Array with data and properties of the bitmap
      */
@@ -2469,11 +2412,14 @@ class Worksheet extends BIFFwriter
         $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);
@@ -2496,12 +2442,12 @@ class Worksheet extends BIFFwriter
     {
         // Open file.
         $bmp_fd = @fopen($bitmap, 'rb');
-        if (!$bmp_fd) {
+        if ($bmp_fd === false) {
             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) {
@@ -2509,8 +2455,9 @@ class Worksheet extends BIFFwriter
         }
 
         // 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");
         }
 
@@ -2520,7 +2467,7 @@ class Worksheet extends BIFFwriter
         // 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.
@@ -2530,7 +2477,7 @@ class Worksheet extends BIFFwriter
         $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);
@@ -2544,7 +2491,7 @@ class Worksheet extends BIFFwriter
         // 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) {
@@ -2555,7 +2502,7 @@ class Worksheet extends BIFFwriter
         $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");
         }
 
@@ -2573,7 +2520,7 @@ class Worksheet extends BIFFwriter
      * Store the window zoom factor. This should be a reduced fraction but for
      * simplicity we will store all fractions with a numerator of 100.
      */
-    private function writeZoom()
+    private function writeZoom(): void
     {
         // If scale is 100 we don't need to write a record
         if ($this->phpSheet->getSheetView()->getZoomScale() == 100) {
@@ -2590,28 +2537,24 @@ class Worksheet extends BIFFwriter
 
     /**
      * 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)
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
     {
-        $this->escher = $pValue;
+        $this->escher = $escher;
     }
 
     /**
      * Write MSODRAWING record.
      */
-    private function writeMsoDrawing()
+    private function writeMsoDrawing(): void
     {
         // write the Escher stream if necessary
         if (isset($this->escher)) {
@@ -2696,7 +2639,7 @@ class Worksheet extends BIFFwriter
     /**
      * Store the DATAVALIDATIONS and DATAVALIDATION records.
      */
-    private function writeDataValidity()
+    private function writeDataValidity(): void
     {
         // Datavalidation collection
         $dataValidationCollection = $this->phpSheet->getDataValidationCollection();
@@ -2720,67 +2663,16 @@ class Worksheet extends BIFFwriter
             $record = 0x01BE; // Record identifier
 
             foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
-                // initialize record data
-                $data = '';
-
                 // options
                 $options = 0x00000000;
 
                 // data type
-                $type = 0x00;
-                switch ($dataValidation->getType()) {
-                    case DataValidation::TYPE_NONE:
-                        $type = 0x00;
-
-                        break;
-                    case DataValidation::TYPE_WHOLE:
-                        $type = 0x01;
-
-                        break;
-                    case DataValidation::TYPE_DECIMAL:
-                        $type = 0x02;
-
-                        break;
-                    case DataValidation::TYPE_LIST:
-                        $type = 0x03;
-
-                        break;
-                    case DataValidation::TYPE_DATE:
-                        $type = 0x04;
-
-                        break;
-                    case DataValidation::TYPE_TIME:
-                        $type = 0x05;
-
-                        break;
-                    case DataValidation::TYPE_TEXTLENGTH:
-                        $type = 0x06;
-
-                        break;
-                    case DataValidation::TYPE_CUSTOM:
-                        $type = 0x07;
-
-                        break;
-                }
+                $type = CellDataValidation::type($dataValidation);
 
                 $options |= $type << 0;
 
                 // error style
-                $errorStyle = 0x00;
-                switch ($dataValidation->getErrorStyle()) {
-                    case DataValidation::STYLE_STOP:
-                        $errorStyle = 0x00;
-
-                        break;
-                    case DataValidation::STYLE_WARNING:
-                        $errorStyle = 0x01;
-
-                        break;
-                    case DataValidation::STYLE_INFORMATION:
-                        $errorStyle = 0x02;
-
-                        break;
-                }
+                $errorStyle = CellDataValidation::errorStyle($dataValidation);
 
                 $options |= $errorStyle << 4;
 
@@ -2802,41 +2694,7 @@ class Worksheet extends BIFFwriter
                 $options |= $dataValidation->getShowErrorMessage() << 19;
 
                 // condition operator
-                $operator = 0x00;
-                switch ($dataValidation->getOperator()) {
-                    case DataValidation::OPERATOR_BETWEEN:
-                        $operator = 0x00;
-
-                        break;
-                    case DataValidation::OPERATOR_NOTBETWEEN:
-                        $operator = 0x01;
-
-                        break;
-                    case DataValidation::OPERATOR_EQUAL:
-                        $operator = 0x02;
-
-                        break;
-                    case DataValidation::OPERATOR_NOTEQUAL:
-                        $operator = 0x03;
-
-                        break;
-                    case DataValidation::OPERATOR_GREATERTHAN:
-                        $operator = 0x04;
-
-                        break;
-                    case DataValidation::OPERATOR_LESSTHAN:
-                        $operator = 0x05;
-
-                        break;
-                    case DataValidation::OPERATOR_GREATERTHANOREQUAL:
-                        $operator = 0x06;
-
-                        break;
-                    case DataValidation::OPERATOR_LESSTHANOREQUAL:
-                        $operator = 0x07;
-
-                        break;
-                }
+                $operator = CellDataValidation::operator($dataValidation);
 
                 $options |= $operator << 20;
 
@@ -2906,46 +2764,17 @@ class Worksheet extends BIFFwriter
         }
     }
 
-    /**
-     * Map Error code.
-     *
-     * @param string $errorCode
-     *
-     * @return int
-     */
-    private static function mapErrorCode($errorCode)
-    {
-        switch ($errorCode) {
-            case '#NULL!':
-                return 0x00;
-            case '#DIV/0!':
-                return 0x07;
-            case '#VALUE!':
-                return 0x0F;
-            case '#REF!':
-                return 0x17;
-            case '#NAME?':
-                return 0x1D;
-            case '#NUM!':
-                return 0x24;
-            case '#N/A':
-                return 0x2A;
-        }
-
-        return 0;
-    }
-
     /**
      * Write PLV Record.
      */
-    private function writePageLayoutView()
+    private function writePageLayoutView(): void
     {
         $record = 0x088B; // Record identifier
         $length = 0x0010; // Bytes to follow
 
         $rt = 0x088B; // 2
         $grbitFrt = 0x0000; // 2
-        $reserved = 0x0000000000000000; // 8
+        //$reserved = 0x0000000000000000; // 8
         $wScalvePLV = $this->phpSheet->getSheetView()->getZoomScale(); // 2
 
         // The options flags that comprise $grbit
@@ -2968,15 +2797,16 @@ class Worksheet extends BIFFwriter
 
     /**
      * Write CFRule Record.
-     *
-     * @param Conditional $conditional
      */
-    private function writeCFRule(Conditional $conditional)
-    {
+    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 : Type of the CF
-        // $operatorType : Comparison operator
         if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
             $type = 0x02;
             $operatorType = 0x00;
@@ -3024,31 +2854,33 @@ class Worksheet extends BIFFwriter
         // $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);
-        $bAlignVt = ($conditional->getStyle()->getAlignment()->getVertical() == null ? 1 : 0);
-        $bAlignWrapTx = ($conditional->getStyle()->getAlignment()->getWrapText() == false ? 1 : 0);
-        $bTxRotation = ($conditional->getStyle()->getAlignment()->getTextRotation() == null ? 1 : 0);
-        $bIndent = ($conditional->getStyle()->getAlignment()->getIndent() == 0 ? 1 : 0);
-        $bShrinkToFit = ($conditional->getStyle()->getAlignment()->getShrinkToFit() == false ? 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);
+        $bIndent = ($conditional->getStyle()->getAlignment()->getIndent() === 0 ? 1 : 0);
+        $bShrinkToFit = ($conditional->getStyle()->getAlignment()->getShrinkToFit() === false ? 1 : 0);
         if ($bAlignHz == 0 || $bAlignVt == 0 || $bAlignWrapTx == 0 || $bTxRotation == 0 || $bIndent == 0 || $bShrinkToFit == 0) {
             $bFormatAlign = 1;
         } else {
@@ -3063,38 +2895,36 @@ class Worksheet extends BIFFwriter
             $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;
+        if ($bBorderLeft === 1 || $bBorderRight === 1 || $bBorderTop === 1 || $bBorderBottom === 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) {
+        $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 == 1 || $bFillColor == 1 || $bFillColorBg == 1) {
             $bFormatFill = 1;
         } else {
             $bFormatFill = 0;
         }
         // Font
-        if ($conditional->getStyle()->getFont()->getName() != null
-            || $conditional->getStyle()->getFont()->getSize() != null
-            || $conditional->getStyle()->getFont()->getBold() != null
-            || $conditional->getStyle()->getFont()->getItalic() != null
-            || $conditional->getStyle()->getFont()->getSuperscript() != null
-            || $conditional->getStyle()->getFont()->getSubscript() != null
-            || $conditional->getStyle()->getFont()->getUnderline() != null
-            || $conditional->getStyle()->getFont()->getStrikethrough() != null
-            || $conditional->getStyle()->getFont()->getColor()->getARGB() != null) {
+        if (
+            $conditional->getStyle()->getFont()->getName() !== null
+            || $conditional->getStyle()->getFont()->getSize() !== null
+            || $conditional->getStyle()->getFont()->getBold() !== null
+            || $conditional->getStyle()->getFont()->getItalic() !== null
+            || $conditional->getStyle()->getFont()->getSuperscript() !== null
+            || $conditional->getStyle()->getFont()->getSubscript() !== null
+            || $conditional->getStyle()->getFont()->getUnderline() !== null
+            || $conditional->getStyle()->getFont()->getStrikethrough() !== null
+            || $conditional->getStyle()->getFont()->getColor()->getARGB() !== null
+        ) {
             $bFormatFont = 1;
         } else {
             $bFormatFont = 0;
@@ -3106,11 +2936,11 @@ class Worksheet extends BIFFwriter
         $flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
         $flags |= (1 == $bTxRotation ? 0x00000008 : 0);
         // Justify last line flag
-        $flags |= (1 == 1 ? 0x00000010 : 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);
@@ -3119,13 +2949,13 @@ class Worksheet extends BIFFwriter
         $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 == self::$always1 ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (1 == self::$always1 ? 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:
@@ -3137,19 +2967,24 @@ class Worksheet extends BIFFwriter
         // Protection
         $flags |= (1 == $bFormatProt ? 0x40000000 : 0);
         // Text direction
-        $flags |= (1 == 0 ? 0x80000000 : 0);
+        $flags |= (1 == self::$always0 ? 0x80000000 : 0);
+
+        $dataBlockFont = null;
+        $dataBlockAlign = null;
+        $dataBlockBorder = null;
+        $dataBlockFill = null;
 
         // Data Blocks
         if ($bFormatFont == 1) {
             // Font Name
-            if ($conditional->getStyle()->getFont()->getName() == null) {
+            if ($conditional->getStyle()->getFont()->getName() === null) {
                 $dataBlockFont = pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
                 $dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
             } else {
                 $dataBlockFont = StringHelper::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
             }
             // Font Size
-            if ($conditional->getStyle()->getFont()->getSize() == null) {
+            if ($conditional->getStyle()->getFont()->getSize() === null) {
                 $dataBlockFont .= pack('V', 20 * 11);
             } else {
                 $dataBlockFont .= pack('V', 20 * $conditional->getStyle()->getFont()->getSize());
@@ -3157,16 +2992,16 @@ class Worksheet extends BIFFwriter
             // Font Options
             $dataBlockFont .= pack('V', 0);
             // Font weight
-            if ($conditional->getStyle()->getFont()->getBold() == true) {
+            if ($conditional->getStyle()->getFont()->getBold() === true) {
                 $dataBlockFont .= pack('v', 0x02BC);
             } else {
                 $dataBlockFont .= pack('v', 0x0190);
             }
             // Escapement type
-            if ($conditional->getStyle()->getFont()->getSubscript() == true) {
+            if ($conditional->getStyle()->getFont()->getSubscript() === true) {
                 $dataBlockFont .= pack('v', 0x02);
                 $fontEscapement = 0;
-            } elseif ($conditional->getStyle()->getFont()->getSuperscript() == true) {
+            } elseif ($conditional->getStyle()->getFont()->getSuperscript() === true) {
                 $dataBlockFont .= pack('v', 0x01);
                 $fontEscapement = 0;
             } else {
@@ -3209,247 +3044,19 @@ class Worksheet extends BIFFwriter
             // Not used (3)
             $dataBlockFont .= pack('vC', 0x0000, 0x00);
             // Font color index
-            switch ($conditional->getStyle()->getFont()->getColor()->getRGB()) {
-                case '000000':
-                    $colorIdx = 0x08;
+            $colorIdx = Style\ColorMap::lookup($conditional->getStyle()->getFont()->getColor(), 0x00);
 
-                    break;
-                case 'FFFFFF':
-                    $colorIdx = 0x09;
-
-                    break;
-                case 'FF0000':
-                    $colorIdx = 0x0A;
-
-                    break;
-                case '00FF00':
-                    $colorIdx = 0x0B;
-
-                    break;
-                case '0000FF':
-                    $colorIdx = 0x0C;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdx = 0x0D;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdx = 0x0E;
-
-                    break;
-                case '00FFFF':
-                    $colorIdx = 0x0F;
-
-                    break;
-                case '800000':
-                    $colorIdx = 0x10;
-
-                    break;
-                case '008000':
-                    $colorIdx = 0x11;
-
-                    break;
-                case '000080':
-                    $colorIdx = 0x12;
-
-                    break;
-                case '808000':
-                    $colorIdx = 0x13;
-
-                    break;
-                case '800080':
-                    $colorIdx = 0x14;
-
-                    break;
-                case '008080':
-                    $colorIdx = 0x15;
-
-                    break;
-                case 'C0C0C0':
-                    $colorIdx = 0x16;
-
-                    break;
-                case '808080':
-                    $colorIdx = 0x17;
-
-                    break;
-                case '9999FF':
-                    $colorIdx = 0x18;
-
-                    break;
-                case '993366':
-                    $colorIdx = 0x19;
-
-                    break;
-                case 'FFFFCC':
-                    $colorIdx = 0x1A;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdx = 0x1B;
-
-                    break;
-                case '660066':
-                    $colorIdx = 0x1C;
-
-                    break;
-                case 'FF8080':
-                    $colorIdx = 0x1D;
-
-                    break;
-                case '0066CC':
-                    $colorIdx = 0x1E;
-
-                    break;
-                case 'CCCCFF':
-                    $colorIdx = 0x1F;
-
-                    break;
-                case '000080':
-                    $colorIdx = 0x20;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdx = 0x21;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdx = 0x22;
-
-                    break;
-                case '00FFFF':
-                    $colorIdx = 0x23;
-
-                    break;
-                case '800080':
-                    $colorIdx = 0x24;
-
-                    break;
-                case '800000':
-                    $colorIdx = 0x25;
-
-                    break;
-                case '008080':
-                    $colorIdx = 0x26;
-
-                    break;
-                case '0000FF':
-                    $colorIdx = 0x27;
-
-                    break;
-                case '00CCFF':
-                    $colorIdx = 0x28;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdx = 0x29;
-
-                    break;
-                case 'CCFFCC':
-                    $colorIdx = 0x2A;
-
-                    break;
-                case 'FFFF99':
-                    $colorIdx = 0x2B;
-
-                    break;
-                case '99CCFF':
-                    $colorIdx = 0x2C;
-
-                    break;
-                case 'FF99CC':
-                    $colorIdx = 0x2D;
-
-                    break;
-                case 'CC99FF':
-                    $colorIdx = 0x2E;
-
-                    break;
-                case 'FFCC99':
-                    $colorIdx = 0x2F;
-
-                    break;
-                case '3366FF':
-                    $colorIdx = 0x30;
-
-                    break;
-                case '33CCCC':
-                    $colorIdx = 0x31;
-
-                    break;
-                case '99CC00':
-                    $colorIdx = 0x32;
-
-                    break;
-                case 'FFCC00':
-                    $colorIdx = 0x33;
-
-                    break;
-                case 'FF9900':
-                    $colorIdx = 0x34;
-
-                    break;
-                case 'FF6600':
-                    $colorIdx = 0x35;
-
-                    break;
-                case '666699':
-                    $colorIdx = 0x36;
-
-                    break;
-                case '969696':
-                    $colorIdx = 0x37;
-
-                    break;
-                case '003366':
-                    $colorIdx = 0x38;
-
-                    break;
-                case '339966':
-                    $colorIdx = 0x39;
-
-                    break;
-                case '003300':
-                    $colorIdx = 0x3A;
-
-                    break;
-                case '333300':
-                    $colorIdx = 0x3B;
-
-                    break;
-                case '993300':
-                    $colorIdx = 0x3C;
-
-                    break;
-                case '993366':
-                    $colorIdx = 0x3D;
-
-                    break;
-                case '333399':
-                    $colorIdx = 0x3E;
-
-                    break;
-                case '333333':
-                    $colorIdx = 0x3F;
-
-                    break;
-                default:
-                    $colorIdx = 0x00;
-
-                    break;
-            }
             $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);
+            $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 |= (1 == self::$always1 ? 0x00000008 : 0);
+            $optionsFlags |= (1 == self::$always1 ? 0x00000010 : 0);
+            $optionsFlags |= (1 == self::$always0 ? 0x00000020 : 0);
+            $optionsFlags |= (1 == self::$always1 ? 0x00000080 : 0);
             $dataBlockFont .= pack('V', $optionsFlags);
             // Escapement type
             $dataBlockFont .= pack('V', $fontEscapement);
@@ -3464,58 +3071,11 @@ class Worksheet extends BIFFwriter
             // Always
             $dataBlockFont .= pack('v', 0x0001);
         }
-        if ($bFormatAlign == 1) {
-            $blockAlign = 0;
+        if ($bFormatAlign === 1) {
             // Alignment and text break
-            switch ($conditional->getStyle()->getAlignment()->getHorizontal()) {
-                case Alignment::HORIZONTAL_GENERAL:
-                    $blockAlign = 0;
-
-                    break;
-                case Alignment::HORIZONTAL_LEFT:
-                    $blockAlign = 1;
-
-                    break;
-                case Alignment::HORIZONTAL_RIGHT:
-                    $blockAlign = 3;
-
-                    break;
-                case Alignment::HORIZONTAL_CENTER:
-                    $blockAlign = 2;
-
-                    break;
-                case Alignment::HORIZONTAL_CENTER_CONTINUOUS:
-                    $blockAlign = 6;
-
-                    break;
-                case Alignment::HORIZONTAL_JUSTIFY:
-                    $blockAlign = 5;
-
-                    break;
-            }
-            if ($conditional->getStyle()->getAlignment()->getWrapText() == true) {
-                $blockAlign |= 1 << 3;
-            } else {
-                $blockAlign |= 0 << 3;
-            }
-            switch ($conditional->getStyle()->getAlignment()->getVertical()) {
-                case Alignment::VERTICAL_BOTTOM:
-                    $blockAlign = 2 << 4;
-
-                    break;
-                case Alignment::VERTICAL_TOP:
-                    $blockAlign = 0 << 4;
-
-                    break;
-                case Alignment::VERTICAL_CENTER:
-                    $blockAlign = 1 << 4;
-
-                    break;
-                case Alignment::VERTICAL_JUSTIFY:
-                    $blockAlign = 3 << 4;
-
-                    break;
-            }
+            $blockAlign = Style\CellAlignment::horizontal($conditional->getStyle()->getAlignment());
+            $blockAlign |= Style\CellAlignment::wrap($conditional->getStyle()->getAlignment()) << 3;
+            $blockAlign |= Style\CellAlignment::vertical($conditional->getStyle()->getAlignment()) << 4;
             $blockAlign |= 0 << 7;
 
             // Text rotation angle
@@ -3523,7 +3083,7 @@ class Worksheet extends BIFFwriter
 
             // Indentation
             $blockIndent = $conditional->getStyle()->getAlignment()->getIndent();
-            if ($conditional->getStyle()->getAlignment()->getShrinkToFit() == true) {
+            if ($conditional->getStyle()->getAlignment()->getShrinkToFit() === true) {
                 $blockIndent |= 1 << 4;
             } else {
                 $blockIndent |= 0 << 4;
@@ -3535,891 +3095,50 @@ class Worksheet extends BIFFwriter
 
             $dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
         }
-        if ($bFormatBorder == 1) {
-            $blockLineStyle = 0;
-            switch ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle()) {
-                case Border::BORDER_NONE:
-                    $blockLineStyle |= 0x00;
+        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;
 
-                    break;
-                case Border::BORDER_THIN:
-                    $blockLineStyle |= 0x01;
-
-                    break;
-                case Border::BORDER_MEDIUM:
-                    $blockLineStyle |= 0x02;
-
-                    break;
-                case Border::BORDER_DASHED:
-                    $blockLineStyle |= 0x03;
-
-                    break;
-                case Border::BORDER_DOTTED:
-                    $blockLineStyle |= 0x04;
-
-                    break;
-                case Border::BORDER_THICK:
-                    $blockLineStyle |= 0x05;
-
-                    break;
-                case Border::BORDER_DOUBLE:
-                    $blockLineStyle |= 0x06;
-
-                    break;
-                case Border::BORDER_HAIR:
-                    $blockLineStyle |= 0x07;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHED:
-                    $blockLineStyle |= 0x08;
-
-                    break;
-                case Border::BORDER_DASHDOT:
-                    $blockLineStyle |= 0x09;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOT:
-                    $blockLineStyle |= 0x0A;
-
-                    break;
-                case Border::BORDER_DASHDOTDOT:
-                    $blockLineStyle |= 0x0B;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOTDOT:
-                    $blockLineStyle |= 0x0C;
-
-                    break;
-                case Border::BORDER_SLANTDASHDOT:
-                    $blockLineStyle |= 0x0D;
-
-                    break;
-            }
-            switch ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle()) {
-                case Border::BORDER_NONE:
-                    $blockLineStyle |= 0x00 << 4;
-
-                    break;
-                case Border::BORDER_THIN:
-                    $blockLineStyle |= 0x01 << 4;
-
-                    break;
-                case Border::BORDER_MEDIUM:
-                    $blockLineStyle |= 0x02 << 4;
-
-                    break;
-                case Border::BORDER_DASHED:
-                    $blockLineStyle |= 0x03 << 4;
-
-                    break;
-                case Border::BORDER_DOTTED:
-                    $blockLineStyle |= 0x04 << 4;
-
-                    break;
-                case Border::BORDER_THICK:
-                    $blockLineStyle |= 0x05 << 4;
-
-                    break;
-                case Border::BORDER_DOUBLE:
-                    $blockLineStyle |= 0x06 << 4;
-
-                    break;
-                case Border::BORDER_HAIR:
-                    $blockLineStyle |= 0x07 << 4;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHED:
-                    $blockLineStyle |= 0x08 << 4;
-
-                    break;
-                case Border::BORDER_DASHDOT:
-                    $blockLineStyle |= 0x09 << 4;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOT:
-                    $blockLineStyle |= 0x0A << 4;
-
-                    break;
-                case Border::BORDER_DASHDOTDOT:
-                    $blockLineStyle |= 0x0B << 4;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOTDOT:
-                    $blockLineStyle |= 0x0C << 4;
-
-                    break;
-                case Border::BORDER_SLANTDASHDOT:
-                    $blockLineStyle |= 0x0D << 4;
-
-                    break;
-            }
-            switch ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle()) {
-                case Border::BORDER_NONE:
-                    $blockLineStyle |= 0x00 << 8;
-
-                    break;
-                case Border::BORDER_THIN:
-                    $blockLineStyle |= 0x01 << 8;
-
-                    break;
-                case Border::BORDER_MEDIUM:
-                    $blockLineStyle |= 0x02 << 8;
-
-                    break;
-                case Border::BORDER_DASHED:
-                    $blockLineStyle |= 0x03 << 8;
-
-                    break;
-                case Border::BORDER_DOTTED:
-                    $blockLineStyle |= 0x04 << 8;
-
-                    break;
-                case Border::BORDER_THICK:
-                    $blockLineStyle |= 0x05 << 8;
-
-                    break;
-                case Border::BORDER_DOUBLE:
-                    $blockLineStyle |= 0x06 << 8;
-
-                    break;
-                case Border::BORDER_HAIR:
-                    $blockLineStyle |= 0x07 << 8;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHED:
-                    $blockLineStyle |= 0x08 << 8;
-
-                    break;
-                case Border::BORDER_DASHDOT:
-                    $blockLineStyle |= 0x09 << 8;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOT:
-                    $blockLineStyle |= 0x0A << 8;
-
-                    break;
-                case Border::BORDER_DASHDOTDOT:
-                    $blockLineStyle |= 0x0B << 8;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOTDOT:
-                    $blockLineStyle |= 0x0C << 8;
-
-                    break;
-                case Border::BORDER_SLANTDASHDOT:
-                    $blockLineStyle |= 0x0D << 8;
-
-                    break;
-            }
-            switch ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle()) {
-                case Border::BORDER_NONE:
-                    $blockLineStyle |= 0x00 << 12;
-
-                    break;
-                case Border::BORDER_THIN:
-                    $blockLineStyle |= 0x01 << 12;
-
-                    break;
-                case Border::BORDER_MEDIUM:
-                    $blockLineStyle |= 0x02 << 12;
-
-                    break;
-                case Border::BORDER_DASHED:
-                    $blockLineStyle |= 0x03 << 12;
-
-                    break;
-                case Border::BORDER_DOTTED:
-                    $blockLineStyle |= 0x04 << 12;
-
-                    break;
-                case Border::BORDER_THICK:
-                    $blockLineStyle |= 0x05 << 12;
-
-                    break;
-                case Border::BORDER_DOUBLE:
-                    $blockLineStyle |= 0x06 << 12;
-
-                    break;
-                case Border::BORDER_HAIR:
-                    $blockLineStyle |= 0x07 << 12;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHED:
-                    $blockLineStyle |= 0x08 << 12;
-
-                    break;
-                case Border::BORDER_DASHDOT:
-                    $blockLineStyle |= 0x09 << 12;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOT:
-                    $blockLineStyle |= 0x0A << 12;
-
-                    break;
-                case Border::BORDER_DASHDOTDOT:
-                    $blockLineStyle |= 0x0B << 12;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOTDOT:
-                    $blockLineStyle |= 0x0C << 12;
-
-                    break;
-                case Border::BORDER_SLANTDASHDOT:
-                    $blockLineStyle |= 0x0D << 12;
-
-                    break;
-            }
-            //@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
+            // 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
             $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
-            switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()) {
-                case Border::BORDER_NONE:
-                    $blockColor |= 0x00 << 21;
-
-                    break;
-                case Border::BORDER_THIN:
-                    $blockColor |= 0x01 << 21;
-
-                    break;
-                case Border::BORDER_MEDIUM:
-                    $blockColor |= 0x02 << 21;
-
-                    break;
-                case Border::BORDER_DASHED:
-                    $blockColor |= 0x03 << 21;
-
-                    break;
-                case Border::BORDER_DOTTED:
-                    $blockColor |= 0x04 << 21;
-
-                    break;
-                case Border::BORDER_THICK:
-                    $blockColor |= 0x05 << 21;
-
-                    break;
-                case Border::BORDER_DOUBLE:
-                    $blockColor |= 0x06 << 21;
-
-                    break;
-                case Border::BORDER_HAIR:
-                    $blockColor |= 0x07 << 21;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHED:
-                    $blockColor |= 0x08 << 21;
-
-                    break;
-                case Border::BORDER_DASHDOT:
-                    $blockColor |= 0x09 << 21;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOT:
-                    $blockColor |= 0x0A << 21;
-
-                    break;
-                case Border::BORDER_DASHDOTDOT:
-                    $blockColor |= 0x0B << 21;
-
-                    break;
-                case Border::BORDER_MEDIUMDASHDOTDOT:
-                    $blockColor |= 0x0C << 21;
-
-                    break;
-                case Border::BORDER_SLANTDASHDOT:
-                    $blockColor |= 0x0D << 21;
-
-                    break;
-            }
+            // 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 ($bFormatFill == 1) {
-            // Fill Patern Style
-            $blockFillPatternStyle = 0;
-            switch ($conditional->getStyle()->getFill()->getFillType()) {
-                case Fill::FILL_NONE:
-                    $blockFillPatternStyle = 0x00;
+        if ($bFormatFill === 1) {
+            // Fill Pattern Style
+            $blockFillPatternStyle = Style\CellFill::style($conditional->getStyle()->getFill());
+            // Background Color
+            $colorIdxBg = Style\ColorMap::lookup($conditional->getStyle()->getFill()->getStartColor(), 0x41);
+            // Foreground Color
+            $colorIdxFg = Style\ColorMap::lookup($conditional->getStyle()->getFill()->getEndColor(), 0x40);
 
-                    break;
-                case Fill::FILL_SOLID:
-                    $blockFillPatternStyle = 0x01;
-
-                    break;
-                case Fill::FILL_PATTERN_MEDIUMGRAY:
-                    $blockFillPatternStyle = 0x02;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKGRAY:
-                    $blockFillPatternStyle = 0x03;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTGRAY:
-                    $blockFillPatternStyle = 0x04;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKHORIZONTAL:
-                    $blockFillPatternStyle = 0x05;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKVERTICAL:
-                    $blockFillPatternStyle = 0x06;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKDOWN:
-                    $blockFillPatternStyle = 0x07;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKUP:
-                    $blockFillPatternStyle = 0x08;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKGRID:
-                    $blockFillPatternStyle = 0x09;
-
-                    break;
-                case Fill::FILL_PATTERN_DARKTRELLIS:
-                    $blockFillPatternStyle = 0x0A;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTHORIZONTAL:
-                    $blockFillPatternStyle = 0x0B;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTVERTICAL:
-                    $blockFillPatternStyle = 0x0C;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTDOWN:
-                    $blockFillPatternStyle = 0x0D;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTUP:
-                    $blockFillPatternStyle = 0x0E;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTGRID:
-                    $blockFillPatternStyle = 0x0F;
-
-                    break;
-                case Fill::FILL_PATTERN_LIGHTTRELLIS:
-                    $blockFillPatternStyle = 0x10;
-
-                    break;
-                case Fill::FILL_PATTERN_GRAY125:
-                    $blockFillPatternStyle = 0x11;
-
-                    break;
-                case Fill::FILL_PATTERN_GRAY0625:
-                    $blockFillPatternStyle = 0x12;
-
-                    break;
-                case Fill::FILL_GRADIENT_LINEAR:
-                    $blockFillPatternStyle = 0x00;
-
-                    break; // does not exist in BIFF8
-                case Fill::FILL_GRADIENT_PATH:
-                    $blockFillPatternStyle = 0x00;
-
-                    break; // does not exist in BIFF8
-                default:
-                    $blockFillPatternStyle = 0x00;
-
-                    break;
-            }
-            // Color
-            switch ($conditional->getStyle()->getFill()->getStartColor()->getRGB()) {
-                case '000000':
-                    $colorIdxBg = 0x08;
-
-                    break;
-                case 'FFFFFF':
-                    $colorIdxBg = 0x09;
-
-                    break;
-                case 'FF0000':
-                    $colorIdxBg = 0x0A;
-
-                    break;
-                case '00FF00':
-                    $colorIdxBg = 0x0B;
-
-                    break;
-                case '0000FF':
-                    $colorIdxBg = 0x0C;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdxBg = 0x0D;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdxBg = 0x0E;
-
-                    break;
-                case '00FFFF':
-                    $colorIdxBg = 0x0F;
-
-                    break;
-                case '800000':
-                    $colorIdxBg = 0x10;
-
-                    break;
-                case '008000':
-                    $colorIdxBg = 0x11;
-
-                    break;
-                case '000080':
-                    $colorIdxBg = 0x12;
-
-                    break;
-                case '808000':
-                    $colorIdxBg = 0x13;
-
-                    break;
-                case '800080':
-                    $colorIdxBg = 0x14;
-
-                    break;
-                case '008080':
-                    $colorIdxBg = 0x15;
-
-                    break;
-                case 'C0C0C0':
-                    $colorIdxBg = 0x16;
-
-                    break;
-                case '808080':
-                    $colorIdxBg = 0x17;
-
-                    break;
-                case '9999FF':
-                    $colorIdxBg = 0x18;
-
-                    break;
-                case '993366':
-                    $colorIdxBg = 0x19;
-
-                    break;
-                case 'FFFFCC':
-                    $colorIdxBg = 0x1A;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdxBg = 0x1B;
-
-                    break;
-                case '660066':
-                    $colorIdxBg = 0x1C;
-
-                    break;
-                case 'FF8080':
-                    $colorIdxBg = 0x1D;
-
-                    break;
-                case '0066CC':
-                    $colorIdxBg = 0x1E;
-
-                    break;
-                case 'CCCCFF':
-                    $colorIdxBg = 0x1F;
-
-                    break;
-                case '000080':
-                    $colorIdxBg = 0x20;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdxBg = 0x21;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdxBg = 0x22;
-
-                    break;
-                case '00FFFF':
-                    $colorIdxBg = 0x23;
-
-                    break;
-                case '800080':
-                    $colorIdxBg = 0x24;
-
-                    break;
-                case '800000':
-                    $colorIdxBg = 0x25;
-
-                    break;
-                case '008080':
-                    $colorIdxBg = 0x26;
-
-                    break;
-                case '0000FF':
-                    $colorIdxBg = 0x27;
-
-                    break;
-                case '00CCFF':
-                    $colorIdxBg = 0x28;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdxBg = 0x29;
-
-                    break;
-                case 'CCFFCC':
-                    $colorIdxBg = 0x2A;
-
-                    break;
-                case 'FFFF99':
-                    $colorIdxBg = 0x2B;
-
-                    break;
-                case '99CCFF':
-                    $colorIdxBg = 0x2C;
-
-                    break;
-                case 'FF99CC':
-                    $colorIdxBg = 0x2D;
-
-                    break;
-                case 'CC99FF':
-                    $colorIdxBg = 0x2E;
-
-                    break;
-                case 'FFCC99':
-                    $colorIdxBg = 0x2F;
-
-                    break;
-                case '3366FF':
-                    $colorIdxBg = 0x30;
-
-                    break;
-                case '33CCCC':
-                    $colorIdxBg = 0x31;
-
-                    break;
-                case '99CC00':
-                    $colorIdxBg = 0x32;
-
-                    break;
-                case 'FFCC00':
-                    $colorIdxBg = 0x33;
-
-                    break;
-                case 'FF9900':
-                    $colorIdxBg = 0x34;
-
-                    break;
-                case 'FF6600':
-                    $colorIdxBg = 0x35;
-
-                    break;
-                case '666699':
-                    $colorIdxBg = 0x36;
-
-                    break;
-                case '969696':
-                    $colorIdxBg = 0x37;
-
-                    break;
-                case '003366':
-                    $colorIdxBg = 0x38;
-
-                    break;
-                case '339966':
-                    $colorIdxBg = 0x39;
-
-                    break;
-                case '003300':
-                    $colorIdxBg = 0x3A;
-
-                    break;
-                case '333300':
-                    $colorIdxBg = 0x3B;
-
-                    break;
-                case '993300':
-                    $colorIdxBg = 0x3C;
-
-                    break;
-                case '993366':
-                    $colorIdxBg = 0x3D;
-
-                    break;
-                case '333399':
-                    $colorIdxBg = 0x3E;
-
-                    break;
-                case '333333':
-                    $colorIdxBg = 0x3F;
-
-                    break;
-                default:
-                          $colorIdxBg = 0x41;
-
-                    break;
-            }
-            // Fg Color
-            switch ($conditional->getStyle()->getFill()->getEndColor()->getRGB()) {
-                case '000000':
-                    $colorIdxFg = 0x08;
-
-                    break;
-                case 'FFFFFF':
-                    $colorIdxFg = 0x09;
-
-                    break;
-                case 'FF0000':
-                    $colorIdxFg = 0x0A;
-
-                    break;
-                case '00FF00':
-                    $colorIdxFg = 0x0B;
-
-                    break;
-                case '0000FF':
-                    $colorIdxFg = 0x0C;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdxFg = 0x0D;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdxFg = 0x0E;
-
-                    break;
-                case '00FFFF':
-                    $colorIdxFg = 0x0F;
-
-                    break;
-                case '800000':
-                    $colorIdxFg = 0x10;
-
-                    break;
-                case '008000':
-                    $colorIdxFg = 0x11;
-
-                    break;
-                case '000080':
-                    $colorIdxFg = 0x12;
-
-                    break;
-                case '808000':
-                    $colorIdxFg = 0x13;
-
-                    break;
-                case '800080':
-                    $colorIdxFg = 0x14;
-
-                    break;
-                case '008080':
-                    $colorIdxFg = 0x15;
-
-                    break;
-                case 'C0C0C0':
-                    $colorIdxFg = 0x16;
-
-                    break;
-                case '808080':
-                    $colorIdxFg = 0x17;
-
-                    break;
-                case '9999FF':
-                    $colorIdxFg = 0x18;
-
-                    break;
-                case '993366':
-                    $colorIdxFg = 0x19;
-
-                    break;
-                case 'FFFFCC':
-                    $colorIdxFg = 0x1A;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdxFg = 0x1B;
-
-                    break;
-                case '660066':
-                    $colorIdxFg = 0x1C;
-
-                    break;
-                case 'FF8080':
-                    $colorIdxFg = 0x1D;
-
-                    break;
-                case '0066CC':
-                    $colorIdxFg = 0x1E;
-
-                    break;
-                case 'CCCCFF':
-                    $colorIdxFg = 0x1F;
-
-                    break;
-                case '000080':
-                    $colorIdxFg = 0x20;
-
-                    break;
-                case 'FF00FF':
-                    $colorIdxFg = 0x21;
-
-                    break;
-                case 'FFFF00':
-                    $colorIdxFg = 0x22;
-
-                    break;
-                case '00FFFF':
-                    $colorIdxFg = 0x23;
-
-                    break;
-                case '800080':
-                    $colorIdxFg = 0x24;
-
-                    break;
-                case '800000':
-                    $colorIdxFg = 0x25;
-
-                    break;
-                case '008080':
-                    $colorIdxFg = 0x26;
-
-                    break;
-                case '0000FF':
-                    $colorIdxFg = 0x27;
-
-                    break;
-                case '00CCFF':
-                    $colorIdxFg = 0x28;
-
-                    break;
-                case 'CCFFFF':
-                    $colorIdxFg = 0x29;
-
-                    break;
-                case 'CCFFCC':
-                    $colorIdxFg = 0x2A;
-
-                    break;
-                case 'FFFF99':
-                    $colorIdxFg = 0x2B;
-
-                    break;
-                case '99CCFF':
-                    $colorIdxFg = 0x2C;
-
-                    break;
-                case 'FF99CC':
-                    $colorIdxFg = 0x2D;
-
-                    break;
-                case 'CC99FF':
-                    $colorIdxFg = 0x2E;
-
-                    break;
-                case 'FFCC99':
-                    $colorIdxFg = 0x2F;
-
-                    break;
-                case '3366FF':
-                    $colorIdxFg = 0x30;
-
-                    break;
-                case '33CCCC':
-                    $colorIdxFg = 0x31;
-
-                    break;
-                case '99CC00':
-                    $colorIdxFg = 0x32;
-
-                    break;
-                case 'FFCC00':
-                    $colorIdxFg = 0x33;
-
-                    break;
-                case 'FF9900':
-                    $colorIdxFg = 0x34;
-
-                    break;
-                case 'FF6600':
-                    $colorIdxFg = 0x35;
-
-                    break;
-                case '666699':
-                    $colorIdxFg = 0x36;
-
-                    break;
-                case '969696':
-                    $colorIdxFg = 0x37;
-
-                    break;
-                case '003366':
-                    $colorIdxFg = 0x38;
-
-                    break;
-                case '339966':
-                    $colorIdxFg = 0x39;
-
-                    break;
-                case '003300':
-                    $colorIdxFg = 0x3A;
-
-                    break;
-                case '333300':
-                    $colorIdxFg = 0x3B;
-
-                    break;
-                case '993300':
-                    $colorIdxFg = 0x3C;
-
-                    break;
-                case '993366':
-                    $colorIdxFg = 0x3D;
-
-                    break;
-                case '333399':
-                    $colorIdxFg = 0x3E;
-
-                    break;
-                case '333333':
-                    $colorIdxFg = 0x3F;
-
-                    break;
-                default:
-                          $colorIdxFg = 0x40;
-
-                    break;
-            }
             $dataBlockFill = pack('v', $blockFillPatternStyle);
             $dataBlockFill .= pack('v', $colorIdxFg | ($colorIdxBg << 7));
         }
-        if ($bFormatProt == 1) {
-            $dataBlockProtection = 0;
-            if ($conditional->getStyle()->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED) {
-                $dataBlockProtection = 1;
-            }
-            if ($conditional->getStyle()->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED) {
-                $dataBlockProtection = 1 << 1;
-            }
-        }
 
         $data = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000);
-        if ($bFormatFont == 1) { // Block Formatting : OK
+        if ($bFormatFont === 1) { // Block Formatting : OK
             $data .= $dataBlockFont;
         }
-        if ($bFormatAlign == 1) {
+        if ($bFormatAlign === 1) {
             $data .= $dataBlockAlign;
         }
-        if ($bFormatBorder == 1) {
+        if ($bFormatBorder === 1) {
             $data .= $dataBlockBorder;
         }
-        if ($bFormatFill == 1) { // Block Formatting : OK
+        if ($bFormatFill === 1) { // Block Formatting : OK
             $data .= $dataBlockFill;
         }
         if ($bFormatProt == 1) {
-            $data .= $dataBlockProtection;
+            $data .= $this->getDataBlockProtection($conditional);
         }
         if ($operand1 !== null) {
             $data .= $operand1;
@@ -4433,8 +3152,10 @@ class Worksheet extends BIFFwriter
 
     /**
      * Write CFHeader record.
+     *
+     * @param Conditional[] $conditionalStyles
      */
-    private function writeCFHeader()
+    private function writeCFHeader(string $cellCoordinate, array $conditionalStyles): bool
     {
         $record = 0x01B0; // Record identifier
         $length = 0x0016; // Bytes to follow
@@ -4443,34 +3164,32 @@ class Worksheet extends BIFFwriter
         $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
-                    $arrCoord = Coordinate::coordinateFromString($cellCoordinate);
-                    if (!is_numeric($arrCoord[0])) {
-                        $arrCoord[0] = Coordinate::columnIndexFromString($arrCoord[0]);
-                    }
-                    if ($numColumnMin === null || ($numColumnMin > $arrCoord[0])) {
-                        $numColumnMin = $arrCoord[0];
-                    }
-                    if ($numColumnMax === null || ($numColumnMax < $arrCoord[0])) {
-                        $numColumnMax = $arrCoord[0];
-                    }
-                    if ($numRowMin === null || ($numRowMin > $arrCoord[1])) {
-                        $numRowMin = $arrCoord[1];
-                    }
-                    if ($numRowMax === null || ($numRowMax < $arrCoord[1])) {
-                        $numRowMax = $arrCoord[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);
 
@@ -4480,5 +3199,20 @@ class Worksheet extends BIFFwriter
         $data .= pack('v', 0x0001);
         $data .= $cellRange;
         $this->append($header . $data);
+
+        return true;
+    }
+
+    private function getDataBlockProtection(Conditional $conditional): int
+    {
+        $dataBlockProtection = 0;
+        if ($conditional->getStyle()->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED) {
+            $dataBlockProtection = 1;
+        }
+        if ($conditional->getStyle()->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED) {
+            $dataBlockProtection = 1 << 1;
+        }
+
+        return $dataBlockProtection;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
index 238fb34c6..7ac26665c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
@@ -3,11 +3,12 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
-use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellAlignment;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellBorder;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellFill;
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
 // -----------------------------------------------------------------------------------------
@@ -115,6 +116,18 @@ class Xf
      */
     private $rightBorderColor;
 
+    //private $diag; // theoretically int, not yet implemented
+
+    /**
+     * @var int
+     */
+    private $diagColor;
+
+    /**
+     * @var Style
+     */
+    private $style;
+
     /**
      * Constructor.
      *
@@ -132,14 +145,14 @@ class Xf
         $this->foregroundColor = 0x40;
         $this->backgroundColor = 0x41;
 
-        $this->_diag = 0;
+        //$this->diag = 0;
 
         $this->bottomBorderColor = 0x40;
         $this->topBorderColor = 0x40;
         $this->leftBorderColor = 0x40;
         $this->rightBorderColor = 0x40;
-        $this->_diag_color = 0x40;
-        $this->_style = $style;
+        $this->diagColor = 0x40;
+        $this->style = $style;
     }
 
     /**
@@ -153,39 +166,39 @@ class Xf
         if ($this->isStyleXf) {
             $style = 0xFFF5;
         } else {
-            $style = self::mapLocked($this->_style->getProtection()->getLocked());
-            $style |= self::mapHidden($this->_style->getProtection()->getHidden()) << 1;
+            $style = self::mapLocked($this->style->getProtection()->getLocked());
+            $style |= self::mapHidden($this->style->getProtection()->getHidden()) << 1;
         }
 
         // Flags to indicate if attributes have been set.
         $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 = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) ||
-                        self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) ||
-                        self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) ||
-                        self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())) ? 1 : 0;
-        $atr_pat = (($this->foregroundColor != 0x40) ||
-                        ($this->backgroundColor != 0x41) ||
-                        self::mapFillType($this->_style->getFill()->getFillType())) ? 1 : 0;
-        $atr_prot = self::mapLocked($this->_style->getProtection()->getLocked())
-                        | self::mapHidden($this->_style->getProtection()->getHidden());
+        $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_pat = ($this->foregroundColor != 0x40) ? 1 : 0;
+        $atr_pat = ($this->backgroundColor != 0x41) ? 1 : $atr_pat;
+        $atr_pat = CellFill::style($this->style->getFill()) ? 1 : $atr_pat;
+        $atr_prot = self::mapLocked($this->style->getProtection()->getLocked())
+            | self::mapHidden($this->style->getProtection()->getHidden());
 
         // Zero the default border colour if the border has not been set.
-        if (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
+        if (CellBorder::style($this->style->getBorders()->getBottom()) == 0) {
             $this->bottomBorderColor = 0;
         }
-        if (self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) == 0) {
+        if (CellBorder::style($this->style->getBorders()->getTop()) == 0) {
             $this->topBorderColor = 0;
         }
-        if (self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
+        if (CellBorder::style($this->style->getBorders()->getRight()) == 0) {
             $this->rightBorderColor = 0;
         }
-        if (self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
+        if (CellBorder::style($this->style->getBorders()->getLeft()) == 0) {
             $this->leftBorderColor = 0;
         }
-        if (self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
-            $this->_diag_color = 0;
+        if (CellBorder::style($this->style->getBorders()->getDiagonal()) == 0) {
+            $this->diagColor = 0;
         }
 
         $record = 0x00E0; // Record identifier
@@ -194,9 +207,10 @@ class Xf
         $ifnt = $this->fontIndex; // Index to FONT record
         $ifmt = $this->numberFormatIndex; // Index to FORMAT record
 
-        $align = $this->mapHAlign($this->_style->getAlignment()->getHorizontal()); // Alignment
-        $align |= (int) $this->_style->getAlignment()->getWrapText() << 3;
-        $align |= self::mapVAlign($this->_style->getAlignment()->getVertical()) << 4;
+        // Alignment
+        $align = CellAlignment::horizontal($this->style->getAlignment());
+        $align |= CellAlignment::wrap($this->style->getAlignment()) << 3;
+        $align |= CellAlignment::vertical($this->style->getAlignment()) << 4;
         $align |= $this->textJustLast << 7;
 
         $used_attrib = $atr_num << 2;
@@ -209,35 +223,35 @@ class Xf
         $icv = $this->foregroundColor; // fg and bg pattern colors
         $icv |= $this->backgroundColor << 7;
 
-        $border1 = self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()); // Border line style and color
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) << 4;
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) << 8;
-        $border1 |= self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) << 12;
+        $border1 = CellBorder::style($this->style->getBorders()->getLeft()); // Border line style and color
+        $border1 |= CellBorder::style($this->style->getBorders()->getRight()) << 4;
+        $border1 |= CellBorder::style($this->style->getBorders()->getTop()) << 8;
+        $border1 |= CellBorder::style($this->style->getBorders()->getBottom()) << 12;
         $border1 |= $this->leftBorderColor << 16;
         $border1 |= $this->rightBorderColor << 23;
 
-        $diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
+        $diagonalDirection = $this->style->getBorders()->getDiagonalDirection();
         $diag_tl_to_rb = $diagonalDirection == Borders::DIAGONAL_BOTH
-                            || $diagonalDirection == Borders::DIAGONAL_DOWN;
+            || $diagonalDirection == Borders::DIAGONAL_DOWN;
         $diag_tr_to_lb = $diagonalDirection == Borders::DIAGONAL_BOTH
-                            || $diagonalDirection == Borders::DIAGONAL_UP;
+            || $diagonalDirection == Borders::DIAGONAL_UP;
         $border1 |= $diag_tl_to_rb << 30;
         $border1 |= $diag_tr_to_lb << 31;
 
         $border2 = $this->topBorderColor; // Border color
         $border2 |= $this->bottomBorderColor << 7;
-        $border2 |= $this->_diag_color << 14;
-        $border2 |= self::mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) << 21;
-        $border2 |= self::mapFillType($this->_style->getFill()->getFillType()) << 26;
+        $border2 |= $this->diagColor << 14;
+        $border2 |= CellBorder::style($this->style->getBorders()->getDiagonal()) << 21;
+        $border2 |= CellFill::style($this->style->getFill()) << 26;
 
         $header = pack('vv', $record, $length);
 
         //BIFF8 options: identation, shrinkToFit and  text direction
-        $biff8_options = $this->_style->getAlignment()->getIndent();
-        $biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
+        $biff8_options = $this->style->getAlignment()->getIndent();
+        $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;
@@ -248,7 +262,7 @@ class Xf
      *
      * @param bool $value
      */
-    public function setIsStyleXf($value)
+    public function setIsStyleXf($value): void
     {
         $this->isStyleXf = $value;
     }
@@ -258,7 +272,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setBottomColor($colorIndex)
+    public function setBottomColor($colorIndex): void
     {
         $this->bottomBorderColor = $colorIndex;
     }
@@ -268,7 +282,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setTopColor($colorIndex)
+    public function setTopColor($colorIndex): void
     {
         $this->topBorderColor = $colorIndex;
     }
@@ -278,7 +292,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setLeftColor($colorIndex)
+    public function setLeftColor($colorIndex): void
     {
         $this->leftBorderColor = $colorIndex;
     }
@@ -288,7 +302,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setRightColor($colorIndex)
+    public function setRightColor($colorIndex): void
     {
         $this->rightBorderColor = $colorIndex;
     }
@@ -298,9 +312,9 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setDiagColor($colorIndex)
+    public function setDiagColor($colorIndex): void
     {
-        $this->_diag_color = $colorIndex;
+        $this->diagColor = $colorIndex;
     }
 
     /**
@@ -308,7 +322,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setFgColor($colorIndex)
+    public function setFgColor($colorIndex): void
     {
         $this->foregroundColor = $colorIndex;
     }
@@ -318,7 +332,7 @@ class Xf
      *
      * @param int $colorIndex Color index
      */
-    public function setBgColor($colorIndex)
+    public function setBgColor($colorIndex): void
     {
         $this->backgroundColor = $colorIndex;
     }
@@ -329,7 +343,7 @@ class Xf
      *
      * @param int $numberFormatIndex Index to format record
      */
-    public function setNumberFormatIndex($numberFormatIndex)
+    public function setNumberFormatIndex($numberFormatIndex): void
     {
         $this->numberFormatIndex = $numberFormatIndex;
     }
@@ -339,153 +353,11 @@ class Xf
      *
      * @param int $value Font index, note that value 4 does not exist
      */
-    public function setFontIndex($value)
+    public function setFontIndex($value): void
     {
         $this->fontIndex = $value;
     }
 
-    /**
-     * Map of BIFF2-BIFF8 codes for border styles.
-     *
-     * @var array of int
-     */
-    private static $mapBorderStyles = [
-        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,
-    ];
-
-    /**
-     * Map border style.
-     *
-     * @param string $borderStyle
-     *
-     * @return int
-     */
-    private static function mapBorderStyle($borderStyle)
-    {
-        if (isset(self::$mapBorderStyles[$borderStyle])) {
-            return self::$mapBorderStyles[$borderStyle];
-        }
-
-        return 0x00;
-    }
-
-    /**
-     * Map of BIFF2-BIFF8 codes for fill types.
-     *
-     * @var array of int
-     */
-    private static $mapFillTypes = [
-        Fill::FILL_NONE => 0x00,
-        Fill::FILL_SOLID => 0x01,
-        Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
-        Fill::FILL_PATTERN_DARKGRAY => 0x03,
-        Fill::FILL_PATTERN_LIGHTGRAY => 0x04,
-        Fill::FILL_PATTERN_DARKHORIZONTAL => 0x05,
-        Fill::FILL_PATTERN_DARKVERTICAL => 0x06,
-        Fill::FILL_PATTERN_DARKDOWN => 0x07,
-        Fill::FILL_PATTERN_DARKUP => 0x08,
-        Fill::FILL_PATTERN_DARKGRID => 0x09,
-        Fill::FILL_PATTERN_DARKTRELLIS => 0x0A,
-        Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
-        Fill::FILL_PATTERN_LIGHTVERTICAL => 0x0C,
-        Fill::FILL_PATTERN_LIGHTDOWN => 0x0D,
-        Fill::FILL_PATTERN_LIGHTUP => 0x0E,
-        Fill::FILL_PATTERN_LIGHTGRID => 0x0F,
-        Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
-        Fill::FILL_PATTERN_GRAY125 => 0x11,
-        Fill::FILL_PATTERN_GRAY0625 => 0x12,
-        Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
-        Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
-    ];
-
-    /**
-     * Map fill type.
-     *
-     * @param string $fillType
-     *
-     * @return int
-     */
-    private static function mapFillType($fillType)
-    {
-        if (isset(self::$mapFillTypes[$fillType])) {
-            return self::$mapFillTypes[$fillType];
-        }
-
-        return 0x00;
-    }
-
-    /**
-     * Map of BIFF2-BIFF8 codes for horizontal alignment.
-     *
-     * @var array of int
-     */
-    private static $mapHAlignments = [
-        Alignment::HORIZONTAL_GENERAL => 0,
-        Alignment::HORIZONTAL_LEFT => 1,
-        Alignment::HORIZONTAL_CENTER => 2,
-        Alignment::HORIZONTAL_RIGHT => 3,
-        Alignment::HORIZONTAL_FILL => 4,
-        Alignment::HORIZONTAL_JUSTIFY => 5,
-        Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
-    ];
-
-    /**
-     * Map to BIFF2-BIFF8 codes for horizontal alignment.
-     *
-     * @param string $hAlign
-     *
-     * @return int
-     */
-    private function mapHAlign($hAlign)
-    {
-        if (isset(self::$mapHAlignments[$hAlign])) {
-            return self::$mapHAlignments[$hAlign];
-        }
-
-        return 0;
-    }
-
-    /**
-     * Map of BIFF2-BIFF8 codes for vertical alignment.
-     *
-     * @var array of int
-     */
-    private static $mapVAlignments = [
-        Alignment::VERTICAL_TOP => 0,
-        Alignment::VERTICAL_CENTER => 1,
-        Alignment::VERTICAL_BOTTOM => 2,
-        Alignment::VERTICAL_JUSTIFY => 3,
-    ];
-
-    /**
-     * Map to BIFF2-BIFF8 codes for vertical alignment.
-     *
-     * @param string $vAlign
-     *
-     * @return int
-     */
-    private static function mapVAlign($vAlign)
-    {
-        if (isset(self::$mapVAlignments[$vAlign])) {
-            return self::$mapVAlignments[$vAlign];
-        }
-
-        return 2;
-    }
-
     /**
      * Map to BIFF8 codes for text rotation angle.
      *
@@ -497,15 +369,22 @@ class Xf
     {
         if ($textRotation >= 0) {
             return $textRotation;
-        } elseif ($textRotation == -165) {
-            return 255;
-        } elseif ($textRotation < 0) {
-            return 90 - $textRotation;
         }
+        if ($textRotation == Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            return Alignment::TEXTROTATION_STACK_EXCEL;
+        }
+
+        return 90 - $textRotation;
     }
 
+    private const LOCK_ARRAY = [
+        Protection::PROTECTION_INHERIT => 1,
+        Protection::PROTECTION_PROTECTED => 1,
+        Protection::PROTECTION_UNPROTECTED => 0,
+    ];
+
     /**
-     * Map locked.
+     * Map locked values.
      *
      * @param string $locked
      *
@@ -513,18 +392,15 @@ class Xf
      */
     private static function mapLocked($locked)
     {
-        switch ($locked) {
-            case Protection::PROTECTION_INHERIT:
-                return 1;
-            case Protection::PROTECTION_PROTECTED:
-                return 1;
-            case Protection::PROTECTION_UNPROTECTED:
-                return 0;
-            default:
-                return 1;
-        }
+        return array_key_exists($locked, self::LOCK_ARRAY) ? self::LOCK_ARRAY[$locked] : 1;
     }
 
+    private const HIDDEN_ARRAY = [
+        Protection::PROTECTION_INHERIT => 0,
+        Protection::PROTECTION_PROTECTED => 1,
+        Protection::PROTECTION_UNPROTECTED => 0,
+    ];
+
     /**
      * Map hidden.
      *
@@ -534,15 +410,6 @@ class Xf
      */
     private static function mapHidden($hidden)
     {
-        switch ($hidden) {
-            case Protection::PROTECTION_INHERIT:
-                return 0;
-            case Protection::PROTECTION_PROTECTED:
-                return 1;
-            case Protection::PROTECTION_UNPROTECTED:
-                return 0;
-            default:
-                return 0;
-        }
+        return array_key_exists($hidden, self::HIDDEN_ARRAY) ? self::HIDDEN_ARRAY[$hidden] : 0;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
index 1fa59e51c..601f0f5c4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -5,8 +5,13 @@ namespace PhpOffice\PhpSpreadsheet\Writer;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\HashTable;
-use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+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\Worksheet\BaseDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing as WorksheetDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
@@ -20,10 +25,13 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsRibbon;
 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\ZipStream;
 
 class Xlsx extends BaseWriter
 {
@@ -34,13 +42,6 @@ class Xlsx extends BaseWriter
      */
     private $office2003compatibility = false;
 
-    /**
-     * Private writer parts.
-     *
-     * @var Xlsx\WriterPart[]
-     */
-    private $writerParts = [];
-
     /**
      * Private Spreadsheet.
      *
@@ -58,384 +59,519 @@ class Xlsx extends BaseWriter
     /**
      * Private unique Conditional HashTable.
      *
-     * @var HashTable
+     * @var HashTable<Conditional>
      */
     private $stylesConditionalHashTable;
 
     /**
      * Private unique Style HashTable.
      *
-     * @var HashTable
+     * @var HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
      */
     private $styleHashTable;
 
     /**
      * Private unique Fill HashTable.
      *
-     * @var HashTable
+     * @var HashTable<Fill>
      */
     private $fillHashTable;
 
     /**
      * Private unique \PhpOffice\PhpSpreadsheet\Style\Font HashTable.
      *
-     * @var HashTable
+     * @var HashTable<Font>
      */
     private $fontHashTable;
 
     /**
      * Private unique Borders HashTable.
      *
-     * @var HashTable
+     * @var HashTable<Borders>
      */
     private $bordersHashTable;
 
     /**
      * Private unique NumberFormat HashTable.
      *
-     * @var HashTable
+     * @var HashTable<NumberFormat>
      */
     private $numFmtHashTable;
 
     /**
      * Private unique \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\BaseDrawing HashTable.
      *
-     * @var HashTable
+     * @var HashTable<BaseDrawing>
      */
     private $drawingHashTable;
 
     /**
-     * Create a new Xlsx Writer.
+     * Private handle for zip stream.
      *
-     * @param Spreadsheet $spreadsheet
+     * @var ZipStream
+     */
+    private $zip;
+
+    /**
+     * @var Chart
+     */
+    private $writerPartChart;
+
+    /**
+     * @var Comments
+     */
+    private $writerPartComments;
+
+    /**
+     * @var ContentTypes
+     */
+    private $writerPartContentTypes;
+
+    /**
+     * @var DocProps
+     */
+    private $writerPartDocProps;
+
+    /**
+     * @var Drawing
+     */
+    private $writerPartDrawing;
+
+    /**
+     * @var Rels
+     */
+    private $writerPartRels;
+
+    /**
+     * @var RelsRibbon
+     */
+    private $writerPartRelsRibbon;
+
+    /**
+     * @var RelsVBA
+     */
+    private $writerPartRelsVBA;
+
+    /**
+     * @var StringTable
+     */
+    private $writerPartStringTable;
+
+    /**
+     * @var Style
+     */
+    private $writerPartStyle;
+
+    /**
+     * @var Theme
+     */
+    private $writerPartTheme;
+
+    /**
+     * @var Table
+     */
+    private $writerPartTable;
+
+    /**
+     * @var Workbook
+     */
+    private $writerPartWorkbook;
+
+    /**
+     * @var Worksheet
+     */
+    private $writerPartWorksheet;
+
+    /**
+     * Create a new Xlsx Writer.
      */
     public function __construct(Spreadsheet $spreadsheet)
     {
         // Assign PhpSpreadsheet
         $this->setSpreadsheet($spreadsheet);
 
-        $writerPartsArray = [
-            'stringtable' => StringTable::class,
-            'contenttypes' => ContentTypes::class,
-            'docprops' => DocProps::class,
-            'rels' => Rels::class,
-            'theme' => Theme::class,
-            'style' => Style::class,
-            'workbook' => Workbook::class,
-            'worksheet' => Worksheet::class,
-            'drawing' => Drawing::class,
-            'comments' => Comments::class,
-            'chart' => Chart::class,
-            'relsvba' => RelsVBA::class,
-            'relsribbonobjects' => RelsRibbon::class,
-        ];
-
-        //    Initialise writer parts
-        //        and Assign their parent IWriters
-        foreach ($writerPartsArray as $writer => $class) {
-            $this->writerParts[$writer] = new $class($this);
-        }
-
-        $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
-            'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
-            'styleHashTable',
-        ];
+        $this->writerPartChart = new Chart($this);
+        $this->writerPartComments = new Comments($this);
+        $this->writerPartContentTypes = new ContentTypes($this);
+        $this->writerPartDocProps = new DocProps($this);
+        $this->writerPartDrawing = new Drawing($this);
+        $this->writerPartRels = new Rels($this);
+        $this->writerPartRelsRibbon = new RelsRibbon($this);
+        $this->writerPartRelsVBA = new RelsVBA($this);
+        $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
-        foreach ($hashTablesArray as $tableName) {
-            $this->$tableName = new HashTable();
-        }
+        // @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();
     }
 
-    /**
-     * Get writer part.
-     *
-     * @param string $pPartName Writer part name
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Writer\Xlsx\WriterPart
-     */
-    public function getWriterPart($pPartName)
+    public function getWriterPartChart(): Chart
     {
-        if ($pPartName != '' && isset($this->writerParts[strtolower($pPartName)])) {
-            return $this->writerParts[strtolower($pPartName)];
-        }
+        return $this->writerPartChart;
+    }
 
-        return null;
+    public function getWriterPartComments(): Comments
+    {
+        return $this->writerPartComments;
+    }
+
+    public function getWriterPartContentTypes(): ContentTypes
+    {
+        return $this->writerPartContentTypes;
+    }
+
+    public function getWriterPartDocProps(): DocProps
+    {
+        return $this->writerPartDocProps;
+    }
+
+    public function getWriterPartDrawing(): Drawing
+    {
+        return $this->writerPartDrawing;
+    }
+
+    public function getWriterPartRels(): Rels
+    {
+        return $this->writerPartRels;
+    }
+
+    public function getWriterPartRelsRibbon(): RelsRibbon
+    {
+        return $this->writerPartRelsRibbon;
+    }
+
+    public function getWriterPartRelsVBA(): RelsVBA
+    {
+        return $this->writerPartRelsVBA;
+    }
+
+    public function getWriterPartStringTable(): StringTable
+    {
+        return $this->writerPartStringTable;
+    }
+
+    public function getWriterPartStyle(): Style
+    {
+        return $this->writerPartStyle;
+    }
+
+    public function getWriterPartTheme(): Theme
+    {
+        return $this->writerPartTheme;
+    }
+
+    public function getWriterPartTable(): Table
+    {
+        return $this->writerPartTable;
+    }
+
+    public function getWriterPartWorkbook(): Workbook
+    {
+        return $this->writerPartWorkbook;
+    }
+
+    public function getWriterPartWorksheet(): Worksheet
+    {
+        return $this->writerPartWorksheet;
     }
 
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param string $pFilename
-     *
-     * @throws WriterException
+     * @param resource|string $filename
      */
-    public function save($pFilename)
+    public function save($filename, int $flags = 0): void
     {
-        if ($this->spreadSheet !== null) {
-            // garbage collect
-            $this->spreadSheet->garbageCollect();
+        $this->processFlags($flags);
 
-            // If $pFilename is php://output or php://stdout, make it a temporary file...
-            $originalFilename = $pFilename;
-            if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-                $pFilename = @tempnam(File::sysGetTempDir(), 'phpxltmp');
-                if ($pFilename == '') {
-                    $pFilename = $originalFilename;
-                }
-            }
+        // garbage collect
+        $this->pathNames = [];
+        $this->spreadSheet->garbageCollect();
 
-            $saveDebugLog = Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
-            Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
-            $saveDateReturnType = Functions::getReturnDateType();
-            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        $saveDebugLog = Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveDateReturnType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
 
-            // Create string lookup table
-            $this->stringTable = [];
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $this->stringTable = $this->getWriterPart('StringTable')->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
-            }
-
-            // Create styles dictionaries
-            $this->styleHashTable->addFromSource($this->getWriterPart('Style')->allStyles($this->spreadSheet));
-            $this->stylesConditionalHashTable->addFromSource($this->getWriterPart('Style')->allConditionalStyles($this->spreadSheet));
-            $this->fillHashTable->addFromSource($this->getWriterPart('Style')->allFills($this->spreadSheet));
-            $this->fontHashTable->addFromSource($this->getWriterPart('Style')->allFonts($this->spreadSheet));
-            $this->bordersHashTable->addFromSource($this->getWriterPart('Style')->allBorders($this->spreadSheet));
-            $this->numFmtHashTable->addFromSource($this->getWriterPart('Style')->allNumberFormats($this->spreadSheet));
-
-            // Create drawing dictionary
-            $this->drawingHashTable->addFromSource($this->getWriterPart('Drawing')->allDrawings($this->spreadSheet));
-
-            $zip = new ZipArchive();
-
-            if (file_exists($pFilename)) {
-                unlink($pFilename);
-            }
-            // Try opening the ZIP file
-            if ($zip->open($pFilename, ZipArchive::OVERWRITE) !== true) {
-                if ($zip->open($pFilename, ZipArchive::CREATE) !== true) {
-                    throw new WriterException('Could not open ' . $pFilename . ' for writing.');
-                }
-            }
-
-            // Add [Content_Types].xml to ZIP file
-            $zip->addFromString('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
-
-            //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
-            if ($this->spreadSheet->hasMacros()) {
-                $macrosCode = $this->spreadSheet->getMacrosCode();
-                if ($macrosCode !== null) {
-                    // we have the code ?
-                    $zip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
-                    if ($this->spreadSheet->hasMacrosCertificate()) {
-                        //signed macros ?
-                        // Yes : add the certificate file and the related rels file
-                        $zip->addFromString('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
-                        $zip->addFromString('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
-                    }
-                }
-            }
-            //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');
-                $zip->addFromString($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) {
-                        $zip->addFromString($tmpRootPath . $aPath, $aContent);
-                    }
-                    //the rels for files
-                    $zip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
-                }
-            }
-
-            // Add relationships to ZIP file
-            $zip->addFromString('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
-            $zip->addFromString('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
-
-            // Add document properties to ZIP file
-            $zip->addFromString('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
-            $zip->addFromString('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
-            $customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->spreadSheet);
-            if ($customPropertiesPart !== null) {
-                $zip->addFromString('docProps/custom.xml', $customPropertiesPart);
-            }
-
-            // Add theme to ZIP file
-            $zip->addFromString('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
-
-            // Add string table to ZIP file
-            $zip->addFromString('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
-
-            // Add styles to ZIP file
-            $zip->addFromString('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
-
-            // Add workbook to ZIP file
-            $zip->addFromString('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
-
-            $chartCount = 0;
-            // Add worksheets
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $zip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
-                if ($this->includeCharts) {
-                    $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
-                    if (count($charts) > 0) {
-                        foreach ($charts as $chart) {
-                            $zip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
-                            ++$chartCount;
-                        }
-                    }
-                }
-            }
-
-            $chartRef1 = 0;
-            // Add worksheet relationships (drawings, ...)
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                // Add relationships
-                $zip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
-
-                // Add unparsedLoadedData
-                $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
-                $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
-                        $zip->addFromString($ctrlProp['filePath'], $ctrlProp['content']);
-                    }
-                }
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
-                        $zip->addFromString($ctrlProp['filePath'], $ctrlProp['content']);
-                    }
-                }
-
-                $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
-                $drawingCount = count($drawings);
-                if ($this->includeCharts) {
-                    $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
-                }
-
-                // Add drawing and image relationship parts
-                if (($drawingCount > 0) || ($chartCount > 0)) {
-                    // Drawing relationships
-                    $zip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
-
-                    // Drawings
-                    $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
-                } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
-                    // Drawings
-                    $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
-                }
-
-                // Add unparsed drawings
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'] as $relId => $drawingXml) {
-                        $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
-                        if ($drawingFile !== false) {
-                            $drawingFile = ltrim($drawingFile, '.');
-                            $zip->addFromString('xl' . $drawingFile, $drawingXml);
-                        }
-                    }
-                }
-
-                // Add comment relationship parts
-                if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
-                    // VML Comments
-                    $zip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
-
-                    // Comments
-                    $zip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
-                }
-
-                // Add unparsed relationship parts
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
-                        $zip->addFromString($vmlDrawing['filePath'], $vmlDrawing['content']);
-                    }
-                }
-
-                // Add header/footer relationship parts
-                if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
-                    // VML Drawings
-                    $zip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
-
-                    // VML Drawing relationships
-                    $zip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
-
-                    // Media
-                    foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                        $zip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
-                    }
-                }
-            }
-
-            // Add media
-            for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
-                if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
-                    $imageContents = null;
-                    $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
-                    if (strpos($imagePath, 'zip://') !== false) {
-                        $imagePath = substr($imagePath, 6);
-                        $imagePathSplitted = explode('#', $imagePath);
-
-                        $imageZip = new ZipArchive();
-                        $imageZip->open($imagePathSplitted[0]);
-                        $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
-                        $imageZip->close();
-                        unset($imageZip);
-                    } else {
-                        $imageContents = file_get_contents($imagePath);
-                    }
-
-                    $zip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-                } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
-                    ob_start();
-                    call_user_func(
-                        $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
-                        $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
-                    );
-                    $imageContents = ob_get_contents();
-                    ob_end_clean();
-
-                    $zip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-                }
-            }
-
-            Functions::setReturnDateType($saveDateReturnType);
-            Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-
-            // Close file
-            if ($zip->close() === false) {
-                throw new WriterException("Could not close zip file $pFilename.");
-            }
-
-            // If a temporary file was used, copy it to the correct file stream
-            if ($originalFilename != $pFilename) {
-                if (copy($pFilename, $originalFilename) === false) {
-                    throw new WriterException("Could not copy temporary zip file $pFilename to $originalFilename.");
-                }
-                @unlink($pFilename);
-            }
-        } else {
-            throw new WriterException('PhpSpreadsheet object unassigned.');
+        // Create string lookup table
+        $this->stringTable = [];
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $this->stringTable = $this->getWriterPartStringTable()->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
         }
+
+        // Create styles dictionaries
+        $this->styleHashTable->addFromSource($this->getWriterPartStyle()->allStyles($this->spreadSheet));
+        $this->stylesConditionalHashTable->addFromSource($this->getWriterPartStyle()->allConditionalStyles($this->spreadSheet));
+        $this->fillHashTable->addFromSource($this->getWriterPartStyle()->allFills($this->spreadSheet));
+        $this->fontHashTable->addFromSource($this->getWriterPartStyle()->allFonts($this->spreadSheet));
+        $this->bordersHashTable->addFromSource($this->getWriterPartStyle()->allBorders($this->spreadSheet));
+        $this->numFmtHashTable->addFromSource($this->getWriterPartStyle()->allNumberFormats($this->spreadSheet));
+
+        // Create drawing dictionary
+        $this->drawingHashTable->addFromSource($this->getWriterPartDrawing()->allDrawings($this->spreadSheet));
+
+        $zipContent = [];
+        // Add [Content_Types].xml to ZIP file
+        $zipContent['[Content_Types].xml'] = $this->getWriterPartContentTypes()->writeContentTypes($this->spreadSheet, $this->includeCharts);
+
+        //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
+        if ($this->spreadSheet->hasMacros()) {
+            $macrosCode = $this->spreadSheet->getMacrosCode();
+            if ($macrosCode !== null) {
+                // we have the code ?
+                $zipContent['xl/vbaProject.bin'] = $macrosCode; //allways in 'xl', allways named vbaProject.bin
+                if ($this->spreadSheet->hasMacrosCertificate()) {
+                    //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();
+                }
+            }
+        }
+        //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
+                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);
+            }
+        }
+
+        // Add relationships to ZIP file
+        $zipContent['_rels/.rels'] = $this->getWriterPartRels()->writeRelationships($this->spreadSheet);
+        $zipContent['xl/_rels/workbook.xml.rels'] = $this->getWriterPartRels()->writeWorkbookRelationships($this->spreadSheet);
+
+        // Add document properties to ZIP file
+        $zipContent['docProps/app.xml'] = $this->getWriterPartDocProps()->writeDocPropsApp($this->spreadSheet);
+        $zipContent['docProps/core.xml'] = $this->getWriterPartDocProps()->writeDocPropsCore($this->spreadSheet);
+        $customPropertiesPart = $this->getWriterPartDocProps()->writeDocPropsCustom($this->spreadSheet);
+        if ($customPropertiesPart !== null) {
+            $zipContent['docProps/custom.xml'] = $customPropertiesPart;
+        }
+
+        // Add theme to ZIP file
+        $zipContent['xl/theme/theme1.xml'] = $this->getWriterPartTheme()->writeTheme($this->spreadSheet);
+
+        // Add string table to ZIP file
+        $zipContent['xl/sharedStrings.xml'] = $this->getWriterPartStringTable()->writeStringTable($this->stringTable);
+
+        // Add styles to ZIP file
+        $zipContent['xl/styles.xml'] = $this->getWriterPartStyle()->writeStyles($this->spreadSheet);
+
+        // Add workbook to ZIP file
+        $zipContent['xl/workbook.xml'] = $this->getWriterPartWorkbook()->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas);
+
+        $chartCount = 0;
+        // Add worksheets
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $zipContent['xl/worksheets/sheet' . ($i + 1) . '.xml'] = $this->getWriterPartWorksheet()->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts);
+            if ($this->includeCharts) {
+                $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
+                if (count($charts) > 0) {
+                    foreach ($charts as $chart) {
+                        $zipContent['xl/charts/chart' . ($chartCount + 1) . '.xml'] = $this->getWriterPartChart()->writeChart($chart, $this->preCalculateFormulas);
+                        ++$chartCount;
+                    }
+                }
+            }
+        }
+
+        $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, $tableRef1);
+
+            // Add unparsedLoadedData
+            $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
+            $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
+                    $zipContent[$ctrlProp['filePath']] = $ctrlProp['content'];
+                }
+            }
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
+                    $zipContent[$ctrlProp['filePath']] = $ctrlProp['content'];
+                }
+            }
+
+            $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
+            $drawingCount = count($drawings);
+            if ($this->includeCharts) {
+                $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
+            }
+
+            // Add drawing and image relationship parts
+            if (($drawingCount > 0) || ($chartCount > 0)) {
+                // Drawing relationships
+                $zipContent['xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts);
+
+                // Drawings
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $this->getWriterPartDrawing()->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts);
+            } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
+                // Drawings
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $this->getWriterPartDrawing()->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts);
+            }
+
+            // Add unparsed drawings
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'])) {
+                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;
+                        $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $drawingXml;
+                    }
+                }
+            }
+
+            // Add comment relationship parts
+            $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'] = $legacy ?? $this->getWriterPartComments()->writeVMLComments($this->spreadSheet->getSheet($i));
+            }
+
+            // 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) {
+                    if (!isset($zipContent[$vmlDrawing['filePath']])) {
+                        $zipContent[$vmlDrawing['filePath']] = $vmlDrawing['content'];
+                    }
+                }
+            }
+
+            // Add header/footer relationship parts
+            if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
+                // VML Drawings
+                $zipContent['xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml'] = $this->getWriterPartDrawing()->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i));
+
+                // VML Drawing relationships
+                $zipContent['xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels'] = $this->getWriterPartRels()->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i));
+
+                // Media
+                foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
+                    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
+        for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
+            if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
+                $imageContents = null;
+                $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
+                if ($imagePath === '') {
+                    continue;
+                }
+                if (strpos($imagePath, 'zip://') !== false) {
+                    $imagePath = substr($imagePath, 6);
+                    $imagePathSplitted = explode('#', $imagePath);
+
+                    $imageZip = new ZipArchive();
+                    $imageZip->open($imagePathSplitted[0]);
+                    $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
+                    $imageZip->close();
+                    unset($imageZip);
+                } else {
+                    $imageContents = file_get_contents($imagePath);
+                }
+
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
+            } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
+                ob_start();
+                /** @var callable */
+                $callable = $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction();
+                call_user_func(
+                    $callable,
+                    $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
+                );
+                $imageContents = ob_get_contents();
+                ob_end_clean();
+
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
+            }
+        }
+
+        Functions::setReturnDateType($saveDateReturnType);
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+        $this->openFileHandle($filename);
+
+        $this->zip = ZipStream0::newZipStream($this->fileHandle);
+
+        $this->addZipFiles($zipContent);
+
+        // Close file
+        try {
+            $this->zip->finish();
+        } catch (OverflowException $e) {
+            throw new WriterException('Could not close resource.');
+        }
+
+        $this->maybeCloseFileHandle();
     }
 
     /**
      * Get Spreadsheet object.
      *
-     * @throws WriterException
-     *
      * @return Spreadsheet
      */
     public function getSpreadsheet()
     {
-        if ($this->spreadSheet !== null) {
-            return $this->spreadSheet;
-        }
-
-        throw new WriterException('No Spreadsheet object assigned.');
+        return $this->spreadSheet;
     }
 
     /**
@@ -465,7 +601,7 @@ class Xlsx extends BaseWriter
     /**
      * Get Style HashTable.
      *
-     * @return HashTable
+     * @return HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
      */
     public function getStyleHashTable()
     {
@@ -475,7 +611,7 @@ class Xlsx extends BaseWriter
     /**
      * Get Conditional HashTable.
      *
-     * @return HashTable
+     * @return HashTable<Conditional>
      */
     public function getStylesConditionalHashTable()
     {
@@ -485,7 +621,7 @@ class Xlsx extends BaseWriter
     /**
      * Get Fill HashTable.
      *
-     * @return HashTable
+     * @return HashTable<Fill>
      */
     public function getFillHashTable()
     {
@@ -495,7 +631,7 @@ class Xlsx extends BaseWriter
     /**
      * Get \PhpOffice\PhpSpreadsheet\Style\Font HashTable.
      *
-     * @return HashTable
+     * @return HashTable<Font>
      */
     public function getFontHashTable()
     {
@@ -505,7 +641,7 @@ class Xlsx extends BaseWriter
     /**
      * Get Borders HashTable.
      *
-     * @return HashTable
+     * @return HashTable<Borders>
      */
     public function getBordersHashTable()
     {
@@ -515,7 +651,7 @@ class Xlsx extends BaseWriter
     /**
      * Get NumberFormat HashTable.
      *
-     * @return HashTable
+     * @return HashTable<NumberFormat>
      */
     public function getNumFmtHashTable()
     {
@@ -525,7 +661,7 @@ class Xlsx extends BaseWriter
     /**
      * Get \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\BaseDrawing HashTable.
      *
-     * @return HashTable
+     * @return HashTable<BaseDrawing>
      */
     public function getDrawingHashTable()
     {
@@ -545,14 +681,83 @@ class Xlsx extends BaseWriter
     /**
      * Set Office2003 compatibility.
      *
-     * @param bool $pValue Office2003 compatibility?
+     * @param bool $office2003compatibility Office2003 compatibility?
      *
      * @return $this
      */
-    public function setOffice2003Compatibility($pValue)
+    public function setOffice2003Compatibility($office2003compatibility)
     {
-        $this->office2003compatibility = $pValue;
+        $this->office2003compatibility = $office2003compatibility;
 
         return $this;
     }
+
+    /** @var array */
+    private $pathNames = [];
+
+    private function addZipFile(string $path, string $content): void
+    {
+        if (!in_array($path, $this->pathNames)) {
+            $this->pathNames[] = $path;
+            $this->zip->addFile($path, $content);
+        }
+    }
+
+    private function addZipFiles(array $zipContent): void
+    {
+        foreach ($zipContent as $path => $content) {
+            $this->addZipFile($path, $content);
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    private function processDrawing(WorksheetDrawing $drawing)
+    {
+        $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;
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php
new file mode 100644
index 000000000..ebe434111
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index c9c3e055b..6d302aac4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -3,21 +3,22 @@
 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
      */
@@ -26,17 +27,12 @@ class Chart extends WriterPart
     /**
      * Write charts to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Chart\Chart $pChart
      * @param mixed $calculateCellValues
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $calculateCellValues = true)
+    public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $chart, $calculateCellValues = true)
     {
-        $this->calculateCellValues = $calculateCellValues;
-
         // Create XML writer
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -45,8 +41,8 @@ class Chart extends WriterPart
             $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
@@ -54,65 +50,105 @@ class Chart extends WriterPart
 
         // 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;
 
-        $this->writeLegend($objWriter, $pChart->getLegend());
+                    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->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->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
-     *
-     * @throws WriterException
      */
-    private function writeTitle(XMLWriter $objWriter, Title $title = null)
+    private function writeTitle(XMLWriter $objWriter, ?Title $title = null): void
     {
         if ($title === null) {
             return;
@@ -129,12 +165,16 @@ class Chart extends WriterPart
         $objWriter->endElement();
 
         $objWriter->startElement('a:p');
+        $objWriter->startElement('a:pPr');
+        $objWriter->startElement('a:defRPr');
+        $objWriter->endElement();
+        $objWriter->endElement();
 
         $caption = $title->getCaption();
         if ((is_array($caption)) && (count($caption) > 0)) {
             $caption = $caption[0];
         }
-        $this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');
+        $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
         $objWriter->endElement();
         $objWriter->endElement();
@@ -143,7 +183,7 @@ class Chart extends WriterPart
         $this->writeLayout($objWriter, $title->getLayout());
 
         $objWriter->startElement('c:overlay');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', ($title->getOverlay()) ? '1' : '0');
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -151,13 +191,8 @@ class Chart extends WriterPart
 
     /**
      * Write Chart Legend.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Legend $legend
-     *
-     * @throws WriterException
      */
-    private function writeLegend(XMLWriter $objWriter, Legend $legend = null)
+    private function writeLegend(XMLWriter $objWriter, ?Legend $legend = null): void
     {
         if ($legend === null) {
             return;
@@ -175,6 +210,17 @@ class Chart extends WriterPart
         $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();
@@ -184,44 +230,36 @@ class Chart extends WriterPart
 
         $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 \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pSheet
-     * @param PlotArea $plotArea
-     * @param Title $xAxisLabel
-     * @param Title $yAxisLabel
-     * @param Axis $xAxis
-     * @param Axis $yAxis
-     * @param null|GridLines $majorGridlines
-     * @param null|GridLines $minorGridlines
-     *
-     * @throws WriterException
      */
-    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)
+    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');
 
@@ -232,23 +270,29 @@ class Chart extends WriterPart
         $chartTypes = self::getChartType($plotArea);
         $catIsMultiLevelSeries = $valIsMultiLevelSeries = false;
         $plotGroupingType = '';
+        $chartType = null;
         foreach ($chartTypes as $chartType) {
             $objWriter->startElement('c:' . $chartType);
 
             $groupCount = $plotArea->getPlotGroupCount();
+            $plotGroup = null;
             for ($i = 0; $i < $groupCount; ++$i) {
                 $plotGroup = $plotArea->getPlotGroupByIndex($i);
                 $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);
@@ -257,51 +301,62 @@ class Chart extends WriterPart
 
             $this->writeDataLabels($objWriter, $layout);
 
-            if ($chartType === DataSeries::TYPE_LINECHART) {
+            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');
@@ -310,14 +365,19 @@ class Chart extends WriterPart
                 $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();
                 }
             }
@@ -327,101 +387,194 @@ class Chart extends WriterPart
 
         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, $yAxis);
+                $this->writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $catIsMultiLevelSeries, $xAxis ?? new Axis());
             }
 
-            $this->writeValueAxis($objWriter, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $xAxis, $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)
+    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();
+        $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:showVal');
-        $showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
-        $objWriter->writeAttribute('val', ((empty($showVal)) ? 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:showCatName');
-        $showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
-        $objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1));
-        $objWriter->endElement();
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, $labelFont, $chartLayout->getLabelEffects());
 
-        $objWriter->startElement('c:showSerName');
-        $showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
-        $objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1));
-        $objWriter->endElement();
+            $objWriter->endElement(); // c:txPr
+        }
 
-        $objWriter->startElement('c:showPercent');
-        $showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
-        $objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1));
-        $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->startElement('c:showBubbleSize');
-        $showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
-        $objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:showLeaderLines');
-        $showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
-        $objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1));
-        $objWriter->endElement();
-
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:dLbls
     }
 
     /**
      * Write Category Axis.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $xAxisLabel
      * @param string $id1
      * @param string $id2
      * @param bool $isMultiLevelSeries
-     * @param Axis $yAxis
-     *
-     * @throws WriterException
      */
-    private function writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $isMultiLevelSeries, Axis $yAxis)
+    private function writeCategoryAxis(XMLWriter $objWriter, ?Title $xAxisLabel, $id1, $id2, $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 ($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');
@@ -434,26 +587,22 @@ class Chart extends WriterPart
             $objWriter->endElement();
 
             $objWriter->startElement('a:p');
-            $objWriter->startElement('a:r');
 
             $caption = $xAxisLabel->getCaption();
             if (is_array($caption)) {
                 $caption = $caption[0];
             }
-            $objWriter->startElement('a:t');
-            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($caption));
-            $objWriter->endElement();
+            $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
             $objWriter->endElement();
             $objWriter->endElement();
             $objWriter->endElement();
-            $objWriter->endElement();
 
             $layout = $xAxisLabel->getLayout();
             $this->writeLayout($objWriter, $layout);
 
             $objWriter->startElement('c:overlay');
-            $objWriter->writeAttribute('val', 0);
+            $objWriter->writeAttribute('val', '0');
             $objWriter->endElement();
 
             $objWriter->endElement();
@@ -464,30 +613,73 @@ class Chart extends WriterPart
         $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();
+        }
 
-        if ($id2 > 0) {
+        $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
+        }
+
+        $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');
@@ -495,12 +687,36 @@ class Chart extends WriterPart
         $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();
@@ -509,23 +725,18 @@ class Chart extends WriterPart
     /**
      * Write Value Axis.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $yAxisLabel
-     * @param string $groupType Chart type
+     * @param null|string $groupType Chart type
      * @param string $id1
      * @param string $id2
      * @param bool $isMultiLevelSeries
-     * @param Axis $xAxis
-     * @param GridLines $majorGridlines
-     * @param GridLines $minorGridlines
-     *
-     * @throws WriterException
      */
-    private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, Axis $xAxis, GridLines $majorGridlines, GridLines $minorGridlines)
+    private function writeValueAxis(XMLWriter $objWriter, ?Title $yAxisLabel, $groupType, $id1, $id2, $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();
@@ -545,229 +756,36 @@ class Chart extends WriterPart
             $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 !== 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 ($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
-        }
-
-        $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
         }
@@ -784,18 +802,13 @@ class Chart extends WriterPart
             $objWriter->endElement();
 
             $objWriter->startElement('a:p');
-            $objWriter->startElement('a:r');
 
             $caption = $yAxisLabel->getCaption();
             if (is_array($caption)) {
                 $caption = $caption[0];
             }
+            $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
-            $objWriter->startElement('a:t');
-            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($caption));
-            $objWriter->endElement();
-
-            $objWriter->endElement();
             $objWriter->endElement();
             $objWriter->endElement();
             $objWriter->endElement();
@@ -806,7 +819,7 @@ class Chart extends WriterPart
             }
 
             $objWriter->startElement('c:overlay');
-            $objWriter->writeAttribute('val', 0);
+            $objWriter->writeAttribute('val', '0');
             $objWriter->endElement();
 
             $objWriter->endElement();
@@ -817,143 +830,51 @@ class Chart extends WriterPart
         $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
         $objWriter->endElement();
 
-        $objWriter->startElement('c:majorTickMark');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
-        $objWriter->endElement();
+        if (!empty($xAxis->getAxisOptionsProperty('major_tick_mark'))) {
+            $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();
+        if (!empty($xAxis->getAxisOptionsProperty('minor_tick_mark'))) {
+            $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();
+        if (!empty($xAxis->getAxisOptionsProperty('axis_labels'))) {
+            $objWriter->startElement('c:tickLblPos');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
+            $objWriter->endElement();
+        }
+
+        $textRotation = $xAxis->getAxisOptionsProperty('textRotation');
+        $axisText = $xAxis->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
+        }
 
         $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();
-        }
-
-        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();
-        }
-
-        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();
-
-        $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']));
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
-        }
-
-        if ($xAxis->getShadowProperty('presets') !== null) {
-            $objWriter->startElement("a:{$xAxis->getShadowProperty('effect')}");
-
-            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'));
-            }
-
-            $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();
-        }
-
-        if ($xAxis->getSoftEdgesSize() !== null) {
-            $objWriter->startElement('a:softEdge');
-            $objWriter->writeAttribute('rad', $xAxis->getSoftEdgesSize());
-            $objWriter->endElement();
-        }
-
-        $objWriter->endElement(); //effectList
+        $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) {
@@ -961,14 +882,20 @@ class Chart extends WriterPart
                 $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
                 $objWriter->endElement();
             } else {
-                $objWriter->startElement('c:crosses');
-                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses'));
-                $objWriter->endElement();
+                $crosses = $xAxis->getAxisOptionsProperty('horizontal_crosses');
+                if ($crosses) {
+                    $objWriter->startElement('c:crosses');
+                    $objWriter->writeAttribute('val', $crosses);
+                    $objWriter->endElement();
+                }
             }
 
-            $objWriter->startElement('c:crossBetween');
-            $objWriter->writeAttribute('val', 'midCat');
-            $objWriter->endElement();
+            $crossBetween = $xAxis->getCrossBetween();
+            if ($crossBetween !== '') {
+                $objWriter->startElement('c:crossBetween');
+                $objWriter->writeAttribute('val', $crossBetween);
+                $objWriter->endElement();
+            }
 
             if ($xAxis->getAxisOptionsProperty('major_unit') !== null) {
                 $objWriter->startElement('c:majorUnit');
@@ -986,7 +913,7 @@ class Chart extends WriterPart
         if ($isMultiLevelSeries) {
             if ($groupType !== DataSeries::TYPE_BUBBLECHART) {
                 $objWriter->startElement('c:noMultiLvlLbl');
-                $objWriter->writeAttribute('val', 0);
+                $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
             }
         }
@@ -994,16 +921,60 @@ class Chart extends WriterPart
         $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
-     *
-     * @throws WriterException
-     *
-     * @return array|string
+     * @return string[]
      */
-    private static function getChartType($plotArea)
+    private static function getChartType(PlotArea $plotArea): array
     {
         $groupCount = $plotArea->getPlotGroupCount();
 
@@ -1025,49 +996,34 @@ class Chart extends WriterPart
 
     /**
      * 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
-     *
-     * @throws WriterException
+     * @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)
+    private function writePlotGroup(?DataSeries $plotGroup, string $groupType, XMLWriter $objWriter, &$catIsMultiLevelSeries, &$valIsMultiLevelSeries, &$plotGroupingType): void
     {
         if ($plotGroup === null) {
             return;
@@ -1079,8 +1035,8 @@ class Chart extends WriterPart
             $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();
@@ -1094,57 +1050,53 @@ class Chart extends WriterPart
             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();
                 }
             }
         }
 
+        $plotSeriesIdx = 0;
         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();
 
-            //    Values
-            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
+            $plotLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
+            $labelFill = null;
+            if ($plotLabel && $groupType === DataSeries::TYPE_LINECHART) {
+                $labelFill = $plotLabel->getFillColorObject();
+                $labelFill = ($labelFill instanceof ChartColor) ? $labelFill : null;
+            }
 
-            if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART)) {
-                $fillColorValues = $plotSeriesValues->getFillColor();
+            //    Values
+            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesIdx);
+
+            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'));
+                        $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');
@@ -1154,35 +1106,62 @@ class Chart extends WriterPart
             }
 
             //    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();
@@ -1191,23 +1170,103 @@ class Chart extends WriterPart
 
             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();
                     }
                 }
 
@@ -1217,7 +1276,14 @@ class Chart extends WriterPart
                     $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();
             }
 
@@ -1233,10 +1299,31 @@ class Chart extends WriterPart
 
                 $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();
@@ -1247,11 +1334,8 @@ class Chart extends WriterPart
 
     /**
      * Write Plot Series Label.
-     *
-     * @param DataSeriesValues $plotSeriesLabel
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writePlotSeriesLabel($plotSeriesLabel, $objWriter)
+    private function writePlotSeriesLabel(?DataSeriesValues $plotSeriesLabel, XMLWriter $objWriter): void
     {
         if ($plotSeriesLabel === null) {
             return;
@@ -1263,7 +1347,7 @@ class Chart extends WriterPart
 
         $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) {
@@ -1281,12 +1365,10 @@ class Chart extends WriterPart
     /**
      * 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')
+    private function writePlotSeriesValues(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter, $groupType, $dataType = 'str'): void
     {
         if ($plotSeriesValues === null) {
             return;
@@ -1304,7 +1386,7 @@ class Chart extends WriterPart
             $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) {
@@ -1335,23 +1417,26 @@ class Chart extends WriterPart
             $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 && 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);
@@ -1362,21 +1447,26 @@ class Chart extends WriterPart
                         $objWriter->endElement();
                     }
                 }
+
+                $objWriter->endElement(); // *Cache
             }
 
-            $objWriter->endElement();
-
-            $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)
+    private function writeBubbles(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter): void
     {
         if ($plotSeriesValues === null) {
             return;
@@ -1390,20 +1480,18 @@ class Chart extends WriterPart
         $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();
             }
         }
 
@@ -1411,17 +1499,14 @@ class Chart extends WriterPart
         $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)
+    private function writeLayout(XMLWriter $objWriter, ?Layout $layout = null): void
     {
         $objWriter->startElement('c:layout');
 
@@ -1452,28 +1537,28 @@ class Chart extends WriterPart
             $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();
             }
 
@@ -1485,17 +1570,15 @@ class Chart extends WriterPart
 
     /**
      * Write Alternate Content block.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeAlternateContent($objWriter)
+    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');
@@ -1513,10 +1596,8 @@ class Chart extends WriterPart
 
     /**
      * Write Printer Settings.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writePrintSettings($objWriter)
+    private function writePrintSettings(XMLWriter $objWriter): void
     {
         $objWriter->startElement('c:printSettings');
 
@@ -1524,12 +1605,12 @@ class Chart extends WriterPart
         $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');
@@ -1538,4 +1619,224 @@ class Chart extends WriterPart
 
         $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 = $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');
+            }
+            $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
index a95298afc..91973884c 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
@@ -4,6 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 
 class Comments extends WriterPart
@@ -11,13 +12,9 @@ class Comments extends WriterPart
     /**
      * Write comments to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet)
     {
         // Create XML writer
         $objWriter = null;
@@ -31,7 +28,7 @@ class Comments extends WriterPart
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
         // Comments cache
-        $comments = $pWorksheet->getComments();
+        $comments = $worksheet->getComments();
 
         // Authors cache
         $authors = [];
@@ -44,7 +41,7 @@ class Comments extends WriterPart
 
         // 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');
@@ -69,23 +66,20 @@ class Comments extends WriterPart
     /**
      * 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
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     * @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)
+    private function writeComment(XMLWriter $objWriter, $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()->getWriterPart('stringtable')->writeRichText($objWriter, $pComment->getText());
+        $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $comment->getText());
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -94,13 +88,9 @@ class Comments extends WriterPart
     /**
      * Write VML comments to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet)
     {
         // Create XML writer
         $objWriter = null;
@@ -114,13 +104,13 @@ class Comments extends WriterPart
         $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');
@@ -168,29 +158,33 @@ class Comments extends WriterPart
     /**
      * 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)
+    private function writeVMLComment(XMLWriter $objWriter, $cellReference, Comment $comment): void
     {
         // Metadata
-        [$column, $row] = Coordinate::coordinateFromString($pCellReference);
-        $column = Coordinate::columnIndexFromString($column);
+        [$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
@@ -230,10 +224,10 @@ class Comments extends WriterPart
         $objWriter->writeElement('x:AutoFill', 'False');
 
         // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
index 6b22d7134..56f062b56 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
+++ b/libraries/phpspreadsheet/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;
 
@@ -13,11 +15,8 @@ class ContentTypes extends WriterPart
     /**
      * Write content types to XML format.
      *
-     * @param Spreadsheet $spreadsheet
      * @param bool $includeCharts Flag indicating if we should include drawing details for charts
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
     public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = false)
@@ -35,7 +34,7 @@ class ContentTypes extends WriterPart
 
         // 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');
@@ -88,6 +87,16 @@ class ContentTypes extends WriterPart
         // 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;
@@ -124,18 +133,23 @@ class ContentTypes extends WriterPart
             $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);
@@ -144,7 +158,7 @@ class ContentTypes extends WriterPart
         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);
@@ -154,13 +168,30 @@ class ContentTypes extends WriterPart
         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]);
+                    }
+                }
+            }
         }
 
         // unparsed defaults
@@ -186,39 +217,34 @@ class ContentTypes extends WriterPart
     /**
      * Get image mime type.
      *
-     * @param string $pFile Filename
-     *
-     * @throws WriterException
+     * @param string $filename Filename
      *
      * @return string Mime Type
      */
-    private function getImageMimeType($pFile)
+    private function getImageMimeType($filename)
     {
-        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) >= 3) ? $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
-     *
-     * @throws WriterException
+     * @param string $partName Part name
+     * @param string $contentType Content type
      */
-    private function writeDefaultContentType(XMLWriter $objWriter, $pPartname, $pContentType)
+    private function writeDefaultContentType(XMLWriter $objWriter, $partName, $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.');
@@ -228,19 +254,16 @@ class ContentTypes extends WriterPart
     /**
      * Write Override content type.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pPartname Part name
-     * @param string $pContentType Content type
-     *
-     * @throws WriterException
+     * @param string $partName Part name
+     * @param string $contentType Content type
      */
-    private function writeOverrideContentType(XMLWriter $objWriter, $pPartname, $pContentType)
+    private function writeOverrideContentType(XMLWriter $objWriter, $partName, $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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
new file mode 100644
index 000000000..f83280c5a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -0,0 +1,244 @@
+<?php
+
+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 as ActualWorksheet;
+
+class DefinedNames
+{
+    /** @var XMLWriter */
+    private $objWriter;
+
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function write(): void
+    {
+        // Write defined names
+        $this->objWriter->startElement('definedNames');
+
+        // Named ranges
+        if (count($this->spreadsheet->getDefinedNames()) > 0) {
+            // Named ranges
+            $this->writeNamedRangesAndFormulae();
+        }
+
+        // Other defined names
+        $sheetCount = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // NamedRange for autoFilter
+            $this->writeNamedRangeForAutofilter($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Titles
+            $this->writeNamedRangeForPrintTitles($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Area
+            $this->writeNamedRangeForPrintArea($this->spreadsheet->getSheet($i), $i);
+        }
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write defined names.
+     */
+    private function writeNamedRangesAndFormulae(): void
+    {
+        // Loop named ranges
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        foreach ($definedNames as $definedName) {
+            $this->writeDefinedName($definedName);
+        }
+    }
+
+    /**
+     * Write Defined Name for named range.
+     */
+    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 $e) {
+                // See issue 2266 - deleting sheet which contains
+                //     defined names will cause Exception above.
+                return;
+            }
+        }
+        $this->objWriter->startElement('definedName');
+        $this->objWriter->writeAttribute('name', $definedName->getName());
+        if ($local >= 0) {
+            $this->objWriter->writeAttribute(
+                'localSheetId',
+                "$local"
+            );
+        }
+
+        $definedRange = $this->getDefinedRange($definedName);
+
+        $this->objWriter->writeRawData($definedRange);
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write Defined Name for autoFilter.
+     */
+    private function writeNamedRangeForAutofilter(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for autoFilter
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
+            $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]] = ActualWorksheet::extractSheetTitle($range[0], true);
+
+            $range[0] = Coordinate::absoluteCoordinate($range[0]);
+            if (count($range) > 1) {
+                $range[1] = Coordinate::absoluteCoordinate($range[1]);
+            }
+            $range = implode(':', $range);
+
+            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . $range);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintTitles(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for PrintTitles
+        if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Titles');
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
+
+            // Setting string
+            $settingString = '';
+
+            // Columns to repeat
+            if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                $repeat = $worksheet->getPageSetup()->getColumnsToRepeatAtLeft();
+
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            // Rows to repeat
+            if ($worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                    $settingString .= ',';
+                }
+
+                $repeat = $worksheet->getPageSetup()->getRowsToRepeatAtTop();
+
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            $this->objWriter->writeRawData($settingString);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintArea(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for PrintArea
+        if ($worksheet->getPageSetup()->isPrintAreaSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Area');
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
+
+            // Print area
+            $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("'", "''", $worksheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+            }
+
+            $this->objWriter->writeRawData(implode(',', $chunks));
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    private function getDefinedRange(DefinedName $definedName): string
+    {
+        $definedRange = $definedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We should have a worksheet
+                    $ws = $definedName->getWorksheet();
+                    $worksheet = ($ws === null) ? null : $ws->getTitle();
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+            $newRange = "{$newRange}{$column}{$row}";
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        if (substr($definedRange, 0, 1) === '=') {
+            $definedRange = substr($definedRange, 1);
+        }
+
+        return $definedRange;
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
index 2a18d5c7e..8c33f5932 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
@@ -2,6 +2,9 @@
 
 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;
 
@@ -10,10 +13,6 @@ class DocProps extends WriterPart
     /**
      * Write docProps/app.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
     public function writeDocPropsApp(Spreadsheet $spreadsheet)
@@ -31,8 +30,8 @@ class DocProps extends WriterPart
 
         // 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');
@@ -58,7 +57,7 @@ class DocProps extends WriterPart
 
         // Variant
         $objWriter->startElement('vt:variant');
-        $objWriter->writeElement('vt:i4', $spreadsheet->getSheetCount());
+        $objWriter->writeElement('vt:i4', (string) $spreadsheet->getSheetCount());
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -70,7 +69,7 @@ class DocProps extends WriterPart
 
         // Vector
         $objWriter->startElement('vt:vector');
-        $objWriter->writeAttribute('size', $spreadsheet->getSheetCount());
+        $objWriter->writeAttribute('size', (string) $spreadsheet->getSheetCount());
         $objWriter->writeAttribute('baseType', 'lpstr');
 
         $sheetCount = $spreadsheet->getSheetCount();
@@ -94,6 +93,9 @@ class DocProps extends WriterPart
         // SharedDoc
         $objWriter->writeElement('SharedDoc', 'false');
 
+        // HyperlinkBase
+        $objWriter->writeElement('HyperlinkBase', $spreadsheet->getProperties()->getHyperlinkBase());
+
         // HyperlinksChanged
         $objWriter->writeElement('HyperlinksChanged', 'false');
 
@@ -109,10 +111,6 @@ class DocProps extends WriterPart
     /**
      * Write docProps/core.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
     public function writeDocPropsCore(Spreadsheet $spreadsheet)
@@ -130,11 +128,11 @@ class DocProps extends WriterPart
 
         // 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());
@@ -145,13 +143,17 @@ class DocProps extends WriterPart
         // dcterms:created
         $objWriter->startElement('dcterms:created');
         $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-        $objWriter->writeRawData(date(DATE_W3C, $spreadsheet->getProperties()->getCreated()));
+        $created = $spreadsheet->getProperties()->getCreated();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $objWriter->writeRawData($date->format(DATE_W3C));
         $objWriter->endElement();
 
         // dcterms:modified
         $objWriter->startElement('dcterms:modified');
         $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-        $objWriter->writeRawData(date(DATE_W3C, $spreadsheet->getProperties()->getModified()));
+        $created = $spreadsheet->getProperties()->getModified();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $objWriter->writeRawData($date->format(DATE_W3C));
         $objWriter->endElement();
 
         // dc:title
@@ -178,17 +180,13 @@ class DocProps extends WriterPart
     /**
      * Write docProps/custom.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
-     * @return string XML Output
+     * @return null|string XML Output
      */
     public function writeDocPropsCustom(Spreadsheet $spreadsheet)
     {
         $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
         if (empty($customPropertyList)) {
-            return;
+            return null;
         }
 
         // Create XML writer
@@ -204,8 +202,8 @@ class DocProps extends WriterPart
 
         // 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);
@@ -213,25 +211,26 @@ class DocProps extends WriterPart
 
             $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 'i':
+                case Properties::PROPERTY_TYPE_INTEGER:
                     $objWriter->writeElement('vt:i4', $propertyValue);
 
                     break;
-                case 'f':
-                    $objWriter->writeElement('vt:r8', $propertyValue);
+                case Properties::PROPERTY_TYPE_FLOAT:
+                    $objWriter->writeElement('vt:r8', sprintf('%F', $propertyValue));
 
                     break;
-                case 'b':
+                case Properties::PROPERTY_TYPE_BOOLEAN:
                     $objWriter->writeElement('vt:bool', ($propertyValue) ? 'true' : 'false');
 
                     break;
-                case 'd':
+                case Properties::PROPERTY_TYPE_DATE:
                     $objWriter->startElement('vt:filetime');
-                    $objWriter->writeRawData(date(DATE_W3C, $propertyValue));
+                    $date = Date::dateTimeFromTimestamp("$propertyValue");
+                    $objWriter->writeRawData($date->format(DATE_W3C));
                     $objWriter->endElement();
 
                     break;
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
index 08256a1d5..f5f5eeeb4 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
+++ b/libraries/phpspreadsheet/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;
@@ -14,14 +16,11 @@ class Drawing extends WriterPart
     /**
      * Write drawings to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
      * @param bool $includeCharts Flag indicating if we should include drawing details for charts
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, $includeCharts = false)
+    public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, $includeCharts = false)
     {
         // Create XML writer
         $objWriter = null;
@@ -36,12 +35,12 @@ class Drawing extends WriterPart
 
         // 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();
@@ -55,19 +54,22 @@ class Drawing extends WriterPart
         }
 
         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);
             }
         }
@@ -81,38 +83,63 @@ class Drawing extends WriterPart
     /**
      * Write drawings to XML format.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param \PhpOffice\PhpSpreadsheet\Chart\Chart $pChart
-     * @param int $pRelationId
+     * @param int $relationId
      */
-    public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $pRelationId = -1)
+    public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart\Chart $chart, $relationId = -1): void
     {
-        $tl = $pChart->getTopLeftPosition();
-        $tl['colRow'] = Coordinate::coordinateFromString($tl['cell']);
-        $br = $pChart->getBottomRightPosition();
-        $br['colRow'] = Coordinate::coordinateFromString($br['cell']);
+        $tl = $chart->getTopLeftPosition();
+        $tlColRow = Coordinate::indexesFromString($tl['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', Coordinate::columnIndexFromString($tl['colRow'][0]) - 1);
-        $objWriter->writeElement('xdr:colOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($tl['xOffset']));
-        $objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
-        $objWriter->writeElement('xdr:rowOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($tl['yOffset']));
-        $objWriter->endElement();
-        $objWriter->startElement('xdr:to');
-        $objWriter->writeElement('xdr:col', Coordinate::columnIndexFromString($br['colRow'][0]) - 1);
-        $objWriter->writeElement('xdr:colOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($br['xOffset']));
-        $objWriter->writeElement('xdr:row', $br['colRow'][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');
@@ -133,11 +160,11 @@ class Drawing extends WriterPart
 
         $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();
@@ -152,35 +179,58 @@ class Drawing extends WriterPart
     /**
      * Write drawings to XML format.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param BaseDrawing $pDrawing
-     * @param int $pRelationId
+     * @param int $relationId
      * @param null|int $hlinkClickId
-     *
-     * @throws WriterException
      */
-    public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRelationId = -1, $hlinkClickId = null)
+    public function writeDrawing(XMLWriter $objWriter, BaseDrawing $drawing, $relationId = -1, $hlinkClickId = null): void
     {
-        if ($pRelationId >= 0) {
-            // xdr:oneCellAnchor
-            $objWriter->startElement('xdr:oneCellAnchor');
-            // Image location
-            $aCoordinates = Coordinate::coordinateFromString($pDrawing->getCoordinates());
-            $aCoordinates[0] = Coordinate::columnIndexFromString($aCoordinates[0]);
+        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', $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: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: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', self::stringEmu($drawing->getWidth()));
+                $objWriter->writeAttribute('cy', self::stringEmu($drawing->getHeight()));
+                $objWriter->endElement();
+            }
 
             // xdr:pic
             $objWriter->startElement('xdr:pic');
@@ -190,9 +240,9 @@ class Drawing extends WriterPart
 
             // 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);
@@ -216,8 +266,8 @@ class Drawing extends WriterPart
 
             // 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
@@ -232,7 +282,13 @@ class Drawing extends WriterPart
 
             // a:xfrm
             $objWriter->startElement('a:xfrm');
-            $objWriter->writeAttribute('rot', \PhpOffice\PhpSpreadsheet\Shared\Drawing::degreesToAngle($pDrawing->getRotation()));
+            $objWriter->writeAttribute('rot', (string) SharedDrawing::degreesToAngle($drawing->getRotation()));
+            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
@@ -244,25 +300,25 @@ class Drawing extends WriterPart
 
             $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();
@@ -287,13 +343,9 @@ class Drawing extends WriterPart
     /**
      * Write VML header/footer images to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet)
     {
         // Create XML writer
         $objWriter = null;
@@ -307,13 +359,13 @@ class Drawing extends WriterPart
         $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');
@@ -436,33 +488,31 @@ class Drawing extends WriterPart
     /**
      * 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)
+    private function writeVMLHeaderFooterImage(XMLWriter $objWriter, $reference, HeaderFooterDrawing $image): void
     {
         // Calculate object id
-        preg_match('{(\d+)}', md5($pReference), $m);
-        $id = 1500 + (substr($m[1], 0, 2) * 1);
+        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
@@ -477,9 +527,7 @@ class Drawing extends WriterPart
     /**
      * Get an array of all drawings.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Worksheet\Drawing[] All drawings in PhpSpreadsheet
+     * @return BaseDrawing[] All drawings in PhpSpreadsheet
      */
     public function allDrawings(Spreadsheet $spreadsheet)
     {
@@ -502,18 +550,22 @@ class Drawing extends WriterPart
     }
 
     /**
-     * @param XMLWriter $objWriter
      * @param null|int $hlinkClickId
      */
-    private function writeHyperLinkDrawing(XMLWriter $objWriter, $hlinkClickId)
+    private function writeHyperLinkDrawing(XMLWriter $objWriter, $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);
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
new file mode 100644
index 000000000..cf4f90693
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+class FunctionPrefix
+{
+    const XLFNREGEXP = '/(?:_xlfn\.)?((?:_xlws\.)?\b('
+            // functions added with Excel 2010
+        . 'beta[.]dist'
+        . '|beta[.]inv'
+        . '|binom[.]dist'
+        . '|binom[.]inv'
+        . '|ceiling[.]precise'
+        . '|chisq[.]dist'
+        . '|chisq[.]dist[.]rt'
+        . '|chisq[.]inv'
+        . '|chisq[.]inv[.]rt'
+        . '|chisq[.]test'
+        . '|confidence[.]norm'
+        . '|confidence[.]t'
+        . '|covariance[.]p'
+        . '|covariance[.]s'
+        . '|erf[.]precise'
+        . '|erfc[.]precise'
+        . '|expon[.]dist'
+        . '|f[.]dist'
+        . '|f[.]dist[.]rt'
+        . '|f[.]inv'
+        . '|f[.]inv[.]rt'
+        . '|f[.]test'
+        . '|floor[.]precise'
+        . '|gamma[.]dist'
+        . '|gamma[.]inv'
+        . '|gammaln[.]precise'
+        . '|lognorm[.]dist'
+        . '|lognorm[.]inv'
+        . '|mode[.]mult'
+        . '|mode[.]sngl'
+        . '|negbinom[.]dist'
+        . '|networkdays[.]intl'
+        . '|norm[.]dist'
+        . '|norm[.]inv'
+        . '|norm[.]s[.]dist'
+        . '|norm[.]s[.]inv'
+        . '|percentile[.]exc'
+        . '|percentile[.]inc'
+        . '|percentrank[.]exc'
+        . '|percentrank[.]inc'
+        . '|poisson[.]dist'
+        . '|quartile[.]exc'
+        . '|quartile[.]inc'
+        . '|rank[.]avg'
+        . '|rank[.]eq'
+        . '|stdev[.]p'
+        . '|stdev[.]s'
+        . '|t[.]dist'
+        . '|t[.]dist[.]2t'
+        . '|t[.]dist[.]rt'
+        . '|t[.]inv'
+        . '|t[.]inv[.]2t'
+        . '|t[.]test'
+        . '|var[.]p'
+        . '|var[.]s'
+        . '|weibull[.]dist'
+        . '|z[.]test'
+        // functions added with Excel 2013
+        . '|acot'
+        . '|acoth'
+        . '|arabic'
+        . '|averageifs'
+        . '|binom[.]dist[.]range'
+        . '|bitand'
+        . '|bitlshift'
+        . '|bitor'
+        . '|bitrshift'
+        . '|bitxor'
+        . '|ceiling[.]math'
+        . '|combina'
+        . '|cot'
+        . '|coth'
+        . '|csc'
+        . '|csch'
+        . '|days'
+        . '|dbcs'
+        . '|decimal'
+        . '|encodeurl'
+        . '|filterxml'
+        . '|floor[.]math'
+        . '|formulatext'
+        . '|gamma'
+        . '|gauss'
+        . '|ifna'
+        . '|imcosh'
+        . '|imcot'
+        . '|imcsc'
+        . '|imcsch'
+        . '|imsec'
+        . '|imsech'
+        . '|imsinh'
+        . '|imtan'
+        . '|isformula'
+        . '|iso[.]ceiling'
+        . '|isoweeknum'
+        . '|munit'
+        . '|numbervalue'
+        . '|pduration'
+        . '|permutationa'
+        . '|phi'
+        . '|rri'
+        . '|sec'
+        . '|sech'
+        . '|sheet'
+        . '|sheets'
+        . '|skew[.]p'
+        . '|unichar'
+        . '|unicode'
+        . '|webservice'
+        . '|xor'
+        // functions added with Excel 2016
+        . '|forecast[.]et2'
+        . '|forecast[.]ets[.]confint'
+        . '|forecast[.]ets[.]seasonality'
+        . '|forecast[.]ets[.]stat'
+        . '|forecast[.]linear'
+        . '|switch'
+        // functions added with Excel 2019
+        . '|concat'
+        . '|countifs'
+        . '|ifs'
+        . '|maxifs'
+        . '|minifs'
+        . '|sumifs'
+        . '|textjoin'
+        // functions added with Excel 365
+        . '|filter'
+        . '|randarray'
+        . '|anchorarray'
+        . '|sequence'
+        . '|sort'
+        . '|sortby'
+        . '|unique'
+        . '|xlookup'
+        . '|xmatch'
+        . '|arraytotext'
+        . '|call'
+        . '|let'
+        . '|lambda'
+        . '|single'
+        . '|register[.]id'
+        . '|textafter'
+        . '|textbefore'
+        . '|textsplit'
+        . '|valuetotext'
+        . '))\s*\(/Umui';
+
+    const XLWSREGEXP = '/(?<!_xlws\.)('
+        // functions added with Excel 365
+        . 'filter'
+        . '|sort'
+        . ')\s*\(/mui';
+
+    /**
+     * Prefix function name in string with _xlfn. where required.
+     */
+    protected static function addXlfnPrefix(string $functionString): string
+    {
+        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
+    {
+        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 addFunctionPrefixStripEquals(string $functionString): string
+    {
+        return self::addFunctionPrefix(substr($functionString, 1));
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
index 76c196b44..70146a500 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
+++ b/libraries/phpspreadsheet/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;
 
@@ -12,10 +14,6 @@ class Rels extends WriterPart
     /**
      * Write relationships to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
     public function writeRelationships(Spreadsheet $spreadsheet)
@@ -33,7 +31,7 @@ class Rels extends WriterPart
 
         // 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)) {
@@ -41,7 +39,7 @@ class Rels extends WriterPart
             $this->writeRelationship(
                 $objWriter,
                 4,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
+                Namespaces::RELATIONSHIPS_CUSTOM_PROPERTIES,
                 'docProps/custom.xml'
             );
         }
@@ -50,7 +48,7 @@ class Rels extends WriterPart
         $this->writeRelationship(
             $objWriter,
             3,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
+            Namespaces::RELATIONSHIPS_EXTENDED_PROPERTIES,
             'docProps/app.xml'
         );
 
@@ -58,7 +56,7 @@ class Rels extends WriterPart
         $this->writeRelationship(
             $objWriter,
             2,
-            'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
+            Namespaces::CORE_PROPERTIES,
             'docProps/core.xml'
         );
 
@@ -66,16 +64,17 @@ class Rels extends WriterPart
         $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 : ''
             );
         }
 
@@ -87,10 +86,6 @@ class Rels extends WriterPart
     /**
      * Write workbook relationships to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
     public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
@@ -108,13 +103,13 @@ class Rels extends WriterPart
 
         // 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'
         );
 
@@ -122,7 +117,7 @@ class Rels extends WriterPart
         $this->writeRelationship(
             $objWriter,
             2,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
+            Namespaces::THEME2,
             'theme/theme1.xml'
         );
 
@@ -130,7 +125,7 @@ class Rels extends WriterPart
         $this->writeRelationship(
             $objWriter,
             3,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
+            Namespaces::SHARED_STRINGS,
             'sharedStrings.xml'
         );
 
@@ -140,7 +135,7 @@ class Rels extends WriterPart
             $this->writeRelationship(
                 $objWriter,
                 ($i + 1 + 3),
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
+                Namespaces::WORKSHEET,
                 'worksheets/sheet' . ($i + 1) . '.xml'
             );
         }
@@ -150,7 +145,7 @@ class Rels extends WriterPart
             $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
@@ -168,15 +163,13 @@ class Rels extends WriterPart
      *     rId1                 - Drawings
      *  rId_hyperlink_x     - Hyperlinks
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     * @param int $pWorksheetId
+     * @param int $worksheetId
      * @param bool $includeCharts Flag indicating if we should write charts
-     *
-     * @throws WriterException
+     * @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, $worksheetId = 1, $includeCharts = false, $tableRef = 1)
     {
         // Create XML writer
         $objWriter = null;
@@ -191,46 +184,51 @@ class Rels extends WriterPart
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         // Write drawing relationships?
-        $d = 0;
         $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) {
-            $relPath = '../drawings/drawing' . $pWorksheetId . '.xml';
-            $rId = ++$d;
+        if (($worksheet->getDrawingCollection()->count() > 0) || (count($charts) > 0) || $drawingOriginalIds) {
+            $rId = 1;
 
+            // Use original $relPath to get original $rId.
+            // Take first. In future can be overwritten.
+            // (! synchronize with \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeDrawings)
+            reset($drawingOriginalIds);
+            $relPath = key($drawingOriginalIds);
             if (isset($drawingOriginalIds[$relPath])) {
                 $rId = (int) (substr($drawingOriginalIds[$relPath], 3));
             }
 
+            // Generate new $relPath to write drawing relationship
+            $relPath = '../drawings/drawing' . $worksheetId . '.xml';
             $this->writeRelationship(
                 $objWriter,
                 $rId,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
+                Namespaces::RELATIONSHIPS_DRAWING,
                 $relPath
             );
         }
 
         // 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'
                 );
@@ -241,71 +239,83 @@ class Rels extends WriterPart
 
         // 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)
+    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 (substr($rId, 0, 17) !== '_headerfooter_vml') {
+                $this->writeRelationship(
+                    $objWriter,
+                    $rId,
+                    $type,
+                    $value['relFilePath']
+                );
+            }
         }
     }
 
     /**
      * Write drawing relationships to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     * @param int &$chartRef Chart ID
+     * @param int $chartRef Chart ID
      * @param bool $includeCharts Flag indicating if we should write charts
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, &$chartRef, $includeCharts = false)
+    public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, &$chartRef, $includeCharts = false)
     {
         // Create XML writer
         $objWriter = null;
@@ -320,22 +330,23 @@ class Rels extends WriterPart
 
         // 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()) {
-            if ($iterator->current() instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
-                || $iterator->current() instanceof MemoryDrawing) {
+            $drawing = $iterator->current();
+            if (
+                $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);
@@ -347,13 +358,13 @@ class Rels extends WriterPart
 
         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'
                     );
                 }
@@ -368,13 +379,9 @@ class Rels extends WriterPart
     /**
      * Write header/footer drawing relationships to XML format.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet
-     *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet)
     {
         // Create XML writer
         $objWriter = null;
@@ -389,15 +396,15 @@ class Rels extends WriterPart
 
         // 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()
             );
         }
@@ -407,28 +414,62 @@ class Rels extends WriterPart
         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
-     *
-     * @throws WriterException
+     * @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 = '')
+    private function writeRelationship(XMLWriter $objWriter, $id, $type, $target, $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();
@@ -437,16 +478,7 @@ class Rels extends WriterPart
         }
     }
 
-    /**
-     * @param $objWriter
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $drawing
-     * @param $i
-     *
-     * @throws WriterException
-     *
-     * @return int
-     */
-    private function writeDrawingHyperLink($objWriter, $drawing, $i)
+    private function writeDrawingHyperLink(XMLWriter $objWriter, BaseDrawing $drawing, int $i): int
     {
         if ($drawing->getHyperlink() === null) {
             return $i;
@@ -456,7 +488,7 @@ class Rels extends WriterPart
         $this->writeRelationship(
             $objWriter,
             $i,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+            Namespaces::HYPERLINK,
             $drawing->getHyperlink()->getUrl(),
             $drawing->getHyperlink()->getTypeHyperlink()
         );
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
index 8a0cfe345..e231972cf 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
+++ b/libraries/phpspreadsheet/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;
 
@@ -10,10 +11,6 @@ class RelsRibbon extends WriterPart
     /**
      * Write relationships for additional objects of custom UI (ribbon).
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
     public function writeRibbonRelationships(Spreadsheet $spreadsheet)
@@ -31,13 +28,13 @@ class RelsRibbon extends WriterPart
 
         // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
index 01ad38de6..d5b606086 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
@@ -2,21 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 class RelsVBA extends WriterPart
 {
     /**
      * Write relationships for a signed VBA Project.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
-    public function writeVBARelationships(Spreadsheet $spreadsheet)
+    public function writeVBARelationships()
     {
         // Create XML writer
         $objWriter = null;
@@ -31,10 +27,10 @@ class RelsVBA extends WriterPart
 
         // 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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
index 19604e448..29e95eb2f 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -2,53 +2,57 @@
 
 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\Writer\Exception as WriterException;
+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, $existingTable = null)
     {
         // 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) &&
+            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)) {
+                ($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 &&
+            } elseif (
+                $cellValue instanceof RichText &&
                 ($cellValue !== null) &&
-                !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
+                !isset($aFlippedStringTable[$cellValue->getHashCode()])
+            ) {
                 $aStringTable[] = $cellValue;
                 $aFlippedStringTable[$cellValue->getHashCode()] = true;
             }
@@ -60,13 +64,11 @@ class StringTable extends WriterPart
     /**
      * Write string table to XML format.
      *
-     * @param string[] $pStringTable
-     *
-     * @throws WriterException
+     * @param (RichText|string)[] $stringTable
      *
      * @return string XML Output
      */
-    public function writeStringTable(array $pStringTable)
+    public function writeStringTable(array $stringTable)
     {
         // Create XML writer
         $objWriter = null;
@@ -81,14 +83,14 @@ class StringTable extends WriterPart
 
         // 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)) {
@@ -96,7 +98,7 @@ class StringTable extends WriterPart
                 }
                 $objWriter->writeRawData($textToWrite);
                 $objWriter->endElement();
-            } elseif ($textElement instanceof RichText) {
+            } else {
                 $this->writeRichText($objWriter, $textElement);
             }
 
@@ -111,31 +113,31 @@ class StringTable extends WriterPart
     /**
      * Write Rich Text.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param RichText $pRichText Rich text
      * @param string $prefix Optional Namespace prefix
      */
-    public function writeRichText(XMLWriter $objWriter, RichText $pRichText, $prefix = null)
+    public function writeRichText(XMLWriter $objWriter, RichText $richText, $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');
@@ -164,19 +166,25 @@ class StringTable extends WriterPart
                 $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();
             }
@@ -194,57 +202,87 @@ class StringTable extends WriterPart
     /**
      * 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)
+    public function writeRichTextForCharts(XMLWriter $objWriter, $richText = null, $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';
 
-            // 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;
-                case 'double':
-                    $underlineType = 'dbl';
+                        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());
+                }
 
-                    break;
+                // 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();
             }
-            $objWriter->writeAttribute('u', $underlineType);
-            // Strikethrough
-            $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
-
-            // rFont
-            $objWriter->startElement($prefix . 'latin');
-            $objWriter->writeAttribute('typeface', $element->getFont()->getName());
-            $objWriter->endElement();
-
-            $objWriter->endElement();
 
             // t
             $objWriter->startElement($prefix . 't');
@@ -255,6 +293,33 @@ class StringTable extends WriterPart
         }
     }
 
+    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).
      *
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
index 16e800e01..baafdc334 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
+++ b/libraries/phpspreadsheet/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;
@@ -18,10 +20,6 @@ class Style extends WriterPart
     /**
      * Write styles to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
     public function writeStyles(Spreadsheet $spreadsheet)
@@ -40,11 +38,11 @@ class Style extends WriterPart
         // 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) {
@@ -55,82 +53,99 @@ class Style extends WriterPart
 
         // 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();
@@ -149,47 +164,45 @@ class Style extends WriterPart
 
     /**
      * Write Fill.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Fill $pFill Fill style
      */
-    private function writeFill(XMLWriter $objWriter, Fill $pFill)
+    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) {
+        if (
+            $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)
+    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();
 
@@ -198,9 +211,11 @@ class Style extends WriterPart
         $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();
 
@@ -209,34 +224,43 @@ class Style extends WriterPart
         $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)
+    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();
             }
         }
@@ -246,16 +270,21 @@ class Style extends WriterPart
         $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)
+    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!
@@ -263,80 +292,94 @@ class Style extends WriterPart
         // 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)
+    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');
@@ -355,84 +398,93 @@ class Style extends WriterPart
         }
 
         // 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();
     }
 
+    /** @var mixed */
+    private static $scrutinizerFalse = false;
+
     /**
      * Write Cell Style Xf.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param \PhpOffice\PhpSpreadsheet\Style\Style $pStyle Style
-     * @param Spreadsheet $spreadsheet Workbook
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      */
-    private function writeCellStyleXf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $pStyle, Spreadsheet $spreadsheet)
+    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() === self::$scrutinizerFalse) {
+            $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 ($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();
         }
-        if ($pStyle->getAlignment()->getReadOrder() > 0) {
-            $objWriter->writeAttribute('readingOrder', $pStyle->getAlignment()->getReadOrder());
-        }
-        $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();
         }
@@ -442,59 +494,66 @@ class Style extends WriterPart
 
     /**
      * 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)
+    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());
+        $this->writeFill($objWriter, $style->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();
+        $horizontal = Alignment::HORIZONTAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getHorizontal()] ?? '';
+        $vertical = Alignment::VERTICAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getVertical()] ?? '';
+        $rotation = $style->getAlignment()->getTextRotation();
+        if ($horizontal || $vertical || $rotation !== null) {
+            $objWriter->startElement('alignment');
+            if ($horizontal) {
+                $objWriter->writeAttribute('horizontal', $horizontal);
             }
-            $objWriter->writeAttribute('textRotation', $textRotation);
+            if ($vertical) {
+                $objWriter->writeAttribute('vertical', $vertical);
+            }
+
+            if ($rotation !== null) {
+                if ($rotation >= 0) {
+                    $textRotation = $rotation;
+                } else {
+                    $textRotation = 90 - $rotation;
+                }
+                $objWriter->writeAttribute('textRotation', (string) $textRotation);
+            }
+            $objWriter->endElement();
         }
-        $objWriter->endElement();
 
         // border
-        $this->writeBorder($objWriter, $pStyle->getBorders());
+        $this->writeBorder($objWriter, $style->getBorders());
 
         // protection
-        if (($pStyle->getProtection()->getLocked() !== null) || ($pStyle->getProtection()->getHidden() !== null)) {
-            if ($pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
-                $pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT) {
+        if ((!empty($style->getProtection()->getLocked())) || (!empty($style->getProtection()->getHidden()))) {
+            if (
+                $style->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
+                $style->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 (
+                    ($style->getProtection()->getLocked() !== null) &&
+                    ($style->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT)
+                ) {
+                    $objWriter->writeAttribute('locked', ($style->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'));
+                if (
+                    ($style->getProtection()->getHidden() !== null) &&
+                    ($style->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT)
+                ) {
+                    $objWriter->writeAttribute('hidden', ($style->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
                 }
                 $objWriter->endElement();
             }
@@ -506,42 +565,42 @@ class Style extends WriterPart
     /**
      * 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)
+    private function writeBorderPr(XMLWriter $objWriter, $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)
+    private function writeNumFmt(XMLWriter $objWriter, ?NumberFormat $numberFormat, $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();
         }
@@ -550,8 +609,6 @@ class Style extends WriterPart
     /**
      * Get an array of all styles.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return \PhpOffice\PhpSpreadsheet\Style\Style[] All styles in PhpSpreadsheet
      */
     public function allStyles(Spreadsheet $spreadsheet)
@@ -562,8 +619,6 @@ class Style extends WriterPart
     /**
      * Get an array of all conditional styles.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return Conditional[] All conditional styles in PhpSpreadsheet
      */
     public function allConditionalStyles(Spreadsheet $spreadsheet)
@@ -586,8 +641,6 @@ class Style extends WriterPart
     /**
      * Get an array of all fills.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return Fill[] All fills in PhpSpreadsheet
      */
     public function allFills(Spreadsheet $spreadsheet)
@@ -618,8 +671,6 @@ class Style extends WriterPart
     /**
      * Get an array of all fonts.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return Font[] All fonts in PhpSpreadsheet
      */
     public function allFonts(Spreadsheet $spreadsheet)
@@ -641,8 +692,6 @@ class Style extends WriterPart
     /**
      * Get an array of all borders.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return Borders[] All borders in PhpSpreadsheet
      */
     public function allBorders(Spreadsheet $spreadsheet)
@@ -664,8 +713,6 @@ class Style extends WriterPart
     /**
      * Get an array of all number formats.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @return NumberFormat[] All number formats in PhpSpreadsheet
      */
     public function allNumberFormats(Spreadsheet $spreadsheet)
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php
new file mode 100644
index 000000000..2c1468be8
--- /dev/null
+++ b/libraries/phpspreadsheet/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, $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);
+            $objWriter->endElement();
+            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);
+                }
+            }
+        }
+
+        // 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->getValue() : '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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
index f5f8dc075..1e8ef5b43 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
@@ -2,117 +2,16 @@
 
 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;
 
-/**
- * @category   PhpSpreadsheet
- *
- * @copyright  Copyright (c) 2006 - 2016 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
- */
 class Theme extends WriterPart
 {
-    /**
-     * Map of Major fonts to write.
-     *
-     * @var array of 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 array of 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 array of 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.
      *
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     *
      * @return string XML Output
      */
     public function writeTheme(Spreadsheet $spreadsheet)
@@ -124,13 +23,14 @@ class Theme extends WriterPart
         } 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
@@ -138,50 +38,39 @@ class Theme extends WriterPart
 
         // a:clrScheme
         $objWriter->startElement('a:clrScheme');
-        $objWriter->writeAttribute('name', 'Office');
+        $objWriter->writeAttribute('name', $theme->getThemeColorName());
 
-        // 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->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');
@@ -793,13 +682,9 @@ class Theme extends WriterPart
     /**
      * Write fonts to XML format.
      *
-     * @param XMLWriter $objWriter
-     * @param string $latinFont
-     * @param array of string                $fontSet
-     *
-     * @return string XML Output
+     * @param string[] $fontSet
      */
-    private function writeFonts($objWriter, $latinFont, $fontSet)
+    private function writeFonts(XMLWriter $objWriter, string $latinFont, string $eastAsianFont, string $complexScriptFont, array $fontSet): void
     {
         // a:latin
         $objWriter->startElement('a:latin');
@@ -808,12 +693,12 @@ class Theme extends WriterPart
 
         // 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) {
@@ -826,21 +711,34 @@ class Theme extends WriterPart
 
     /**
      * Write colour scheme to XML format.
-     *
-     * @param XMLWriter $objWriter
-     *
-     * @return string XML Output
      */
-    private function writeColourScheme($objWriter)
+    private function writeColourScheme(XMLWriter $objWriter, SpreadsheetTheme $theme): void
     {
-        foreach (self::$colourScheme as $colourName => $colourValue) {
-            $objWriter->startElement('a:' . $colourName);
+        $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->startElement('a:srgbClr');
-            $objWriter->writeAttribute('val', $colourValue);
-            $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
 
-            $objWriter->endElement();
+        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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
index fd936748a..f2a867821 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -2,24 +2,20 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\DefinedNames as DefinedNamesWriter;
 
 class Workbook extends WriterPart
 {
     /**
      * Write workbook to XML format.
      *
-     * @param Spreadsheet $spreadsheet
      * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
     public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
@@ -37,8 +33,8 @@ class Workbook extends WriterPart
         // 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);
@@ -58,7 +54,7 @@ class Workbook extends WriterPart
         $this->writeSheets($objWriter, $spreadsheet);
 
         // definedNames
-        $this->writeDefinedNames($objWriter, $spreadsheet);
+        (new DefinedNamesWriter($objWriter, $spreadsheet))->write();
 
         // calcPr
         $this->writeCalcPr($objWriter, $recalcRequired);
@@ -71,10 +67,8 @@ class Workbook extends WriterPart
 
     /**
      * Write file version.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeFileVersion(XMLWriter $objWriter)
+    private function writeFileVersion(XMLWriter $objWriter): void
     {
         $objWriter->startElement('fileVersion');
         $objWriter->writeAttribute('appName', 'xl');
@@ -86,10 +80,8 @@ class Workbook extends WriterPart
 
     /**
      * Write WorkbookPr.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeWorkbookPr(XMLWriter $objWriter)
+    private function writeWorkbookPr(XMLWriter $objWriter): void
     {
         $objWriter->startElement('workbookPr');
 
@@ -104,11 +96,8 @@ class Workbook extends WriterPart
 
     /**
      * Write BookViews.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Spreadsheet $spreadsheet
      */
-    private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         // bookViews
         $objWriter->startElement('bookViews');
@@ -116,14 +105,14 @@ class Workbook extends WriterPart
         // 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();
@@ -133,11 +122,8 @@ class Workbook extends WriterPart
 
     /**
      * Write WorkbookProtection.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Spreadsheet $spreadsheet
      */
-    private function writeWorkbookProtection(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    private function writeWorkbookProtection(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         if ($spreadsheet->getSecurity()->isSecurityEnabled()) {
             $objWriter->startElement('workbookProtection');
@@ -160,10 +146,9 @@ class Workbook extends WriterPart
     /**
      * Write calcPr.
      *
-     * @param XMLWriter $objWriter XML Writer
      * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
      */
-    private function writeCalcPr(XMLWriter $objWriter, $recalcRequired = true)
+    private function writeCalcPr(XMLWriter $objWriter, $recalcRequired = true): void
     {
         $objWriter->startElement('calcPr');
 
@@ -173,22 +158,17 @@ class Workbook extends WriterPart
         $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);
+        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? '1' : '0');
+        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? '0' : '1');
+        $objWriter->writeAttribute('forceFullCalc', ($recalcRequired) ? '0' : '1');
 
         $objWriter->endElement();
     }
 
     /**
      * Write sheets.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws WriterException
      */
-    private function writeSheets(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    private function writeSheets(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         // Write sheets
         $objWriter->startElement('sheets');
@@ -210,217 +190,25 @@ class Workbook extends WriterPart
     /**
      * 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)
-     *
-     * @throws WriterException
      */
-    private function writeSheet(XMLWriter $objWriter, $pSheetname, $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
+    private function writeSheet(XMLWriter $objWriter, $worksheetName, $worksheetId = 1, $relId = 1, $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.');
         }
     }
-
-    /**
-     * Write Defined Names.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws WriterException
-     */
-    private function writeDefinedNames(XMLWriter $objWriter, Spreadsheet $spreadsheet)
-    {
-        // Write defined names
-        $objWriter->startElement('definedNames');
-
-        // Named ranges
-        if (count($spreadsheet->getNamedRanges()) > 0) {
-            // Named ranges
-            $this->writeNamedRanges($objWriter, $spreadsheet);
-        }
-
-        // Other defined names
-        $sheetCount = $spreadsheet->getSheetCount();
-        for ($i = 0; $i < $sheetCount; ++$i) {
-            // definedName for autoFilter
-            $this->writeDefinedNameForAutofilter($objWriter, $spreadsheet->getSheet($i), $i);
-
-            // definedName for Print_Titles
-            $this->writeDefinedNameForPrintTitles($objWriter, $spreadsheet->getSheet($i), $i);
-
-            // definedName for Print_Area
-            $this->writeDefinedNameForPrintArea($objWriter, $spreadsheet->getSheet($i), $i);
-        }
-
-        $objWriter->endElement();
-    }
-
-    /**
-     * Write named ranges.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Spreadsheet $spreadsheet
-     *
-     * @throws WriterException
-     */
-    private function writeNamedRanges(XMLWriter $objWriter, Spreadsheet $spreadsheet)
-    {
-        // Loop named ranges
-        $namedRanges = $spreadsheet->getNamedRanges();
-        foreach ($namedRanges as $namedRange) {
-            $this->writeDefinedNameForNamedRange($objWriter, $namedRange);
-        }
-    }
-
-    /**
-     * Write Defined Name for named range.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param NamedRange $pNamedRange
-     */
-    private function writeDefinedNameForNamedRange(XMLWriter $objWriter, NamedRange $pNamedRange)
-    {
-        // definedName for named range
-        $objWriter->startElement('definedName');
-        $objWriter->writeAttribute('name', $pNamedRange->getName());
-        if ($pNamedRange->getLocalOnly()) {
-            $objWriter->writeAttribute('localSheetId', $pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
-        }
-
-        // Create absolute coordinate and write as raw text
-        $range = Coordinate::splitRange($pNamedRange->getRange());
-        $iMax = count($range);
-        for ($i = 0; $i < $iMax; ++$i) {
-            $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteReference($range[$i][0]);
-            if (isset($range[$i][1])) {
-                $range[$i][1] = Coordinate::absoluteReference($range[$i][1]);
-            }
-        }
-        $range = Coordinate::buildRange($range);
-
-        $objWriter->writeRawData($range);
-
-        $objWriter->endElement();
-    }
-
-    /**
-     * Write Defined Name for autoFilter.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Worksheet $pSheet
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForAutofilter(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0)
-    {
-        // definedName for autoFilter
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
-        if (!empty($autoFilterRange)) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-            $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
-            [$ws, $range[0]] = Worksheet::extractSheetTitle($range[0], true);
-
-            $range[0] = Coordinate::absoluteCoordinate($range[0]);
-            $range[1] = Coordinate::absoluteCoordinate($range[1]);
-            $range = implode(':', $range);
-
-            $objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
-
-            $objWriter->endElement();
-        }
-    }
-
-    /**
-     * Write Defined Name for PrintTitles.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Worksheet $pSheet
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForPrintTitles(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0)
-    {
-        // definedName for PrintTitles
-        if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm.Print_Titles');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-
-            // Setting string
-            $settingString = '';
-
-            // Columns to repeat
-            if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-                $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
-
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-            }
-
-            // Rows to repeat
-            if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-                if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-                    $settingString .= ',';
-                }
-
-                $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
-
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-            }
-
-            $objWriter->writeRawData($settingString);
-
-            $objWriter->endElement();
-        }
-    }
-
-    /**
-     * Write Defined Name for PrintTitles.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Worksheet $pSheet
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForPrintArea(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0)
-    {
-        // definedName for PrintArea
-        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm.Print_Area');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-
-            // Print area
-            $printArea = Coordinate::splitRange($pSheet->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);
-            }
-
-            $objWriter->writeRawData(implode(',', $chunks));
-
-            $objWriter->endElement();
-        }
-    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 1d5a995a8..5e453b3d8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -2,38 +2,48 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+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\Worksheet\AutoFilter\Column;
-use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormattingRuleExtension;
 use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
-use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
-/**
- * @category   PhpSpreadsheet
- *
- * @copyright  Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
- */
 class Worksheet extends WriterPart
 {
+    /** @var string */
+    private $numberStoredAsText = '';
+
+    /** @var string */
+    private $formula = '';
+
+    /** @var string */
+    private $twoDigitTextYear = '';
+
+    /** @var string */
+    private $evalError = '';
+
     /**
      * Write worksheet to XML format.
      *
-     * @param PhpspreadsheetWorksheet $pSheet
-     * @param string[] $pStringTable
+     * @param string[] $stringTable
      * @param bool $includeCharts Flag indicating if we should write charts
      *
-     * @throws WriterException
-     *
      * @return string XML Output
      */
-    public function writeWorksheet(PhpspreadsheetWorksheet $pSheet, $pStringTable = null, $includeCharts = false)
+    public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, $stringTable = [], $includeCharts = false)
     {
+        $this->numberStoredAsText = '';
+        $this->formula = '';
+        $this->twoDigitTextYear = '';
+        $this->evalError = '';
         // Create XML writer
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -48,80 +58,91 @@ class Worksheet extends WriterPart
         // 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: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);
+
+        // Table
+        $this->writeTable($objWriter, $worksheet);
+
+        // ConditionalFormattingRuleExtensionList
+        // (Must be inserted last. Not insert last, an Excel parse error will occur)
+        $this->writeExtLst($objWriter, $worksheet);
 
         $objWriter->endElement();
 
@@ -129,44 +150,77 @@ class Worksheet extends WriterPart
         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)
+    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();
@@ -177,34 +231,26 @@ class Worksheet extends WriterPart
 
     /**
      * Write Dimension.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeDimension(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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
-     *
-     * @throws WriterException
      */
-    private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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;
         }
 
@@ -214,66 +260,65 @@ class Worksheet extends WriterPart
         $objWriter->writeAttribute('workbookViewId', '0');
 
         // Zoom scales
-        if ($pSheet->getSheetView()->getZoomScale() != 100) {
-            $objWriter->writeAttribute('zoomScale', $pSheet->getSheetView()->getZoomScale());
+        if ($worksheet->getSheetView()->getZoomScale() != 100) {
+            $objWriter->writeAttribute('zoomScale', (string) $worksheet->getSheetView()->getZoomScale());
         }
-        if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
-            $objWriter->writeAttribute('zoomScaleNormal', $pSheet->getSheetView()->getZoomScaleNormal());
+        if ($worksheet->getSheetView()->getZoomScaleNormal() != 100) {
+            $objWriter->writeAttribute('zoomScaleNormal', (string) $worksheet->getSheetView()->getZoomScaleNormal());
         }
 
         // 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();
+        $activeCell = $worksheet->getActiveCell();
+        $sqref = $worksheet->getSelectedCells();
 
         // Pane
         $pane = '';
-        if ($pSheet->getFreezePane()) {
-            [$xSplit, $ySplit] = Coordinate::coordinateFromString($pSheet->getFreezePane());
+        if ($worksheet->getFreezePane()) {
+            [$xSplit, $ySplit] = Coordinate::coordinateFromString($worksheet->getFreezePane());
             $xSplit = Coordinate::columnIndexFromString($xSplit);
             --$xSplit;
             --$ySplit;
 
-            $topLeftCell = $pSheet->getTopLeftCell();
-
             // pane
             $pane = 'topRight';
             $objWriter->startElement('pane');
             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('topLeftCell', $topLeftCell);
+            self::writeAttributeNotNull($objWriter, 'topLeftCell', $topLeftCell);
             $objWriter->writeAttribute('activePane', $pane);
             $objWriter->writeAttribute('state', 'frozen');
             $objWriter->endElement();
@@ -287,6 +332,8 @@ class Worksheet extends WriterPart
                 $objWriter->writeAttribute('pane', 'bottomLeft');
                 $objWriter->endElement();
             }
+        } else {
+            self::writeAttributeNotNull($objWriter, 'topLeftCell', $topLeftCell);
         }
 
         // Selection
@@ -307,75 +354,68 @@ class Worksheet extends WriterPart
 
     /**
      * Write SheetFormatPr.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetFormatPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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)
+    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
@@ -396,7 +436,7 @@ class Worksheet extends WriterPart
                 }
 
                 // Custom width?
-                if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
+                if ($colDimension->getWidth() != $worksheet->getDefaultColumnDimension()->getWidth()) {
                     $objWriter->writeAttribute('customWidth', 'true');
                 }
 
@@ -407,11 +447,11 @@ class Worksheet extends WriterPart
 
                 // 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();
             }
@@ -422,138 +462,330 @@ class Worksheet extends WriterPart
 
     /**
      * Write SheetProtection.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetProtection(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private function writeSheetProtection(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
+        $protection = $worksheet->getProtection();
+        if (!$protection->isProtectionEnabled()) {
+            return;
+        }
         // sheetProtection
         $objWriter->startElement('sheetProtection');
 
-        if ($pSheet->getProtection()->getPassword() !== '') {
-            $objWriter->writeAttribute('password', $pSheet->getProtection()->getPassword());
+        if ($protection->getAlgorithm()) {
+            $objWriter->writeAttribute('algorithmName', $protection->getAlgorithm());
+            $objWriter->writeAttribute('hashValue', $protection->getPassword());
+            $objWriter->writeAttribute('saltValue', $protection->getSalt());
+            $objWriter->writeAttribute('spinCount', (string) $protection->getSpinCount());
+        } elseif ($protection->getPassword() !== '') {
+            $objWriter->writeAttribute('password', $protection->getPassword());
         }
 
-        $objWriter->writeAttribute('sheet', ($pSheet->getProtection()->getSheet() ? 'true' : 'false'));
-        $objWriter->writeAttribute('objects', ($pSheet->getProtection()->getObjects() ? 'true' : 'false'));
-        $objWriter->writeAttribute('scenarios', ($pSheet->getProtection()->getScenarios() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatCells', ($pSheet->getProtection()->getFormatCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatColumns', ($pSheet->getProtection()->getFormatColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatRows', ($pSheet->getProtection()->getFormatRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertColumns', ($pSheet->getProtection()->getInsertColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertRows', ($pSheet->getProtection()->getInsertRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertHyperlinks', ($pSheet->getProtection()->getInsertHyperlinks() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteColumns', ($pSheet->getProtection()->getDeleteColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteRows', ($pSheet->getProtection()->getDeleteRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectLockedCells', ($pSheet->getProtection()->getSelectLockedCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('sort', ($pSheet->getProtection()->getSort() ? 'true' : 'false'));
-        $objWriter->writeAttribute('autoFilter', ($pSheet->getProtection()->getAutoFilter() ? 'true' : 'false'));
-        $objWriter->writeAttribute('pivotTables', ($pSheet->getProtection()->getPivotTables() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectUnlockedCells', ($pSheet->getProtection()->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();
     }
 
-    /**
-     * Write ConditionalFormatting.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
-     *
-     * @throws WriterException
-     */
-    private function writeConditionalFormatting(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private static function writeProtectionAttribute(XMLWriter $objWriter, string $name, ?bool $value): void
     {
-        // Conditional id
-        $id = 1;
+        if ($value === true) {
+            $objWriter->writeAttribute($name, '1');
+        } elseif ($value === false) {
+            $objWriter->writeAttribute($name, '0');
+        }
+    }
 
-        // Loop through styles in the current worksheet
-        foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
-            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);
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
 
-                    // cfRule
-                    $objWriter->startElement('cfRule');
-                    $objWriter->writeAttribute('type', $conditional->getConditionType());
-                    $objWriter->writeAttribute('dxfId', $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()));
-                    $objWriter->writeAttribute('priority', $id++);
+    private static function writeAttributeNotNull(XMLWriter $objWriter, string $attr, ?string $val): void
+    {
+        if ($val !== null) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
 
-                    if (($conditional->getConditionType() == Conditional::CONDITION_CELLIS || $conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT)
-                        && $conditional->getOperatorType() != Conditional::OPERATOR_NONE) {
-                        $objWriter->writeAttribute('operator', $conditional->getOperatorType());
-                    }
+    private static function writeElementIf(XMLWriter $objWriter, bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeElement($attr, $val);
+        }
+    }
 
-                    if ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        && $conditional->getText() !== null) {
-                        $objWriter->writeAttribute('text', $conditional->getText());
-                    }
-
-                    if ($conditional->getStopIfTrue()) {
-                        $objWriter->writeAttribute('stopIfTrue', '1');
-                    }
-
-                    if ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        && $conditional->getOperatorType() == Conditional::OPERATOR_CONTAINSTEXT
-                        && $conditional->getText() !== null) {
-                        $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
-                    } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        && $conditional->getOperatorType() == Conditional::OPERATOR_BEGINSWITH
-                        && $conditional->getText() !== null) {
-                        $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-                    } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        && $conditional->getOperatorType() == Conditional::OPERATOR_ENDSWITH
-                        && $conditional->getText() !== null) {
-                        $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-                    } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        && $conditional->getOperatorType() == Conditional::OPERATOR_NOTCONTAINS
-                        && $conditional->getText() !== null) {
-                        $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
-                    } elseif ($conditional->getConditionType() == Conditional::CONDITION_CELLIS
-                        || $conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-                        || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
-                        foreach ($conditional->getConditions() as $formula) {
-                            // Formula
-                            $objWriter->writeElement('formula', $formula);
-                        }
-                    } 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');
-                    }
-
-                    $objWriter->endElement();
-
-                    $objWriter->endElement();
+    private static function writeOtherCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $conditions = $conditional->getConditions();
+        if (
+            $conditional->getConditionType() == Conditional::CONDITION_CELLIS
+            || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+            || !empty($conditions)
+        ) {
+            foreach ($conditions as $formula) {
+                // 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]));
+            }
+        }
+    }
+
+    private static function writeTextCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $txt = $conditional->getText();
+        if (!empty($txt)) {
+            $objWriter->writeAttribute('text', $txt);
+            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]));
+            }
+        }
+    }
+
+    private static function writeExtConditionalFormattingElements(XMLWriter $objWriter, ConditionalFormattingRuleExtension $ruleExtension): void
+    {
+        $prefix = 'x14';
+        $objWriter->startElementNs($prefix, 'conditionalFormatting', null);
+
+        $objWriter->startElementNs($prefix, 'cfRule', null);
+        $objWriter->writeAttribute('type', $ruleExtension->getCfRule());
+        $objWriter->writeAttribute('id', $ruleExtension->getId());
+        $objWriter->startElementNs($prefix, 'dataBar', null);
+        $dataBar = $ruleExtension->getDataBarExt();
+        foreach ($dataBar->getXmlAttributes() as $attrKey => $val) {
+            $objWriter->writeAttribute($attrKey, $val);
+        }
+        $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
+        if ($minCfvo !== null) {
+            $objWriter->startElementNs($prefix, 'cfvo', null);
+            $objWriter->writeAttribute('type', $minCfvo->getType());
+            if ($minCfvo->getCellFormula()) {
+                $objWriter->writeElement('xm:f', $minCfvo->getCellFormula());
+            }
+            $objWriter->endElement(); //end cfvo
+        }
+
+        $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
+        if ($maxCfvo !== null) {
+            $objWriter->startElementNs($prefix, 'cfvo', null);
+            $objWriter->writeAttribute('type', $maxCfvo->getType());
+            if ($maxCfvo->getCellFormula()) {
+                $objWriter->writeElement('xm:f', $maxCfvo->getCellFormula());
+            }
+            $objWriter->endElement(); //end cfvo
+        }
+
+        foreach ($dataBar->getXmlElements() as $elmKey => $elmAttr) {
+            $objWriter->startElementNs($prefix, $elmKey, null);
+            foreach ($elmAttr as $attrKey => $attrVal) {
+                $objWriter->writeAttribute($attrKey, $attrVal);
+            }
+            $objWriter->endElement(); //end elmKey
+        }
+        $objWriter->endElement(); //end dataBar
+        $objWriter->endElement(); //end cfRule
+        $objWriter->writeElement('xm:sqref', $ruleExtension->getSqref());
+        $objWriter->endElement(); //end conditionalFormatting
+    }
+
+    private static function writeDataBarElements(XMLWriter $objWriter, ?ConditionalDataBar $dataBar): void
+    {
+        if ($dataBar) {
+            $objWriter->startElement('dataBar');
+            self::writeAttributeIf($objWriter, null !== $dataBar->getShowValue(), 'showValue', $dataBar->getShowValue() ? '1' : '0');
+
+            $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->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->endElement();
+            }
+            if ($dataBar->getColor()) {
+                $objWriter->startElement('color');
+                $objWriter->writeAttribute('rgb', $dataBar->getColor());
+                $objWriter->endElement();
+            }
+            $objWriter->endElement(); // end dataBar
+
+            if ($dataBar->getConditionalFormattingRuleExt()) {
+                $objWriter->startElement('extLst');
+                $extension = $dataBar->getConditionalFormattingRuleExt();
+                $objWriter->startElement('ext');
+                $objWriter->writeAttribute('uri', '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}');
+                $objWriter->startElementNs('x14', 'id', null);
+                $objWriter->text($extension->getId());
+                $objWriter->endElement();
+                $objWriter->endElement();
+                $objWriter->endElement(); //end extLst
             }
         }
     }
 
     /**
-     * Write DataValidations.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
+     * Write ConditionalFormatting.
      */
-    private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private function writeConditionalFormatting(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // Conditional id
+        $id = 1;
+
+        // Loop through styles in the current worksheet
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            $objWriter->startElement('conditionalFormatting');
+            $objWriter->writeAttribute('sqref', $cellCoordinate);
+
+            foreach ($conditionalStyles as $conditional) {
+                // WHY was this again?
+                // if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()) == '') {
+                //    continue;
+                // }
+                // cfRule
+                $objWriter->startElement('cfRule');
+                $objWriter->writeAttribute('type', $conditional->getConditionType());
+                self::writeAttributeIf(
+                    $objWriter,
+                    ($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
+                        || $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);
+                } else {
+                    self::writeOtherCondElements($objWriter, $conditional, $topLeftCell);
+                }
+
+                //<dataBar>
+                self::writeDataBarElements($objWriter, $conditional->getDataBar());
+
+                $objWriter->endElement(); //end cfRule
+            }
+
+            $objWriter->endElement(); //end conditionalFormatting
+        }
+    }
+
+    /**
+     * Write DataValidations.
+     */
+    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');
@@ -588,7 +820,7 @@ class Worksheet extends WriterPart
                     $objWriter->writeAttribute('prompt', $dv->getPrompt());
                 }
 
-                $objWriter->writeAttribute('sqref', $coordinate);
+                $objWriter->writeAttribute('sqref', $dv->getSqref() ?? $coordinate);
 
                 if ($dv->getFormula1() !== '') {
                     $objWriter->writeElement('formula1', $dv->getFormula1());
@@ -606,14 +838,11 @@ class Worksheet extends WriterPart
 
     /**
      * Write Hyperlinks.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // Hyperlink collection
-        $hyperlinkCollection = $pSheet->getHyperlinkCollection();
+        $hyperlinkCollection = $worksheet->getHyperlinkCollection();
 
         // Relation ID
         $relationId = 1;
@@ -647,18 +876,15 @@ class Worksheet extends WriterPart
 
     /**
      * Write ProtectedRanges.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        if (count($pSheet->getProtectedCells()) > 0) {
+        if (count($worksheet->getProtectedCells()) > 0) {
             // protectedRanges
             $objWriter->startElement('protectedRanges');
 
             // Loop protectedRanges
-            foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
+            foreach ($worksheet->getProtectedCells() as $protectedCell => $passwordHash) {
                 // protectedRange
                 $objWriter->startElement('protectedRange');
                 $objWriter->writeAttribute('name', 'p' . md5($protectedCell));
@@ -675,18 +901,15 @@ class Worksheet extends WriterPart
 
     /**
      * Write MergeCells.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeMergeCells(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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);
@@ -699,23 +922,20 @@ class Worksheet extends WriterPart
 
     /**
      * Write PrintOptions.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePrintOptions(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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');
         }
 
@@ -724,147 +944,79 @@ class Worksheet extends WriterPart
 
     /**
      * Write PageMargins.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePageMargins(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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)
+    private function writeAutoFilter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
-        if (!empty($autoFilterRange)) {
-            // autoFilter
-            $objWriter->startElement('autoFilter');
+        AutoFilter::writeAutoFilter($objWriter, $worksheet);
+    }
 
-            // 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);
+    /**
+     * Write Table.
+     */
+    private function writeTable(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $tableCount = $worksheet->getTableCollection()->count();
 
-            $objWriter->writeAttribute('ref', str_replace('$', '', $range));
+        $objWriter->startElement('tableParts');
+        $objWriter->writeAttribute('count', (string) $tableCount);
 
-            $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);
-                        }
-
-                        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();
-                            }
-                        }
-
-                        $objWriter->endElement();
-
-                        $objWriter->endElement();
-                    }
-                }
-            }
+        for ($t = 1; $t <= $tableCount; ++$t) {
+            $objWriter->startElement('tablePart');
+            $objWriter->writeAttribute('r:id', 'rId_table_' . $t);
             $objWriter->endElement();
         }
+
+        $objWriter->endElement();
     }
 
     /**
      * Write PageSetup.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePageSetup(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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', $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();
@@ -872,59 +1024,56 @@ class Worksheet extends WriterPart
 
     /**
      * Write Header / Footer.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeHeaderFooter(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    private function writeHeaderFooter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // headerFooter
         $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->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'));
 
-        $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->writeElement('oddHeader', $worksheet->getHeaderFooter()->getOddHeader());
+        $objWriter->writeElement('oddFooter', $worksheet->getHeaderFooter()->getOddFooter());
+        $objWriter->writeElement('evenHeader', $worksheet->getHeaderFooter()->getEvenHeader());
+        $objWriter->writeElement('evenFooter', $worksheet->getHeaderFooter()->getEvenFooter());
+        $objWriter->writeElement('firstHeader', $worksheet->getHeaderFooter()->getFirstHeader());
+        $objWriter->writeElement('firstFooter', $worksheet->getHeaderFooter()->getFirstFooter());
         $objWriter->endElement();
     }
 
     /**
      * Write Breaks.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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();
             }
 
@@ -934,14 +1083,14 @@ class Worksheet extends WriterPart
         // 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) {
+            foreach ($aColumnBreaks as $cell => $break) {
                 $coords = Coordinate::coordinateFromString($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();
             }
@@ -953,111 +1102,226 @@ class Worksheet extends WriterPart
     /**
      * Write SheetData.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
-     * @param string[] $pStringTable String table
-     *
-     * @throws WriterException
+     * @param string[] $stringTable String table
      */
-    private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet, array $pStringTable)
+    private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, array $stringTable): void
     {
         // Flipped stringtable, for faster index searching
-        $aFlippedStringTable = $this->getParentWriter()->getWriterPart('stringtable')->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;
         while ($currentRow++ < $highestRow) {
-            // Get row dimension
-            $rowDimension = $pSheet->getRowDimension($currentRow);
+            $isRowSet = isset($cellsByRow[$currentRow]);
+            if ($isRowSet || $worksheet->rowDimensionExists($currentRow)) {
+                // Get row dimension
+                $rowDimension = $worksheet->getRowDimension($currentRow);
 
-            // Write current row?
-            $writeCurrentRow = isset($cellsByRow[$currentRow]) || $rowDimension->getRowHeight() >= 0 || $rowDimension->getVisible() == false || $rowDimension->getCollapsed() == true || $rowDimension->getOutlineLevel() > 0 || $rowDimension->getXfIndex() !== null;
+                // 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);
+                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');
-                }
-
-                // Collapsed
-                if ($rowDimension->getCollapsed() === true) {
-                    $objWriter->writeAttribute('collapsed', 'true');
-                }
-
-                // Outline level
-                if ($rowDimension->getOutlineLevel() > 0) {
-                    $objWriter->writeAttribute('outlineLevel', $rowDimension->getOutlineLevel());
-                }
-
-                // Style
-                if ($rowDimension->getXfIndex() !== null) {
-                    $objWriter->writeAttribute('s', $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);
+                    // Row dimensions
+                    if ($rowDimension->getRowHeight() >= 0) {
+                        $objWriter->writeAttribute('customHeight', '1');
+                        $objWriter->writeAttribute('ht', StringHelper::formatNumber($rowDimension->getRowHeight()));
                     }
-                }
 
-                // End row
-                $objWriter->endElement();
+                    // Row visibility
+                    if (!$rowDimension->getVisible() === true) {
+                        $objWriter->writeAttribute('hidden', 'true');
+                    }
+
+                    // Collapsed
+                    if ($rowDimension->getCollapsed() === true) {
+                        $objWriter->writeAttribute('collapsed', 'true');
+                    }
+
+                    // Outline level
+                    if ($rowDimension->getOutlineLevel() > 0) {
+                        $objWriter->writeAttribute('outlineLevel', (string) $rowDimension->getOutlineLevel());
+                    }
+
+                    // Style
+                    if ($rowDimension->getXfIndex() !== null) {
+                        $objWriter->writeAttribute('s', (string) $rowDimension->getXfIndex());
+                        $objWriter->writeAttribute('customFormat', '1');
+                    }
+
+                    // 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();
+                }
             }
         }
 
         $objWriter->endElement();
     }
 
+    /**
+     * @param RichText|string $cellValue
+     */
+    private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, $cellValue): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        if (!$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();
+        }
+    }
+
+    /**
+     * @param RichText|string $cellValue
+     * @param string[] $flippedStringTable
+     */
+    private function writeCellString(XMLWriter $objWriter, string $mappedType, $cellValue, array $flippedStringTable): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        if (!$cellValue instanceof RichText) {
+            self::writeElementIf($objWriter, isset($flippedStringTable[$cellValue]), 'v', $flippedStringTable[$cellValue] ?? '');
+        } else {
+            $objWriter->writeElement('v', $flippedStringTable[$cellValue->getHashCode()]);
+        }
+    }
+
+    /**
+     * @param float|int $cellValue
+     */
+    private function writeCellNumeric(XMLWriter $objWriter, $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) {
+                $cellValue = $cellValue . '.0';
+            }
+        }
+        $objWriter->writeElement('v', "$cellValue");
+    }
+
+    private function writeCellBoolean(XMLWriter $objWriter, string $mappedType, bool $cellValue): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        $objWriter->writeElement('v', $cellValue ? '1' : '0');
+    }
+
+    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', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+        $objWriter->writeElement('v', $cellIsFormula ? $formulaerr : $cellValue);
+    }
+
+    private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell $cell): void
+    {
+        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValue() : $cellValue;
+        if (is_string($calculatedValue)) {
+            if (ErrorValue::isError($calculatedValue)) {
+                $this->writeCellError($objWriter, 'e', $cellValue, $calculatedValue);
+
+                return;
+            }
+            $objWriter->writeAttribute('t', 'str');
+            $calculatedValue = StringHelper::controlCharacterPHP2OOXML($calculatedValue);
+        } elseif (is_bool($calculatedValue)) {
+            $objWriter->writeAttribute('t', 'b');
+            $calculatedValue = (int) $calculatedValue;
+        }
+
+        $attributes = $cell->getFormulaAttributes();
+        if (($attributes['t'] ?? null) === 'array') {
+            $objWriter->startElement('f');
+            $objWriter->writeAttribute('t', 'array');
+            $objWriter->writeAttribute('ref', $cell->getCoordinate());
+            $objWriter->writeAttribute('aca', '1');
+            $objWriter->writeAttribute('ca', '1');
+            $objWriter->text(FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            $objWriter->endElement();
+        } else {
+            $objWriter->writeElement('f', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            self::writeElementIf(
+                $objWriter,
+                $this->getParentWriter()->getOffice2003Compatibility() === false,
+                'v',
+                ($this->getParentWriter()->getPreCalculateFormulas() && !is_array($calculatedValue) && substr($calculatedValue ?? '', 0, 1) !== '#')
+                    ? StringHelper::formatNumber($calculatedValue) : '0'
+            );
+        }
+    }
+
     /**
      * Write Cell.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
-     * @param Cell $pCellAddress Cell Address
-     * @param string[] $pFlippedStringTable String table (flipped), for faster index searching
-     *
-     * @throws WriterException
+     * @param string $cellAddress Cell Address
+     * @param string[] $flippedStringTable String table (flipped), for faster index searching
      */
-    private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet, $pCellAddress, array $pFlippedStringTable)
+    private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, string $cellAddress, array $flippedStringTable): void
     {
         // Cell
-        $pCell = $pSheet->getCell($pCellAddress);
+        $pCell = $worksheet->getCell($cellAddress);
         $objWriter->startElement('c');
-        $objWriter->writeAttribute('r', $pCellAddress);
+        $objWriter->writeAttribute('r', $cellAddress);
 
         // Sheet styles
-        if ($pCell->getXfIndex() != '') {
-            $objWriter->writeAttribute('s', $pCell->getXfIndex());
-        }
+        $xfi = $pCell->getXfIndex();
+        self::writeAttributeIf($objWriter, (bool) $xfi, 's', "$xfi");
 
         // If cell value is supplied, write cell value
         $cellValue = $pCell->getValue();
@@ -1065,101 +1329,30 @@ class Worksheet extends WriterPart
             // Map type
             $mappedType = $pCell->getDataType();
 
-            // Write data type depending on its type
-            switch (strtolower($mappedType)) {
-                case 'inlinestr':    // Inline string
-                case 's':            // String
-                case 'b':            // Boolean
-                    $objWriter->writeAttribute('t', $mappedType);
-
-                    break;
-                case 'f':            // Formula
-                    $calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ?
-                        $pCell->getCalculatedValue() : $cellValue;
-                    if (is_string($calculatedValue)) {
-                        $objWriter->writeAttribute('t', 'str');
-                    } elseif (is_bool($calculatedValue)) {
-                        $objWriter->writeAttribute('t', 'b');
-                    }
-
-                    break;
-                case 'e':            // Error
-                    $objWriter->writeAttribute('t', $mappedType);
-            }
-
             // Write data depending on its type
             switch (strtolower($mappedType)) {
                 case 'inlinestr':    // Inline string
-                    if (!$cellValue instanceof RichText) {
-                        $objWriter->writeElement('t', StringHelper::controlCharacterPHP2OOXML(htmlspecialchars($cellValue)));
-                    } elseif ($cellValue instanceof RichText) {
-                        $objWriter->startElement('is');
-                        $this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
-                        $objWriter->endElement();
-                    }
+                    $this->writeCellInlineStr($objWriter, $mappedType, $cellValue);
 
                     break;
                 case 's':            // String
-                    if (!$cellValue instanceof RichText) {
-                        if (isset($pFlippedStringTable[$cellValue])) {
-                            $objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
-                        }
-                    } elseif ($cellValue instanceof RichText) {
-                        $objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
-                    }
+                    $this->writeCellString($objWriter, $mappedType, $cellValue, $flippedStringTable);
 
                     break;
                 case 'f':            // Formula
-                    $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', substr($cellValue, 1));
-                    }
-                    if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
-                        if ($this->getParentWriter()->getPreCalculateFormulas()) {
-                            if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) !== '#') {
-                                $objWriter->writeElement('v', StringHelper::formatNumber($calculatedValue));
-                            } else {
-                                $objWriter->writeElement('v', '0');
-                            }
-                        } else {
-                            $objWriter->writeElement('v', '0');
-                        }
-                    }
+                    $this->writeCellFormula($objWriter, $cellValue, $pCell);
 
                     break;
                 case 'n':            // Numeric
-                    //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) {
-                            $cellValue = $cellValue . '.0';
-                        }
-                    }
-                    $objWriter->writeElement('v', $cellValue);
+                    $this->writeCellNumeric($objWriter, $cellValue);
 
                     break;
                 case 'b':            // Boolean
-                    $objWriter->writeElement('v', ($cellValue ? '1' : '0'));
+                    $this->writeCellBoolean($objWriter, $mappedType, $cellValue);
 
                     break;
                 case 'e':            // Error
-                    if (substr($cellValue, 0, 1) === '=') {
-                        $objWriter->writeElement('f', substr($cellValue, 1));
-                        $objWriter->writeElement('v', substr($cellValue, 1));
-                    } else {
-                        $objWriter->writeElement('v', $cellValue);
-                    }
-
-                    break;
+                    $this->writeCellError($objWriter, $mappedType, $cellValue);
             }
         }
 
@@ -1169,16 +1362,14 @@ class Worksheet extends WriterPart
     /**
      * 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)
+    private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, $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;
         }
 
@@ -1186,9 +1377,10 @@ class Worksheet extends WriterPart
         $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);
         }
 
@@ -1198,14 +1390,12 @@ class Worksheet extends WriterPart
 
     /**
      * Write LegacyDrawing.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeLegacyDrawing(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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();
@@ -1214,28 +1404,59 @@ class Worksheet extends WriterPart
 
     /**
      * Write LegacyDrawingHF.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeLegacyDrawingHF(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet)
+    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)
+    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);
         }
     }
+
+    /**
+     * write <ExtLst>
+     * only implementation conditionalFormattings.
+     *
+     * @url https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
+     */
+    private function writeExtLst(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $conditionalFormattingRuleExtList = [];
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            /** @var Conditional $conditional */
+            foreach ($conditionalStyles as $conditional) {
+                $dataBar = $conditional->getDataBar();
+                if ($dataBar && $dataBar->getConditionalFormattingRuleExt()) {
+                    $conditionalFormattingRuleExtList[] = $dataBar->getConditionalFormattingRuleExt();
+                }
+            }
+        }
+
+        if (count($conditionalFormattingRuleExtList) > 0) {
+            $conditionalFormattingRuleExtNsPrefix = 'x14';
+            $objWriter->startElement('extLst');
+            $objWriter->startElement('ext');
+            $objWriter->writeAttribute('uri', '{78C0D931-6437-407d-A8EE-F0AAD7539E65}');
+            $objWriter->startElementNs($conditionalFormattingRuleExtNsPrefix, 'conditionalFormattings', null);
+            foreach ($conditionalFormattingRuleExtList as $extension) {
+                self::writeExtConditionalFormattingElements($objWriter, $extension);
+            }
+            $objWriter->endElement(); //end conditionalFormattings
+            $objWriter->endElement(); //end ext
+            $objWriter->endElement(); //end extLst
+        }
+    }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
index 7119512ce..0bfb356d8 100644
--- a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
@@ -25,11 +25,9 @@ abstract class WriterPart
 
     /**
      * Set parent Xlsx object.
-     *
-     * @param Xlsx $pWriter
      */
-    public function __construct(Xlsx $pWriter)
+    public function __construct(Xlsx $writer)
     {
-        $this->parentWriter = $pWriter;
+        $this->parentWriter = $writer;
     }
 }
diff --git a/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php
new file mode 100644
index 000000000..886731ca9
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php
new file mode 100644
index 000000000..ed21a7e39
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
new file mode 100644
index 000000000..d9c8d0b16
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\Option\Archive;
+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/libraries/phpspreadsheet/vendor/psr/http-client/CHANGELOG.md b/libraries/phpspreadsheet/vendor/psr/http-client/CHANGELOG.md
new file mode 100644
index 000000000..babba7c7b
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+
+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.
+
+## 1.0.0
+
+First stable release. No changes since 0.3.0.
+
+## 0.3.0
+
+Added Interface suffix on exceptions
+ 
+## 0.2.0 
+
+All exceptions are in `Psr\Http\Client` namespace
+
+## 0.1.0
+
+First release
diff --git a/libraries/phpspreadsheet/vendor/psr/http-client/LICENSE b/libraries/phpspreadsheet/vendor/psr/http-client/LICENSE
new file mode 100644
index 000000000..cd5e0020a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2017 PHP Framework Interoperability Group
+
+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/libraries/phpspreadsheet/vendor/psr/http-client/README.md b/libraries/phpspreadsheet/vendor/psr/http-client/README.md
new file mode 100644
index 000000000..84af5c55d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/README.md
@@ -0,0 +1,12 @@
+HTTP Client
+===========
+
+This repository holds all the common code related to [PSR-18 (HTTP Client)][psr-url].
+
+Note that this is not a HTTP Client implementation of its own. It is merely abstractions that describe the components of a HTTP Client.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[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/libraries/phpspreadsheet/vendor/psr/http-client/composer.json b/libraries/phpspreadsheet/vendor/psr/http-client/composer.json
new file mode 100644
index 000000000..6fed350be
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "psr/http-client",
+    "description": "Common interface for HTTP clients",
+    "keywords": ["psr", "psr-18", "http", "http-client"],
+    "homepage": "https://github.com/php-fig/http-client",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "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 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Client\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientExceptionInterface.php b/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientExceptionInterface.php
new file mode 100644
index 000000000..aa0b9cf14
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientExceptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Psr\Http\Client;
+
+/**
+ * Every HTTP client related exception MUST implement this interface.
+ */
+interface ClientExceptionInterface extends \Throwable
+{
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientInterface.php b/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientInterface.php
new file mode 100644
index 000000000..ad99fd4b7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/src/ClientInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+interface ClientInterface
+{
+    /**
+     * Sends a PSR-7 request and returns a PSR-7 response.
+     *
+     * @param RequestInterface $request
+     *
+     * @return ResponseInterface
+     *
+     * @throws \Psr\Http\Client\ClientExceptionInterface If an error happens while processing the request.
+     */
+    public function sendRequest(RequestInterface $request): ResponseInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-client/src/NetworkExceptionInterface.php b/libraries/phpspreadsheet/vendor/psr/http-client/src/NetworkExceptionInterface.php
new file mode 100644
index 000000000..4a11627c7
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/src/NetworkExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Thrown when the request cannot be completed because of network issues.
+ *
+ * There is no response object as this exception is thrown when no response has been received.
+ *
+ * Example: the target host name can not be resolved or the connection failed.
+ */
+interface NetworkExceptionInterface extends ClientExceptionInterface
+{
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     *
+     * @return RequestInterface
+     */
+    public function getRequest(): RequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-client/src/RequestExceptionInterface.php b/libraries/phpspreadsheet/vendor/psr/http-client/src/RequestExceptionInterface.php
new file mode 100644
index 000000000..b17fc34fd
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-client/src/RequestExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Exception for when a request failed.
+ *
+ * Examples:
+ *      - Request is invalid (e.g. method is missing)
+ *      - Runtime request errors (e.g. the body stream is not seekable)
+ */
+interface RequestExceptionInterface extends ClientExceptionInterface
+{
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     *
+     * @return RequestInterface
+     */
+    public function getRequest(): RequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/LICENSE b/libraries/phpspreadsheet/vendor/psr/http-factory/LICENSE
new file mode 100644
index 000000000..3f1559b2a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 PHP-FIG
+
+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/libraries/phpspreadsheet/vendor/psr/http-factory/README.md b/libraries/phpspreadsheet/vendor/psr/http-factory/README.md
new file mode 100644
index 000000000..bf8913b57
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/README.md
@@ -0,0 +1,12 @@
+HTTP Factories
+==============
+
+This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url].
+
+Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory.
+
+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/libraries/phpspreadsheet/vendor/psr/http-factory/composer.json b/libraries/phpspreadsheet/vendor/psr/http-factory/composer.json
new file mode 100644
index 000000000..82a1d3266
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "psr/http-factory",
+    "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-17",
+        "http",
+        "factory",
+        "message",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "support": {
+        "source": "https://github.com/php-fig/http-factory"
+    },
+    "require": {
+        "php": ">=7.1",
+        "psr/http-message": "^1.0 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/RequestFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/RequestFactoryInterface.php
new file mode 100644
index 000000000..cb39a08bf
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/RequestFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface RequestFactoryInterface
+{
+    /**
+     * Create a new request.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     *
+     * @return RequestInterface
+     */
+    public function createRequest(string $method, $uri): RequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/ResponseFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/ResponseFactoryInterface.php
new file mode 100644
index 000000000..212562f00
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/ResponseFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ResponseFactoryInterface
+{
+    /**
+     * Create a new response.
+     *
+     * @param int $code HTTP status code; defaults to 200
+     * @param string $reasonPhrase Reason phrase to associate with status code
+     *     in generated response; if none is provided implementations MAY use
+     *     the defaults as suggested in the HTTP specification.
+     *
+     * @return ResponseInterface
+     */
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
new file mode 100644
index 000000000..9fe031a8f
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ServerRequestFactoryInterface
+{
+    /**
+     * Create a new server request.
+     *
+     * Note that server-params are taken precisely as given - no parsing/processing
+     * of the given values is performed, and, in particular, no attempt is made to
+     * determine the HTTP method or URI, which must be provided explicitly.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     * @param array $serverParams Array of SAPI parameters with which to seed
+     *     the generated request instance.
+     *
+     * @return ServerRequestInterface
+     */
+    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/StreamFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/StreamFactoryInterface.php
new file mode 100644
index 000000000..90e3240c4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/StreamFactoryInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface StreamFactoryInterface
+{
+    /**
+     * Create a new stream from a string.
+     *
+     * The stream SHOULD be created with a temporary resource.
+     *
+     * @param string $content String content with which to populate the stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStream(string $content = ''): StreamInterface;
+
+    /**
+     * Create a stream from an existing file.
+     *
+     * The file MUST be opened using the given mode, which may be any mode
+     * supported by the `fopen` function.
+     *
+     * The `$filename` MAY be any string supported by `fopen()`.
+     *
+     * @param string $filename Filename or stream URI to use as basis of stream.
+     * @param string $mode Mode with which to open the underlying filename/stream.
+     *
+     * @return StreamInterface
+     * @throws \RuntimeException If the file cannot be opened.
+     * @throws \InvalidArgumentException If the mode is invalid.
+     */
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
+
+    /**
+     * Create a new stream from an existing resource.
+     *
+     * The stream MUST be readable and may be writable.
+     *
+     * @param resource $resource PHP resource to use as basis of stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStreamFromResource($resource): StreamInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
new file mode 100644
index 000000000..d7adbf0e2
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UploadedFileFactoryInterface
+{
+    /**
+     * Create a new uploaded file.
+     *
+     * If a size is not provided it will be determined by checking the size of
+     * the file.
+     *
+     * @see http://php.net/manual/features.file-upload.post-method.php
+     * @see http://php.net/manual/features.file-upload.errors.php
+     *
+     * @param StreamInterface $stream Underlying stream representing the
+     *     uploaded file content.
+     * @param int|null $size in bytes
+     * @param int $error PHP file upload error
+     * @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
+     *
+     * @throws \InvalidArgumentException If the file resource is not readable.
+     */
+    public function createUploadedFile(
+        StreamInterface $stream,
+        ?int $size = null,
+        int $error = \UPLOAD_ERR_OK,
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
+    ): UploadedFileInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-factory/src/UriFactoryInterface.php b/libraries/phpspreadsheet/vendor/psr/http-factory/src/UriFactoryInterface.php
new file mode 100644
index 000000000..06df0b46a
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-factory/src/UriFactoryInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UriFactoryInterface
+{
+    /**
+     * Create a new URI.
+     *
+     * @param string $uri
+     *
+     * @return UriInterface
+     *
+     * @throws \InvalidArgumentException If the given URI cannot be parsed.
+     */
+    public function createUri(string $uri = ''): UriInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/CHANGELOG.md b/libraries/phpspreadsheet/vendor/psr/http-message/CHANGELOG.md
new file mode 100644
index 000000000..74b1ef923
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.1 - 2016-08-06
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Updated all `@return self` annotation references in interfaces to use
+  `@return static`, which more closelly follows the semantics of the
+  specification.
+- Updated the `MessageInterface::getHeaders()` return annotation to use the
+  value `string[][]`, indicating the format is a nested array of strings.
+- Updated the `@link` annotation for `RequestInterface::withRequestTarget()`
+  to point to the correct section of RFC 7230.
+- Updated the `ServerRequestInterface::withUploadedFiles()` parameter annotation
+  to add the parameter name (`$uploadedFiles`).
+- Updated a `@throws` annotation for the `UploadedFileInterface::moveTo()`
+  method to correctly reference the method parameter (it was referencing an
+  incorrect parameter name previously).
+
+## 1.0.0 - 2016-05-18
+
+Initial stable release; reflects accepted PSR-7 specification.
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/LICENSE b/libraries/phpspreadsheet/vendor/psr/http-message/LICENSE
new file mode 100644
index 000000000..c2d8e452d
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014 PHP Framework Interoperability Group
+
+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/libraries/phpspreadsheet/vendor/psr/http-message/README.md b/libraries/phpspreadsheet/vendor/psr/http-message/README.md
new file mode 100644
index 000000000..2668be6c3
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/README.md
@@ -0,0 +1,16 @@
+PSR Http Message
+================
+
+This repository holds all interfaces/classes/traits related to
+[PSR-7](http://www.php-fig.org/psr/psr-7/).
+
+Note that this is not a HTTP message implementation of its own. It is merely an
+interface that describes a HTTP message. See the specification for more details.
+
+Usage
+-----
+
+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/libraries/phpspreadsheet/vendor/psr/http-message/composer.json b/libraries/phpspreadsheet/vendor/psr/http-message/composer.json
new file mode 100644
index 000000000..c66e5aba4
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "psr/http-message",
+    "description": "Common interface for HTTP messages",
+    "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"],
+    "homepage": "https://github.com/php-fig/http-message",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": "^7.2 || ^8.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    }
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/docs/PSR7-Interfaces.md b/libraries/phpspreadsheet/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 000000000..3a7e7dda6
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/psr/http-message/docs/PSR7-Usage.md b/libraries/phpspreadsheet/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 000000000..b6d048a34
--- /dev/null
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/psr/http-message/src/MessageInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/MessageInterface.php
new file mode 100644
index 000000000..a83c98518
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/MessageInterface.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * HTTP messages consist of requests from a client to a server and responses
+ * from a server to a client. This interface defines the methods common to
+ * each.
+ *
+ * Messages are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ *
+ * @link http://www.ietf.org/rfc/rfc7230.txt
+ * @link http://www.ietf.org/rfc/rfc7231.txt
+ */
+interface MessageInterface
+{
+    /**
+     * Retrieves the HTTP protocol version as a string.
+     *
+     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+     *
+     * @return string HTTP protocol version.
+     */
+    public function getProtocolVersion(): string;
+
+    /**
+     * Return an instance with the specified HTTP protocol version.
+     *
+     * The version string MUST contain only the HTTP version number (e.g.,
+     * "1.1", "1.0").
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new protocol version.
+     *
+     * @param string $version HTTP protocol version
+     * @return static
+     */
+    public function withProtocolVersion(string $version): MessageInterface;
+
+    /**
+     * Retrieves all message header values.
+     *
+     * The keys represent the header name as it will be sent over the wire, and
+     * each value is an array of strings associated with the header.
+     *
+     *     // Represent the headers as a string
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         echo $name . ": " . implode(", ", $values);
+     *     }
+     *
+     *     // Emit headers iteratively:
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         foreach ($values as $value) {
+     *             header(sprintf('%s: %s', $name, $value), false);
+     *         }
+     *     }
+     *
+     * While header names are not case-sensitive, getHeaders() will preserve the
+     * exact case in which headers were originally specified.
+     *
+     * @return string[][] Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings
+     *     for that header.
+     */
+    public function getHeaders(): array;
+
+    /**
+     * Checks if a header exists by the given case-insensitive name.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return bool Returns true if any header names match the given header
+     *     name using a case-insensitive string comparison. Returns false if
+     *     no matching header name is found in the message.
+     */
+    public function hasHeader(string $name): bool;
+
+    /**
+     * Retrieves a message header value by the given case-insensitive name.
+     *
+     * This method returns an array of all the header values of the given
+     * case-insensitive header name.
+     *
+     * If the header does not appear in the message, this method MUST return an
+     * empty array.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string[] An array of string values as provided for the given
+     *    header. If the header does not appear in the message, this method MUST
+     *    return an empty array.
+     */
+    public function getHeader(string $name): array;
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * If the header does not appear in the message, this method MUST return
+     * an empty string.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
+     *    concatenated together using a comma. If the header does not appear in
+     *    the message, this method MUST return an empty string.
+     */
+    public function getHeaderLine(string $name): string;
+
+    /**
+     * Return an instance with the provided value replacing the specified header.
+     *
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new and/or updated header and value.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader(string $name, $value): MessageInterface;
+
+    /**
+     * Return an instance with the specified header appended with the given value.
+     *
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new header and/or value.
+     *
+     * @param string $name Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withAddedHeader(string $name, $value): MessageInterface;
+
+    /**
+     * Return an instance without the specified header.
+     *
+     * Header resolution MUST be done without case-sensitivity.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the named header.
+     *
+     * @param string $name Case-insensitive header field name to remove.
+     * @return static
+     */
+    public function withoutHeader(string $name): MessageInterface;
+
+    /**
+     * Gets the body of the message.
+     *
+     * @return StreamInterface Returns the body as a stream.
+     */
+    public function getBody(): StreamInterface;
+
+    /**
+     * Return an instance with the specified message body.
+     *
+     * The body MUST be a StreamInterface object.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * new body stream.
+     *
+     * @param StreamInterface $body Body.
+     * @return static
+     * @throws \InvalidArgumentException When the body is not valid.
+     */
+    public function withBody(StreamInterface $body): MessageInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/RequestInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/RequestInterface.php
new file mode 100644
index 000000000..33f85e559
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/RequestInterface.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, client-side request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * During construction, implementations MUST attempt to set the Host header from
+ * a provided URI if no Host header is provided.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface RequestInterface extends MessageInterface
+{
+    /**
+     * Retrieves the message's request target.
+     *
+     * Retrieves the message's request-target either as it will appear (for
+     * clients), as it appeared at request (for servers), or as it was
+     * specified for the instance (see withRequestTarget()).
+     *
+     * In most cases, this will be the origin-form of the composed URI,
+     * unless a value was provided to the concrete implementation (see
+     * withRequestTarget() below).
+     *
+     * If no URI is available, and no request-target has been specifically
+     * provided, this method MUST return the string "/".
+     *
+     * @return string
+     */
+    public function getRequestTarget(): string;
+
+    /**
+     * Return an instance with the specific request-target.
+     *
+     * If the request needs a non-origin-form request-target — e.g., for
+     * specifying an absolute-form, authority-form, or asterisk-form —
+     * this method may be used to create an instance with the specified
+     * request-target, verbatim.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request target.
+     *
+     * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
+     *     request-target forms allowed in request messages)
+     * @param string $requestTarget
+     * @return static
+     */
+    public function withRequestTarget(string $requestTarget): RequestInterface;
+
+
+    /**
+     * Retrieves the HTTP method of the request.
+     *
+     * @return string Returns the request method.
+     */
+    public function getMethod(): string;
+
+    /**
+     * Return an instance with the provided HTTP method.
+     *
+     * While HTTP method names are typically all uppercase characters, HTTP
+     * method names are case-sensitive and thus implementations SHOULD NOT
+     * modify the given string.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request method.
+     *
+     * @param string $method Case-sensitive method.
+     * @return static
+     * @throws \InvalidArgumentException for invalid HTTP methods.
+     */
+    public function withMethod(string $method): RequestInterface;
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * This method MUST return a UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @return UriInterface Returns a UriInterface instance
+     *     representing the URI of the request.
+     */
+    public function getUri(): UriInterface;
+
+    /**
+     * Returns an instance with the provided URI.
+     *
+     * This method MUST update the Host header of the returned request by
+     * default if the URI contains a host component. If the URI does not
+     * contain a host component, any pre-existing Host header MUST be carried
+     * over to the returned request.
+     *
+     * You can opt-in to preserving the original state of the Host header by
+     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
+     * `true`, this method interacts with the Host header in the following ways:
+     *
+     * - If the Host header is missing or empty, and the new URI contains
+     *   a host component, this method MUST update the Host header in the returned
+     *   request.
+     * - If the Host header is missing or empty, and the new URI does not contain a
+     *   host component, this method MUST NOT update the Host header in the returned
+     *   request.
+     * - If a Host header is present and non-empty, this method MUST NOT update
+     *   the Host header in the returned request.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @param UriInterface $uri New request URI to use.
+     * @param bool $preserveHost Preserve the original state of the Host header.
+     * @return static
+     */
+    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/ResponseInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/ResponseInterface.php
new file mode 100644
index 000000000..e9299a914
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/ResponseInterface.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, server-side response.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - Status code and reason phrase
+ * - Headers
+ * - Message body
+ *
+ * Responses are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ResponseInterface extends MessageInterface
+{
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the server's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode(): int;
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, implementations MAY choose to default
+     * to the RFC 7231 or IANA recommended reason phrase for the response's
+     * status code.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated status and reason phrase.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @param int $code The 3-digit integer result code to set.
+     * @param string $reasonPhrase The reason phrase to use with the
+     *     provided status code; if none is provided, implementations MAY
+     *     use the defaults as suggested in the HTTP specification.
+     * @return static
+     * @throws \InvalidArgumentException For invalid status code arguments.
+     */
+    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
+
+    /**
+     * Gets the response reason phrase associated with the status code.
+     *
+     * Because a reason phrase is not a required element in a response
+     * status line, the reason phrase value MAY be null. Implementations MAY
+     * choose to return the default RFC 7231 recommended reason phrase (or those
+     * listed in the IANA HTTP Status Code Registry) for the response's
+     * status code.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @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(): string;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/ServerRequestInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/ServerRequestInterface.php
new file mode 100644
index 000000000..8625d0e10
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an incoming, server-side HTTP request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * Additionally, it encapsulates all data as it has arrived to the
+ * application from the CGI and/or PHP environment, including:
+ *
+ * - The values represented in $_SERVER.
+ * - Any cookies provided (generally via $_COOKIE)
+ * - Query string arguments (generally via $_GET, or as parsed via parse_str())
+ * - Upload files, if any (as represented by $_FILES)
+ * - Deserialized body parameters (generally from $_POST)
+ *
+ * $_SERVER values MUST be treated as immutable, as they represent application
+ * state at the time of request; as such, no methods are provided to allow
+ * modification of those values. The other values provide such methods, as they
+ * can be restored from $_SERVER or the request body, and may need treatment
+ * during the application (e.g., body parameters may be deserialized based on
+ * content type).
+ *
+ * Additionally, this interface recognizes the utility of introspecting a
+ * request to derive and match additional parameters (e.g., via URI path
+ * matching, decrypting cookie values, deserializing non-form-encoded body
+ * content, matching authorization headers to users, etc). These parameters
+ * are stored in an "attributes" property.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ServerRequestInterface extends RequestInterface
+{
+    /**
+     * Retrieve server parameters.
+     *
+     * Retrieves data related to the incoming request environment,
+     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
+     * REQUIRED to originate from $_SERVER.
+     *
+     * @return array
+     */
+    public function getServerParams(): array;
+
+    /**
+     * Retrieve cookies.
+     *
+     * Retrieves cookies sent by the client to the server.
+     *
+     * The data MUST be compatible with the structure of the $_COOKIE
+     * superglobal.
+     *
+     * @return array
+     */
+    public function getCookieParams(): array;
+
+    /**
+     * Return an instance with the specified cookies.
+     *
+     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
+     * be compatible with the structure of $_COOKIE. Typically, this data will
+     * be injected at instantiation.
+     *
+     * This method MUST NOT update the related Cookie header of the request
+     * instance, nor related values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated cookie values.
+     *
+     * @param array $cookies Array of key/value pairs representing cookies.
+     * @return static
+     */
+    public function withCookieParams(array $cookies): ServerRequestInterface;
+
+    /**
+     * Retrieve query string arguments.
+     *
+     * Retrieves the deserialized query string arguments, if any.
+     *
+     * Note: the query params might not be in sync with the URI or server
+     * params. If you need to ensure you are only getting the original
+     * values, you may need to parse the query string from `getUri()->getQuery()`
+     * or from the `QUERY_STRING` server param.
+     *
+     * @return array
+     */
+    public function getQueryParams(): array;
+
+    /**
+     * Return an instance with the specified query string arguments.
+     *
+     * These values SHOULD remain immutable over the course of the incoming
+     * request. They MAY be injected during instantiation, such as from PHP's
+     * $_GET superglobal, or MAY be derived from some other value such as the
+     * URI. In cases where the arguments are parsed from the URI, the data
+     * MUST be compatible with what PHP's parse_str() would return for
+     * purposes of how duplicate query parameters are handled, and how nested
+     * sets are handled.
+     *
+     * Setting query string arguments MUST NOT change the URI stored by the
+     * request, nor the values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated query string arguments.
+     *
+     * @param array $query Array of query string arguments, typically from
+     *     $_GET.
+     * @return static
+     */
+    public function withQueryParams(array $query): ServerRequestInterface;
+
+    /**
+     * Retrieve normalized file upload data.
+     *
+     * This method returns upload metadata in a normalized tree, with each leaf
+     * an instance of Psr\Http\Message\UploadedFileInterface.
+     *
+     * These values MAY be prepared from $_FILES or the message body during
+     * instantiation, or MAY be injected via withUploadedFiles().
+     *
+     * @return array An array tree of UploadedFileInterface instances; an empty
+     *     array MUST be returned if no data is present.
+     */
+    public function getUploadedFiles(): array;
+
+    /**
+     * Create a new instance with the specified uploaded files.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
+     * @return static
+     * @throws \InvalidArgumentException if an invalid structure is provided.
+     */
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
+
+    /**
+     * Retrieve any parameters provided in the request body.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, this method MUST
+     * return the contents of $_POST.
+     *
+     * Otherwise, this method may return any results of deserializing
+     * the request body content; as parsing returns structured content, the
+     * potential types MUST be arrays or objects only. A null value indicates
+     * the absence of body content.
+     *
+     * @return null|array|object The deserialized body parameters, if any.
+     *     These will typically be an array or object.
+     */
+    public function getParsedBody();
+
+    /**
+     * Return an instance with the specified body parameters.
+     *
+     * These MAY be injected during instantiation.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, use this method
+     * ONLY to inject the contents of $_POST.
+     *
+     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
+     * deserializing the request body content. Deserialization/parsing returns
+     * structured data, and, as such, this method ONLY accepts arrays or objects,
+     * or a null value if nothing was available to parse.
+     *
+     * As an example, if content negotiation determines that the request data
+     * is a JSON payload, this method could be used to create a request
+     * instance with the deserialized parameters.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param null|array|object $data The deserialized body data. This will
+     *     typically be in an array or object.
+     * @return static
+     * @throws \InvalidArgumentException if an unsupported argument type is
+     *     provided.
+     */
+    public function withParsedBody($data): ServerRequestInterface;
+
+    /**
+     * Retrieve attributes derived from the request.
+     *
+     * The request "attributes" may be used to allow injection of any
+     * parameters derived from the request: e.g., the results of path
+     * match operations; the results of decrypting cookies; the results of
+     * deserializing non-form-encoded message bodies; etc. Attributes
+     * will be application and request specific, and CAN be mutable.
+     *
+     * @return array Attributes derived from the request.
+     */
+    public function getAttributes(): array;
+
+    /**
+     * Retrieve a single derived request attribute.
+     *
+     * Retrieves a single derived request attribute as described in
+     * getAttributes(). If the attribute has not been previously set, returns
+     * the default value as provided.
+     *
+     * This method obviates the need for a hasAttribute() method, as it allows
+     * specifying a default value to return if the attribute is not found.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $default Default value to return if the attribute does not exist.
+     * @return mixed
+     */
+    public function getAttribute(string $name, $default = null);
+
+    /**
+     * Return an instance with the specified derived request attribute.
+     *
+     * This method allows setting a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $value The value of the attribute.
+     * @return static
+     */
+    public function withAttribute(string $name, $value): ServerRequestInterface;
+
+    /**
+     * Return an instance that removes the specified derived request attribute.
+     *
+     * This method allows removing a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @return static
+     */
+    public function withoutAttribute(string $name): ServerRequestInterface;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/StreamInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/StreamInterface.php
new file mode 100644
index 000000000..a62aabb82
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/StreamInterface.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * 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.
+ */
+interface StreamInterface
+{
+    /**
+     * 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;
+
+    /**
+     * Closes the stream and any underlying resources.
+     *
+     * @return void
+     */
+    public function close(): void;
+
+    /**
+     * 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();
+
+    /**
+     * 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;
+
+    /**
+     * 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;
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof(): bool;
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable(): bool;
+
+    /**
+     * 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(int $offset, int $whence = SEEK_SET): void;
+
+    /**
+     * 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;
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable(): bool;
+
+    /**
+     * 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 $string): int;
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable(): bool;
+
+    /**
+     * 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(int $length): string;
+
+    /**
+     * 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;
+
+    /**
+     * 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|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(?string $key = null);
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/UploadedFileInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/UploadedFileInterface.php
new file mode 100644
index 000000000..dd19d6538
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a file uploaded through an HTTP request.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ */
+interface UploadedFileInterface
+{
+    /**
+     * Retrieve a stream representing the uploaded file.
+     *
+     * This method MUST return a StreamInterface instance, representing the
+     * uploaded file. The purpose of this method is to allow utilizing native PHP
+     * stream functionality to manipulate the file upload, such as
+     * stream_copy_to_stream() (though the result will need to be decorated in a
+     * native PHP stream wrapper to work with such functions).
+     *
+     * If the moveTo() method has been called previously, this method MUST raise
+     * an exception.
+     *
+     * @return StreamInterface Stream representation of the uploaded file.
+     * @throws \RuntimeException in cases when no stream is available or can be
+     *     created.
+     */
+    public function getStream(): StreamInterface;
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * Use this method as an alternative to move_uploaded_file(). This method is
+     * guaranteed to work in both SAPI and non-SAPI environments.
+     * Implementations must determine which environment they are in, and use the
+     * appropriate method (move_uploaded_file(), rename(), or a stream
+     * operation) to perform the operation.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file or stream MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @throws \InvalidArgumentException if the $targetPath specified is invalid.
+     * @throws \RuntimeException on any error during the move operation, or on
+     *     the second or subsequent call to the method.
+     */
+    public function moveTo(string $targetPath): void;
+    
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this based
+     * on the actual size transmitted.
+     *
+     * @return int|null The file size in bytes or null if unknown.
+     */
+    public function getSize(): ?int;
+    
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see http://php.net/manual/en/features.file-upload.errors.php
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError(): int;
+    
+    /**
+     * Retrieve the filename sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious filename with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "name" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The filename sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientFilename(): ?string;
+    
+    /**
+     * Retrieve the media type sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious media type with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "type" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The media type sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientMediaType(): ?string;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/http-message/src/UriInterface.php b/libraries/phpspreadsheet/vendor/psr/http-message/src/UriInterface.php
new file mode 100644
index 000000000..15e2cf286
--- /dev/null
+++ b/libraries/phpspreadsheet/vendor/psr/http-message/src/UriInterface.php
@@ -0,0 +1,324 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a URI.
+ *
+ * This interface is meant to represent URIs according to RFC 3986 and to
+ * provide methods for most common operations. Additional functionality for
+ * working with URIs can be provided on top of the interface or externally.
+ * Its primary use is for HTTP requests, but may also be used in other
+ * contexts.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ *
+ * Typically the Host header will be also be present in the request message.
+ * For server-side requests, the scheme will typically be discoverable in the
+ * server parameters.
+ *
+ * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
+ */
+interface UriInterface
+{
+    /**
+     * Retrieve the scheme component of the URI.
+     *
+     * If no scheme is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.1.
+     *
+     * The trailing ":" character is not part of the scheme and MUST NOT be
+     * added.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.1
+     * @return string The URI scheme.
+     */
+    public function getScheme(): string;
+
+    /**
+     * Retrieve the authority component of the URI.
+     *
+     * If no authority information is present, this method MUST return an empty
+     * string.
+     *
+     * The authority syntax of the URI is:
+     *
+     * <pre>
+     * [user-info@]host[:port]
+     * </pre>
+     *
+     * If the port component is not set or is the standard port for the current
+     * scheme, it SHOULD NOT be included.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.2
+     * @return string The URI authority, in "[user-info@]host[:port]" format.
+     */
+    public function getAuthority(): string;
+
+    /**
+     * Retrieve the user information component of the URI.
+     *
+     * If no user information is present, this method MUST return an empty
+     * string.
+     *
+     * If a user is present in the URI, this will return that value;
+     * additionally, if the password is also present, it will be appended to the
+     * user value, with a colon (":") separating the values.
+     *
+     * The trailing "@" character is not part of the user information and MUST
+     * NOT be added.
+     *
+     * @return string The URI user information, in "username[:password]" format.
+     */
+    public function getUserInfo(): string;
+
+    /**
+     * Retrieve the host component of the URI.
+     *
+     * If no host is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.2.2.
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
+     * @return string The URI host.
+     */
+    public function getHost(): string;
+
+    /**
+     * Retrieve the port component of the URI.
+     *
+     * If a port is present, and it is non-standard for the current scheme,
+     * this method MUST return it as an integer. If the port is the standard port
+     * used with the current scheme, this method SHOULD return null.
+     *
+     * If no port is present, and no scheme is present, this method MUST return
+     * a null value.
+     *
+     * If no port is present, but a scheme is present, this method MAY return
+     * the standard port for that scheme, but SHOULD return null.
+     *
+     * @return null|int The URI port.
+     */
+    public function getPort(): ?int;
+
+    /**
+     * Retrieve the path component of the URI.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * Normally, the empty path "" and absolute path "/" are considered equal as
+     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+     * do this normalization because in contexts with a trimmed base path, e.g.
+     * the front controller, this difference becomes significant. It's the task
+     * of the user to handle both "" and "/".
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.3.
+     *
+     * As an example, if the value should include a slash ("/") not intended as
+     * delimiter between path segments, that value MUST be passed in encoded
+     * form (e.g., "%2F") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.3
+     * @return string The URI path.
+     */
+    public function getPath(): string;
+
+    /**
+     * Retrieve the query string of the URI.
+     *
+     * If no query string is present, this method MUST return an empty string.
+     *
+     * The leading "?" character is not part of the query and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.4.
+     *
+     * As an example, if a value in a key/value pair of the query string should
+     * include an ampersand ("&") not intended as a delimiter between values,
+     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.4
+     * @return string The URI query string.
+     */
+    public function getQuery(): string;
+
+    /**
+     * Retrieve the fragment component of the URI.
+     *
+     * If no fragment is present, this method MUST return an empty string.
+     *
+     * The leading "#" character is not part of the fragment and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.5.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.5
+     * @return string The URI fragment.
+     */
+    public function getFragment(): string;
+
+    /**
+     * Return an instance with the specified scheme.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified scheme.
+     *
+     * Implementations MUST support the schemes "http" and "https" case
+     * insensitively, and MAY accommodate other schemes if required.
+     *
+     * An empty scheme is equivalent to removing the scheme.
+     *
+     * @param string $scheme The scheme to use with the new instance.
+     * @return static A new instance with the specified scheme.
+     * @throws \InvalidArgumentException for invalid or unsupported schemes.
+     */
+    public function withScheme(string $scheme): UriInterface;
+
+    /**
+     * Return an instance with the specified user information.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified user information.
+     *
+     * Password is optional, but the user information MUST include the
+     * user; an empty string for the user is equivalent to removing user
+     * information.
+     *
+     * @param string $user The user name to use for authority.
+     * @param null|string $password The password associated with $user.
+     * @return static A new instance with the specified user information.
+     */
+    public function withUserInfo(string $user, ?string $password = null): UriInterface;
+
+    /**
+     * Return an instance with the specified host.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified host.
+     *
+     * An empty host value is equivalent to removing the host.
+     *
+     * @param string $host The hostname to use with the new instance.
+     * @return static A new instance with the specified host.
+     * @throws \InvalidArgumentException for invalid hostnames.
+     */
+    public function withHost(string $host): UriInterface;
+
+    /**
+     * Return an instance with the specified port.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified port.
+     *
+     * Implementations MUST raise an exception for ports outside the
+     * established TCP and UDP port ranges.
+     *
+     * A null value provided for the port is equivalent to removing the port
+     * information.
+     *
+     * @param null|int $port The port to use with the new instance; a null value
+     *     removes the port information.
+     * @return static A new instance with the specified port.
+     * @throws \InvalidArgumentException for invalid ports.
+     */
+    public function withPort(?int $port): UriInterface;
+
+    /**
+     * Return an instance with the specified path.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified path.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * If the path is intended to be domain-relative rather than path relative then
+     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
+     * are assumed to be relative to some base path known to the application or
+     * consumer.
+     *
+     * Users can provide both encoded and decoded path characters.
+     * Implementations ensure the correct encoding as outlined in getPath().
+     *
+     * @param string $path The path to use with the new instance.
+     * @return static A new instance with the specified path.
+     * @throws \InvalidArgumentException for invalid paths.
+     */
+    public function withPath(string $path): UriInterface;
+
+    /**
+     * Return an instance with the specified query string.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified query string.
+     *
+     * Users can provide both encoded and decoded query characters.
+     * Implementations ensure the correct encoding as outlined in getQuery().
+     *
+     * An empty query string value is equivalent to removing the query string.
+     *
+     * @param string $query The query string to use with the new instance.
+     * @return static A new instance with the specified query string.
+     * @throws \InvalidArgumentException for invalid query strings.
+     */
+    public function withQuery(string $query): UriInterface;
+
+    /**
+     * Return an instance with the specified URI fragment.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified URI fragment.
+     *
+     * Users can provide both encoded and decoded fragment characters.
+     * Implementations ensure the correct encoding as outlined in getFragment().
+     *
+     * An empty fragment value is equivalent to removing the fragment.
+     *
+     * @param string $fragment The fragment to use with the new instance.
+     * @return static A new instance with the specified fragment.
+     */
+    public function withFragment(string $fragment): UriInterface;
+
+    /**
+     * Return the string representation as a URI reference.
+     *
+     * Depending on which components of the URI are present, the resulting
+     * string is either a full URI or relative reference according to RFC 3986,
+     * Section 4.1. The method concatenates the various components of the URI,
+     * using the appropriate delimiters:
+     *
+     * - If a scheme is present, it MUST be suffixed by ":".
+     * - If an authority is present, it MUST be prefixed by "//".
+     * - The path can be concatenated without delimiters. But there are two
+     *   cases where the path has to be adjusted to make the URI reference
+     *   valid as PHP does not allow to throw an exception in __toString():
+     *     - If the path is rootless and an authority is present, the path MUST
+     *       be prefixed by "/".
+     *     - If the path is starting with more than one "/" and no authority is
+     *       present, the starting slashes MUST be reduced to one.
+     * - If a query is present, it MUST be prefixed by "?".
+     * - If a fragment is present, it MUST be prefixed by "#".
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-4.1
+     * @return string
+     */
+    public function __toString(): string;
+}
diff --git a/libraries/phpspreadsheet/vendor/psr/simple-cache/composer.json b/libraries/phpspreadsheet/vendor/psr/simple-cache/composer.json
index 2978fa559..f307a8456 100644
--- a/libraries/phpspreadsheet/vendor/psr/simple-cache/composer.json
+++ b/libraries/phpspreadsheet/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/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheException.php b/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheException.php
index eba53815c..f61b24c2b 100644
--- a/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheException.php
+++ b/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheException.php
@@ -5,6 +5,6 @@ namespace Psr\SimpleCache;
 /**
  * Interface used for all types of exceptions thrown by the implementing library.
  */
-interface CacheException
+interface CacheException extends \Throwable
 {
 }
diff --git a/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheInterface.php b/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheInterface.php
index 99e8d9574..671e340c5 100644
--- a/libraries/phpspreadsheet/vendor/psr/simple-cache/src/CacheInterface.php
+++ b/libraries/phpspreadsheet/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 @@ interface CacheInterface
      * @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 @@ interface CacheInterface
      * @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 @@ interface CacheInterface
      *   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 @@ interface CacheInterface
      *   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 @@ interface CacheInterface
      * @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/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
index ec5b42256..b8e655f49 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
@@ -1306,7 +1306,8 @@ final class Builders
 					'list' => $nameListCode,
 					'store' => (isset($field['store'])) ? $field['store'] : null,
 					'tab_name' => $tabName,
-					'db' => $this->normalizeDatabaseValues($nameSingleCode, $name, $databaseuniquekey, $databasekey)
+					'db' => $this->normalizeDatabaseValues($nameSingleCode, $name, $databaseuniquekey, $databasekey),
+					'link' => $this->setLinkerRelations($custom ?? [])
 				]
 			);
 		}
@@ -1360,6 +1361,37 @@ final class Builders
 		unset($db_values['ID'], $db_values['lenght'], $db_values['lenght_other'], $db_values['other']);
 
 		return $db_values;
+	}
+
+	/**
+	 * Sets the linker relations for a field based on the provided link data.
+	 *
+	 * The method determines the type of link relation based on the presence of a table.
+	 * If no table is provided, it assigns a type 2 with a null table, otherwise it assigns type 1.
+	 * It also extracts additional values from the input array, such as component, entity, value, and key.
+	 *
+	 * @param array  $link  The link data which may contain 'table', 'component', 'view', 'text', and 'id'.
+	 *
+	 * @return array|null The structured linker relation array, or null if input is an empty array.
+	 * @since 5.0.3
+	 */
+	private function setLinkerRelations(array $link): ?array
+	{
+		if ($link === [])
+		{
+			return null;
+		}
+
+		$linker = [
+			'type' => empty($link['table']) ? 2 : 1,
+			'table' => $link['table'] ?? null,
+			'component' => $link['component'] ?? null,
+			'entity' => $link['view'] ?? null,
+			'value' => $link['text'] ?? null,
+			'key' => $link['id'] ?? null
+		];
+
+		return $linker;
 	}
 }
 
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
index 2d680acb7..d3a2fa6f0 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
@@ -109,7 +109,7 @@ class Infusion extends Interpretation
 			// COMPANYNAME
 			$companyname = CFactory::_('Component')->get('companyname');
 			CFactory::_('Compiler.Builder.Content.One')->set('COMPANYNAME', trim(
-				(string) \JFilterOutput::cleanText($companyname)
+				(string) OutputFilter::cleanText($companyname)
 			));
 
 			// POWER_LIBRARY_FOLDER
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
index 059f2ebda..af809dc24 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
@@ -46,6 +46,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'name_code' => [
 				'name' => 'name_code',
@@ -62,6 +63,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'short_description' => [
 				'name' => 'short_description',
@@ -78,6 +80,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'companyname' => [
 				'name' => 'companyname',
@@ -94,6 +97,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'created' => [
 				'name' => 'created',
@@ -110,6 +114,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'crowdin_project_identifier' => [
 				'name' => 'crowdin_project_identifier',
@@ -126,6 +131,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'backup_folder_path' => [
 				'name' => 'backup_folder_path',
@@ -142,6 +148,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sql_uninstall' => [
 				'name' => 'sql_uninstall',
@@ -158,6 +165,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_update' => [
 				'name' => 'php_postflight_update',
@@ -174,6 +182,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'css_site' => [
 				'name' => 'css_site',
@@ -190,6 +199,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mvc_versiondate' => [
 				'name' => 'mvc_versiondate',
@@ -206,6 +216,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'remove_line_breaks' => [
 				'name' => 'remove_line_breaks',
@@ -222,6 +233,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_placeholders' => [
 				'name' => 'add_placeholders',
@@ -238,6 +250,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_helper_site' => [
 				'name' => 'php_helper_site',
@@ -254,6 +267,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'javascript' => [
 				'name' => 'javascript',
@@ -270,6 +284,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -286,6 +301,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'debug_linenr' => [
 				'name' => 'debug_linenr',
@@ -302,6 +318,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'author' => [
 				'name' => 'author',
@@ -318,6 +335,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_method_install' => [
 				'name' => 'php_method_install',
@@ -334,6 +352,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'email' => [
 				'name' => 'email',
@@ -350,6 +369,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'website' => [
 				'name' => 'website',
@@ -366,6 +386,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_sales_server' => [
 				'name' => 'add_sales_server',
@@ -382,6 +403,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'license' => [
 				'name' => 'license',
@@ -398,6 +420,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_jcb_powers_path' => [
 				'name' => 'add_jcb_powers_path',
@@ -414,6 +437,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'bom' => [
 				'name' => 'bom',
@@ -430,6 +454,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'image' => [
 				'name' => 'image',
@@ -446,6 +471,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_admin_event' => [
 				'name' => 'php_admin_event',
@@ -462,6 +488,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'copyright' => [
 				'name' => 'copyright',
@@ -478,6 +505,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_site_event' => [
 				'name' => 'php_site_event',
@@ -494,6 +522,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'css_admin' => [
 				'name' => 'css_admin',
@@ -510,6 +539,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_update' => [
 				'name' => 'php_preflight_update',
@@ -526,6 +556,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'component_version' => [
 				'name' => 'component_version',
@@ -542,6 +573,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_install' => [
 				'name' => 'php_preflight_install',
@@ -558,6 +590,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'preferred_joomla_version' => [
 				'name' => 'preferred_joomla_version',
@@ -574,6 +607,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_install' => [
 				'name' => 'php_postflight_install',
@@ -590,6 +624,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_powers' => [
 				'name' => 'add_powers',
@@ -606,6 +641,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_method_uninstall' => [
 				'name' => 'php_method_uninstall',
@@ -622,6 +658,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sql' => [
 				'name' => 'sql',
@@ -638,6 +675,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addreadme' => [
 				'name' => 'addreadme',
@@ -654,6 +692,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server_url' => [
 				'name' => 'update_server_url',
@@ -670,6 +709,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_backup_folder_path' => [
 				'name' => 'add_backup_folder_path',
@@ -686,6 +726,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'translation_tool' => [
 				'name' => 'translation_tool',
@@ -702,6 +743,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'crowdin_username' => [
 				'name' => 'crowdin_username',
@@ -718,6 +760,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'buildcompsql' => [
 				'name' => 'buildcompsql',
@@ -734,6 +777,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_namespace_prefix' => [
 				'name' => 'add_namespace_prefix',
@@ -750,6 +794,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'namespace_prefix' => [
 				'name' => 'namespace_prefix',
@@ -766,6 +811,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_helper_site' => [
 				'name' => 'add_php_helper_site',
@@ -782,6 +828,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_site_event' => [
 				'name' => 'add_site_event',
@@ -798,6 +845,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_menu_prefix' => [
 				'name' => 'add_menu_prefix',
@@ -814,6 +862,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript' => [
 				'name' => 'add_javascript',
@@ -830,6 +879,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'menu_prefix' => [
 				'name' => 'menu_prefix',
@@ -846,6 +896,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css_admin' => [
 				'name' => 'add_css_admin',
@@ -862,6 +913,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css_site' => [
 				'name' => 'add_css_site',
@@ -878,6 +930,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'dashboard_type' => [
 				'name' => 'dashboard_type',
@@ -894,6 +947,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'toignore' => [
 				'name' => 'toignore',
@@ -910,6 +964,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'dashboard' => [
 				'name' => 'dashboard',
@@ -926,6 +981,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_custom_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'custom_admin_view',
+					'value' => 'system_name',
+					'key' => '',
+				],
 			],
 			'add_php_preflight_install' => [
 				'name' => 'add_php_preflight_install',
@@ -942,6 +1005,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_update' => [
 				'name' => 'add_php_preflight_update',
@@ -958,6 +1022,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'export_key' => [
 				'name' => 'export_key',
@@ -974,6 +1039,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_install' => [
 				'name' => 'add_php_postflight_install',
@@ -990,6 +1056,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'joomla_source_link' => [
 				'name' => 'joomla_source_link',
@@ -1006,6 +1073,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_update' => [
 				'name' => 'add_php_postflight_update',
@@ -1022,6 +1090,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'export_buy_link' => [
 				'name' => 'export_buy_link',
@@ -1038,6 +1107,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_method_uninstall' => [
 				'name' => 'add_php_method_uninstall',
@@ -1054,6 +1124,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_method_install' => [
 				'name' => 'add_php_method_install',
@@ -1070,6 +1141,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_sql' => [
 				'name' => 'add_sql',
@@ -1086,6 +1158,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'addcontributors' => [
 				'name' => 'addcontributors',
@@ -1102,6 +1175,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_sql_uninstall' => [
 				'name' => 'add_sql_uninstall',
@@ -1118,6 +1192,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'emptycontributors' => [
 				'name' => 'emptycontributors',
@@ -1134,6 +1209,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'assets_table_fix' => [
 				'name' => 'assets_table_fix',
@@ -1150,6 +1226,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'number' => [
 				'name' => 'number',
@@ -1166,6 +1243,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'readme' => [
 				'name' => 'readme',
@@ -1182,6 +1260,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_update_server' => [
 				'name' => 'add_update_server',
@@ -1198,6 +1277,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server_target' => [
 				'name' => 'update_server_target',
@@ -1214,6 +1294,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server' => [
 				'name' => 'update_server',
@@ -1230,6 +1311,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'sales_server' => [
 				'name' => 'sales_server',
@@ -1246,6 +1335,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'creatuserhelper' => [
 				'name' => 'creatuserhelper',
@@ -1262,6 +1359,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_git_folder_path' => [
 				'name' => 'add_git_folder_path',
@@ -1278,6 +1376,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'adduikit' => [
 				'name' => 'adduikit',
@@ -1294,6 +1393,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'git_folder_path' => [
 				'name' => 'git_folder_path',
@@ -1310,6 +1410,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfootable' => [
 				'name' => 'addfootable',
@@ -1326,6 +1427,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'jcb_powers_path' => [
 				'name' => 'jcb_powers_path',
@@ -1342,6 +1444,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_email_helper' => [
 				'name' => 'add_email_helper',
@@ -1358,6 +1461,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_helper_both' => [
 				'name' => 'add_php_helper_both',
@@ -1374,6 +1478,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'crowdin_project_api_key' => [
 				'name' => 'crowdin_project_api_key',
@@ -1390,6 +1495,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_helper_both' => [
 				'name' => 'php_helper_both',
@@ -1406,6 +1512,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'crowdin_account_api_key' => [
 				'name' => 'crowdin_account_api_key',
@@ -1422,6 +1529,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_helper_admin' => [
 				'name' => 'add_php_helper_admin',
@@ -1438,6 +1546,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'buildcomp' => [
 				'name' => 'buildcomp',
@@ -1454,6 +1563,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_helper_admin' => [
 				'name' => 'php_helper_admin',
@@ -1470,6 +1580,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -1486,6 +1597,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_admin_event' => [
 				'name' => 'add_admin_event',
@@ -1502,6 +1614,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'modified' => [
 				'name' => 'modified',
@@ -1518,6 +1631,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -1534,6 +1648,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -1599,6 +1714,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'target' => [
 				'name' => 'target',
@@ -1615,6 +1731,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -1631,6 +1748,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_method_uninstall' => [
 				'name' => 'add_php_method_uninstall',
@@ -1647,6 +1765,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_update' => [
 				'name' => 'add_php_postflight_update',
@@ -1663,6 +1782,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_install' => [
 				'name' => 'add_php_postflight_install',
@@ -1679,6 +1799,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_uninstall' => [
 				'name' => 'add_php_preflight_uninstall',
@@ -1695,6 +1816,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'addreadme' => [
 				'name' => 'addreadme',
@@ -1711,6 +1833,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'default' => [
 				'name' => 'default',
@@ -1727,6 +1850,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -1743,6 +1867,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_sql' => [
 				'name' => 'add_sql',
@@ -1759,6 +1891,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server_target' => [
 				'name' => 'update_server_target',
@@ -1775,6 +1908,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_sql_uninstall' => [
 				'name' => 'add_sql_uninstall',
@@ -1791,6 +1925,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server' => [
 				'name' => 'update_server',
@@ -1807,6 +1942,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_update_server' => [
 				'name' => 'add_update_server',
@@ -1823,6 +1966,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -1839,6 +1983,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'module_version' => [
 				'name' => 'module_version',
@@ -1855,6 +2007,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sales_server' => [
 				'name' => 'sales_server',
@@ -1871,6 +2024,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'custom_get' => [
 				'name' => 'custom_get',
@@ -1887,6 +2048,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php_preflight_update' => [
 				'name' => 'php_preflight_update',
@@ -1903,6 +2072,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_uninstall' => [
 				'name' => 'php_preflight_uninstall',
@@ -1919,6 +2089,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mod_code' => [
 				'name' => 'mod_code',
@@ -1935,6 +2106,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_install' => [
 				'name' => 'php_postflight_install',
@@ -1951,6 +2123,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_class_helper' => [
 				'name' => 'add_class_helper',
@@ -1967,6 +2140,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_update' => [
 				'name' => 'php_postflight_update',
@@ -1983,6 +2157,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_class_helper_header' => [
 				'name' => 'add_class_helper_header',
@@ -1999,6 +2174,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_method_uninstall' => [
 				'name' => 'php_method_uninstall',
@@ -2015,6 +2191,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'class_helper_header' => [
 				'name' => 'class_helper_header',
@@ -2031,6 +2208,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sql' => [
 				'name' => 'sql',
@@ -2047,6 +2225,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'class_helper_code' => [
 				'name' => 'class_helper_code',
@@ -2063,6 +2242,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sql_uninstall' => [
 				'name' => 'sql_uninstall',
@@ -2079,6 +2259,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'fields' => [
 				'name' => 'fields',
@@ -2095,6 +2276,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'readme' => [
 				'name' => 'readme',
@@ -2111,6 +2293,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_script_construct' => [
 				'name' => 'add_php_script_construct',
@@ -2127,6 +2310,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'update_server_url' => [
 				'name' => 'update_server_url',
@@ -2143,6 +2327,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_script_construct' => [
 				'name' => 'php_script_construct',
@@ -2159,6 +2344,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_install' => [
 				'name' => 'add_php_preflight_install',
@@ -2175,6 +2361,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_install' => [
 				'name' => 'php_preflight_install',
@@ -2191,6 +2378,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_sales_server' => [
 				'name' => 'add_sales_server',
@@ -2207,6 +2395,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_update' => [
 				'name' => 'add_php_preflight_update',
@@ -2223,6 +2412,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -2239,6 +2429,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -2255,6 +2446,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -2287,6 +2479,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'class_extends' => [
 				'name' => 'class_extends',
@@ -2303,6 +2496,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_class_extends',
+					'component' => 'com_componentbuilder',
+					'entity' => 'class_extends',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'joomla_plugin_group' => [
 				'name' => 'joomla_plugin_group',
@@ -2319,6 +2520,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin_group',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin_group',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_sql' => [
 				'name' => 'add_sql',
@@ -2335,6 +2544,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_method_uninstall' => [
 				'name' => 'add_php_method_uninstall',
@@ -2351,6 +2561,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_update' => [
 				'name' => 'add_php_postflight_update',
@@ -2367,6 +2578,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_postflight_install' => [
 				'name' => 'add_php_postflight_install',
@@ -2383,6 +2595,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'sales_server' => [
 				'name' => 'sales_server',
@@ -2399,6 +2612,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_update_server' => [
 				'name' => 'add_update_server',
@@ -2415,6 +2636,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'method_selection' => [
 				'name' => 'method_selection',
@@ -2431,6 +2653,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'property_selection' => [
 				'name' => 'property_selection',
@@ -2447,6 +2670,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_head' => [
 				'name' => 'add_head',
@@ -2463,6 +2687,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_sql_uninstall' => [
 				'name' => 'add_sql_uninstall',
@@ -2479,6 +2704,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'addreadme' => [
 				'name' => 'addreadme',
@@ -2495,6 +2721,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'head' => [
 				'name' => 'head',
@@ -2511,6 +2738,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'update_server_target' => [
 				'name' => 'update_server_target',
@@ -2527,6 +2755,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'main_class_code' => [
 				'name' => 'main_class_code',
@@ -2543,6 +2772,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'update_server' => [
 				'name' => 'update_server',
@@ -2559,6 +2789,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_server',
+					'component' => 'com_componentbuilder',
+					'entity' => 'server',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'description' => [
 				'name' => 'description',
@@ -2575,6 +2813,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_install' => [
 				'name' => 'php_postflight_install',
@@ -2591,6 +2830,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'plugin_version' => [
 				'name' => 'plugin_version',
@@ -2607,6 +2847,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postflight_update' => [
 				'name' => 'php_postflight_update',
@@ -2623,6 +2864,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'fields' => [
 				'name' => 'fields',
@@ -2639,6 +2881,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_method_uninstall' => [
 				'name' => 'php_method_uninstall',
@@ -2655,6 +2898,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_script_construct' => [
 				'name' => 'add_php_script_construct',
@@ -2671,6 +2915,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'sql' => [
 				'name' => 'sql',
@@ -2687,6 +2932,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_script_construct' => [
 				'name' => 'php_script_construct',
@@ -2703,6 +2949,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'sql_uninstall' => [
 				'name' => 'sql_uninstall',
@@ -2719,6 +2966,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_install' => [
 				'name' => 'add_php_preflight_install',
@@ -2735,6 +2983,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'readme' => [
 				'name' => 'readme',
@@ -2751,6 +3000,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_install' => [
 				'name' => 'php_preflight_install',
@@ -2767,6 +3017,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'update_server_url' => [
 				'name' => 'update_server_url',
@@ -2783,6 +3034,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_update' => [
 				'name' => 'add_php_preflight_update',
@@ -2799,6 +3051,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_update' => [
 				'name' => 'php_preflight_update',
@@ -2815,6 +3068,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_preflight_uninstall' => [
 				'name' => 'add_php_preflight_uninstall',
@@ -2831,6 +3085,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_sales_server' => [
 				'name' => 'add_sales_server',
@@ -2847,6 +3102,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_preflight_uninstall' => [
 				'name' => 'php_preflight_uninstall',
@@ -2863,6 +3119,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -2879,6 +3136,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -2895,6 +3153,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -2927,6 +3186,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'settings' => [
 				'name' => 'settings',
@@ -2943,6 +3203,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -2959,6 +3220,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -2975,6 +3237,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -3007,6 +3270,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'namespace' => [
 				'name' => 'namespace',
@@ -3023,6 +3287,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -3039,6 +3304,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'power_version' => [
 				'name' => 'power_version',
@@ -3055,6 +3321,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'load_selection' => [
 				'name' => 'load_selection',
@@ -3071,6 +3338,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -3087,6 +3355,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'composer' => [
 				'name' => 'composer',
@@ -3103,6 +3372,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'licensing_template' => [
 				'name' => 'licensing_template',
@@ -3119,6 +3389,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'approved' => [
 				'name' => 'approved',
@@ -3135,6 +3406,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'extendsinterfaces_custom' => [
 				'name' => 'extendsinterfaces_custom',
@@ -3151,6 +3423,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_head' => [
 				'name' => 'add_head',
@@ -3167,6 +3440,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'extends' => [
 				'name' => 'extends',
@@ -3183,6 +3457,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_power',
+					'component' => 'com_componentbuilder',
+					'entity' => 'power',
+					'value' => 'name',
+					'key' => 'guid',
+				],
 			],
 			'extends_custom' => [
 				'name' => 'extends_custom',
@@ -3199,6 +3481,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'implements_custom' => [
 				'name' => 'implements_custom',
@@ -3215,6 +3498,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'implements' => [
 				'name' => 'implements',
@@ -3231,6 +3515,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_power',
+					'component' => 'com_componentbuilder',
+					'entity' => 'power',
+					'value' => 'name',
+					'key' => 'guid',
+				],
 			],
 			'property_selection' => [
 				'name' => 'property_selection',
@@ -3247,6 +3539,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'extendsinterfaces' => [
 				'name' => 'extendsinterfaces',
@@ -3263,6 +3556,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_power',
+					'component' => 'com_componentbuilder',
+					'entity' => 'power',
+					'value' => 'name',
+					'key' => 'guid',
+				],
 			],
 			'method_selection' => [
 				'name' => 'method_selection',
@@ -3279,6 +3580,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'approved_paths' => [
 				'name' => 'approved_paths',
@@ -3295,6 +3597,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 2,
+					'table' => NULL,
+					'component' => NULL,
+					'entity' => NULL,
+					'value' => NULL,
+					'key' => NULL,
+				],
 			],
 			'head' => [
 				'name' => 'head',
@@ -3311,6 +3621,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'use_selection' => [
 				'name' => 'use_selection',
@@ -3327,6 +3638,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_licensing_template' => [
 				'name' => 'add_licensing_template',
@@ -3343,6 +3655,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'main_class_code' => [
 				'name' => 'main_class_code',
@@ -3359,6 +3672,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -3375,6 +3689,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -3391,6 +3706,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -3423,6 +3739,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'name_single' => [
 				'name' => 'name_single',
@@ -3439,6 +3756,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'short_description' => [
 				'name' => 'short_description',
@@ -3455,6 +3773,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_allowedit' => [
 				'name' => 'php_allowedit',
@@ -3471,6 +3790,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_postsavehook' => [
 				'name' => 'php_postsavehook',
@@ -3487,6 +3807,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_before_save' => [
 				'name' => 'php_before_save',
@@ -3503,6 +3824,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_getlistquery' => [
 				'name' => 'php_getlistquery',
@@ -3519,6 +3841,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_import_ext' => [
 				'name' => 'php_import_ext',
@@ -3535,6 +3858,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'icon' => [
 				'name' => 'icon',
@@ -3551,6 +3875,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_after_publish' => [
 				'name' => 'php_after_publish',
@@ -3567,6 +3892,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_fadein' => [
 				'name' => 'add_fadein',
@@ -3583,6 +3909,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -3599,6 +3926,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'icon_category' => [
 				'name' => 'icon_category',
@@ -3615,6 +3943,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'icon_add' => [
 				'name' => 'icon_add',
@@ -3631,6 +3960,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_after_cancel' => [
 				'name' => 'php_after_cancel',
@@ -3647,6 +3977,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mysql_table_charset' => [
 				'name' => 'mysql_table_charset',
@@ -3663,6 +3994,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_batchmove' => [
 				'name' => 'php_batchmove',
@@ -3679,6 +4011,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -3695,6 +4028,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_after_delete' => [
 				'name' => 'php_after_delete',
@@ -3711,6 +4045,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'source' => [
 				'name' => 'source',
@@ -3727,6 +4062,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_import' => [
 				'name' => 'php_import',
@@ -3743,6 +4079,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addpermissions' => [
 				'name' => 'addpermissions',
@@ -3759,6 +4096,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_getitems_after_all' => [
 				'name' => 'php_getitems_after_all',
@@ -3775,6 +4113,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_getform' => [
 				'name' => 'php_getform',
@@ -3791,6 +4130,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addtabs' => [
 				'name' => 'addtabs',
@@ -3807,6 +4147,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_save' => [
 				'name' => 'php_save',
@@ -3823,6 +4164,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_allowadd' => [
 				'name' => 'php_allowadd',
@@ -3839,6 +4181,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_before_cancel' => [
 				'name' => 'php_before_cancel',
@@ -3855,6 +4198,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addlinked_views' => [
 				'name' => 'addlinked_views',
@@ -3871,6 +4215,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_batchcopy' => [
 				'name' => 'php_batchcopy',
@@ -3887,6 +4232,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_before_publish' => [
 				'name' => 'php_before_publish',
@@ -3903,6 +4249,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'alias_builder_type' => [
 				'name' => 'alias_builder_type',
@@ -3919,6 +4266,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_before_delete' => [
 				'name' => 'php_before_delete',
@@ -3935,6 +4283,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_document' => [
 				'name' => 'php_document',
@@ -3951,6 +4300,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mysql_table_row_format' => [
 				'name' => 'mysql_table_row_format',
@@ -3967,6 +4317,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'alias_builder' => [
 				'name' => 'alias_builder',
@@ -3983,6 +4334,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_field',
+					'component' => 'com_componentbuilder',
+					'entity' => 'field',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'sql' => [
 				'name' => 'sql',
@@ -3999,6 +4358,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_import_display' => [
 				'name' => 'php_import_display',
@@ -4015,6 +4375,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_category_submenu' => [
 				'name' => 'add_category_submenu',
@@ -4031,6 +4392,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_import_setdata' => [
 				'name' => 'php_import_setdata',
@@ -4047,6 +4409,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'name_list' => [
 				'name' => 'name_list',
@@ -4063,6 +4426,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_getlistquery' => [
 				'name' => 'add_php_getlistquery',
@@ -4079,6 +4443,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css_view' => [
 				'name' => 'add_css_view',
@@ -4095,6 +4460,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_getform' => [
 				'name' => 'add_php_getform',
@@ -4111,6 +4477,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'css_view' => [
 				'name' => 'css_view',
@@ -4127,6 +4494,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_save' => [
 				'name' => 'add_php_before_save',
@@ -4143,6 +4511,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css_views' => [
 				'name' => 'add_css_views',
@@ -4159,6 +4528,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_save' => [
 				'name' => 'add_php_save',
@@ -4175,6 +4545,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'css_views' => [
 				'name' => 'css_views',
@@ -4191,6 +4562,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_postsavehook' => [
 				'name' => 'add_php_postsavehook',
@@ -4207,6 +4579,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_view_file' => [
 				'name' => 'add_javascript_view_file',
@@ -4223,6 +4596,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_allowadd' => [
 				'name' => 'add_php_allowadd',
@@ -4239,6 +4613,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_view_file' => [
 				'name' => 'javascript_view_file',
@@ -4255,6 +4630,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_allowedit' => [
 				'name' => 'add_php_allowedit',
@@ -4271,6 +4647,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_view_footer' => [
 				'name' => 'add_javascript_view_footer',
@@ -4287,6 +4664,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_cancel' => [
 				'name' => 'add_php_before_cancel',
@@ -4303,6 +4681,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_view_footer' => [
 				'name' => 'javascript_view_footer',
@@ -4319,6 +4698,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_after_cancel' => [
 				'name' => 'add_php_after_cancel',
@@ -4335,6 +4715,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_views_file' => [
 				'name' => 'add_javascript_views_file',
@@ -4351,6 +4732,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_batchcopy' => [
 				'name' => 'add_php_batchcopy',
@@ -4367,6 +4749,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_views_file' => [
 				'name' => 'javascript_views_file',
@@ -4383,6 +4766,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_batchmove' => [
 				'name' => 'add_php_batchmove',
@@ -4399,6 +4783,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_views_footer' => [
 				'name' => 'add_javascript_views_footer',
@@ -4415,6 +4800,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_publish' => [
 				'name' => 'add_php_before_publish',
@@ -4431,6 +4817,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_views_footer' => [
 				'name' => 'javascript_views_footer',
@@ -4447,6 +4834,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_after_publish' => [
 				'name' => 'add_php_after_publish',
@@ -4463,6 +4851,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_custom_button' => [
 				'name' => 'add_custom_button',
@@ -4479,6 +4868,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_delete' => [
 				'name' => 'add_php_before_delete',
@@ -4495,6 +4885,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'custom_button' => [
 				'name' => 'custom_button',
@@ -4511,6 +4902,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_after_delete' => [
 				'name' => 'add_php_after_delete',
@@ -4527,6 +4919,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_controller' => [
 				'name' => 'php_controller',
@@ -4543,6 +4936,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_document' => [
 				'name' => 'add_php_document',
@@ -4559,6 +4953,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_model' => [
 				'name' => 'php_model',
@@ -4575,6 +4970,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mysql_table_engine' => [
 				'name' => 'mysql_table_engine',
@@ -4591,6 +4987,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_controller_list' => [
 				'name' => 'php_controller_list',
@@ -4607,6 +5004,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mysql_table_collate' => [
 				'name' => 'mysql_table_collate',
@@ -4623,6 +5021,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_model_list' => [
 				'name' => 'php_model_list',
@@ -4639,6 +5038,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_sql' => [
 				'name' => 'add_sql',
@@ -4655,6 +5055,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_ajax' => [
 				'name' => 'add_php_ajax',
@@ -4671,6 +5072,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'addtables' => [
 				'name' => 'addtables',
@@ -4687,6 +5089,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_ajaxmethod' => [
 				'name' => 'php_ajaxmethod',
@@ -4703,6 +5106,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'ajax_input' => [
 				'name' => 'ajax_input',
@@ -4719,6 +5123,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_custom_import' => [
 				'name' => 'add_custom_import',
@@ -4735,6 +5140,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_getitem' => [
 				'name' => 'add_php_getitem',
@@ -4751,6 +5157,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'html_import_view' => [
 				'name' => 'html_import_view',
@@ -4767,6 +5174,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_getitem' => [
 				'name' => 'php_getitem',
@@ -4783,6 +5191,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_import_headers' => [
 				'name' => 'php_import_headers',
@@ -4799,6 +5208,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_getitems' => [
 				'name' => 'add_php_getitems',
@@ -4815,6 +5225,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_import_save' => [
 				'name' => 'php_import_save',
@@ -4831,6 +5242,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_getitems' => [
 				'name' => 'php_getitems',
@@ -4847,6 +5259,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -4863,6 +5276,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_getitems_after_all' => [
 				'name' => 'add_php_getitems_after_all',
@@ -4879,6 +5293,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -4911,6 +5326,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -4927,6 +5343,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -4943,6 +5360,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'main_get' => [
 				'name' => 'main_get',
@@ -4959,6 +5377,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_php_jview_display' => [
 				'name' => 'add_php_jview_display',
@@ -4975,6 +5401,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'css_document' => [
 				'name' => 'css_document',
@@ -4991,6 +5418,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'css' => [
 				'name' => 'css',
@@ -5007,6 +5435,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'js_document' => [
 				'name' => 'js_document',
@@ -5023,6 +5452,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'javascript_file' => [
 				'name' => 'javascript_file',
@@ -5039,6 +5469,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'codename' => [
 				'name' => 'codename',
@@ -5055,6 +5486,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'default' => [
 				'name' => 'default',
@@ -5071,6 +5503,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -5087,6 +5520,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'icon' => [
 				'name' => 'icon',
@@ -5103,6 +5544,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_jview' => [
 				'name' => 'add_php_jview',
@@ -5119,6 +5561,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'context' => [
 				'name' => 'context',
@@ -5135,6 +5578,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_js_document' => [
 				'name' => 'add_js_document',
@@ -5151,6 +5595,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'custom_get' => [
 				'name' => 'custom_get',
@@ -5167,6 +5612,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_javascript_file' => [
 				'name' => 'add_javascript_file',
@@ -5183,6 +5636,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_ajaxmethod' => [
 				'name' => 'php_ajaxmethod',
@@ -5199,6 +5653,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_css_document' => [
 				'name' => 'add_css_document',
@@ -5215,6 +5670,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_document' => [
 				'name' => 'add_php_document',
@@ -5231,6 +5687,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css' => [
 				'name' => 'add_css',
@@ -5247,6 +5704,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_view' => [
 				'name' => 'add_php_view',
@@ -5263,6 +5721,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_ajax' => [
 				'name' => 'add_php_ajax',
@@ -5279,6 +5738,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -5295,6 +5755,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'ajax_input' => [
 				'name' => 'ajax_input',
@@ -5311,6 +5779,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'dynamic_get' => [
 				'name' => 'dynamic_get',
@@ -5327,6 +5796,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php_document' => [
 				'name' => 'php_document',
@@ -5343,6 +5820,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_view' => [
 				'name' => 'php_view',
@@ -5359,6 +5837,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_custom_button' => [
 				'name' => 'add_custom_button',
@@ -5375,6 +5854,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_jview_display' => [
 				'name' => 'php_jview_display',
@@ -5391,6 +5871,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'custom_button' => [
 				'name' => 'custom_button',
@@ -5407,6 +5888,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_jview' => [
 				'name' => 'php_jview',
@@ -5423,6 +5905,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_controller' => [
 				'name' => 'php_controller',
@@ -5439,6 +5922,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -5455,6 +5939,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_model' => [
 				'name' => 'php_model',
@@ -5471,6 +5956,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -5503,6 +5989,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'name' => [
 				'name' => 'name',
@@ -5519,6 +6006,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -5535,6 +6023,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'main_get' => [
 				'name' => 'main_get',
@@ -5551,6 +6040,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_php_jview_display' => [
 				'name' => 'add_php_jview_display',
@@ -5567,6 +6064,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_document' => [
 				'name' => 'add_php_document',
@@ -5583,6 +6081,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_view' => [
 				'name' => 'add_php_view',
@@ -5599,6 +6098,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'js_document' => [
 				'name' => 'js_document',
@@ -5615,6 +6115,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'codename' => [
 				'name' => 'codename',
@@ -5631,6 +6132,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_file' => [
 				'name' => 'javascript_file',
@@ -5647,6 +6149,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'context' => [
 				'name' => 'context',
@@ -5663,6 +6166,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'default' => [
 				'name' => 'default',
@@ -5679,6 +6183,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -5695,6 +6200,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_php_jview' => [
 				'name' => 'add_php_jview',
@@ -5711,6 +6224,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'custom_get' => [
 				'name' => 'custom_get',
@@ -5727,6 +6241,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'css_document' => [
 				'name' => 'css_document',
@@ -5743,6 +6265,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_file' => [
 				'name' => 'add_javascript_file',
@@ -5759,6 +6282,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'css' => [
 				'name' => 'css',
@@ -5775,6 +6299,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_js_document' => [
 				'name' => 'add_js_document',
@@ -5791,6 +6316,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_ajaxmethod' => [
 				'name' => 'php_ajaxmethod',
@@ -5807,6 +6333,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_css_document' => [
 				'name' => 'add_css_document',
@@ -5823,6 +6350,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -5839,6 +6367,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_css' => [
 				'name' => 'add_css',
@@ -5855,6 +6391,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'dynamic_get' => [
 				'name' => 'dynamic_get',
@@ -5871,6 +6408,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'add_php_ajax' => [
 				'name' => 'add_php_ajax',
@@ -5887,6 +6432,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'ajax_input' => [
 				'name' => 'ajax_input',
@@ -5903,6 +6449,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_custom_button' => [
 				'name' => 'add_custom_button',
@@ -5919,6 +6466,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_document' => [
 				'name' => 'php_document',
@@ -5935,6 +6483,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'button_position' => [
 				'name' => 'button_position',
@@ -5951,6 +6500,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_view' => [
 				'name' => 'php_view',
@@ -5967,6 +6517,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_jview_display' => [
 				'name' => 'php_jview_display',
@@ -5983,6 +6534,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'custom_button' => [
 				'name' => 'custom_button',
@@ -5999,6 +6551,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_jview' => [
 				'name' => 'php_jview',
@@ -6015,6 +6568,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_controller' => [
 				'name' => 'php_controller',
@@ -6031,6 +6585,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -6047,6 +6602,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_model' => [
 				'name' => 'php_model',
@@ -6063,6 +6619,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -6095,6 +6652,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -6111,6 +6669,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'dynamic_get' => [
 				'name' => 'dynamic_get',
@@ -6127,6 +6686,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php_view' => [
 				'name' => 'php_view',
@@ -6143,6 +6710,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_view' => [
 				'name' => 'add_php_view',
@@ -6159,6 +6727,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'template' => [
 				'name' => 'template',
@@ -6175,6 +6744,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -6191,6 +6761,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -6207,6 +6785,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'alias' => [
 				'name' => 'alias',
@@ -6223,6 +6809,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -6255,6 +6842,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -6271,6 +6859,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'dynamic_get' => [
 				'name' => 'dynamic_get',
@@ -6287,6 +6876,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_dynamic_get',
+					'component' => 'com_componentbuilder',
+					'entity' => 'dynamic_get',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -6303,6 +6900,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php_view' => [
 				'name' => 'php_view',
@@ -6319,6 +6924,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_view' => [
 				'name' => 'add_php_view',
@@ -6335,6 +6941,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'layout' => [
 				'name' => 'layout',
@@ -6351,6 +6958,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -6367,6 +6975,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'alias' => [
 				'name' => 'alias',
@@ -6383,6 +6999,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -6415,6 +7032,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'main_source' => [
 				'name' => 'main_source',
@@ -6431,6 +7049,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'gettype' => [
 				'name' => 'gettype',
@@ -6447,6 +7066,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_calculation' => [
 				'name' => 'php_calculation',
@@ -6463,6 +7083,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_router_parse' => [
 				'name' => 'php_router_parse',
@@ -6479,6 +7100,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_after_getitems' => [
 				'name' => 'add_php_after_getitems',
@@ -6495,6 +7117,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_router_parse' => [
 				'name' => 'add_php_router_parse',
@@ -6511,6 +7134,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'view_selection' => [
 				'name' => 'view_selection',
@@ -6527,6 +7151,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_getitems' => [
 				'name' => 'add_php_before_getitems',
@@ -6543,6 +7168,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_before_getitem' => [
 				'name' => 'add_php_before_getitem',
@@ -6559,6 +7185,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_php_after_getitem' => [
 				'name' => 'add_php_after_getitem',
@@ -6575,6 +7202,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'db_table_main' => [
 				'name' => 'db_table_main',
@@ -6591,6 +7219,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 2,
+					'table' => '',
+					'component' => '',
+					'entity' => '',
+					'value' => '',
+					'key' => '',
+				],
 			],
 			'php_custom_get' => [
 				'name' => 'php_custom_get',
@@ -6607,6 +7243,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'plugin_events' => [
 				'name' => 'plugin_events',
@@ -6623,6 +7260,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'db_selection' => [
 				'name' => 'db_selection',
@@ -6639,6 +7277,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'view_table_main' => [
 				'name' => 'view_table_main',
@@ -6655,6 +7294,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'admin_view',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'add_php_getlistquery' => [
 				'name' => 'add_php_getlistquery',
@@ -6671,6 +7318,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'join_db_table' => [
 				'name' => 'join_db_table',
@@ -6687,6 +7335,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'select_all' => [
 				'name' => 'select_all',
@@ -6703,6 +7352,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_before_getitem' => [
 				'name' => 'php_before_getitem',
@@ -6719,6 +7369,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'getcustom' => [
 				'name' => 'getcustom',
@@ -6735,6 +7386,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_after_getitem' => [
 				'name' => 'php_after_getitem',
@@ -6751,6 +7403,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'pagination' => [
 				'name' => 'pagination',
@@ -6767,6 +7420,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'php_getlistquery' => [
 				'name' => 'php_getlistquery',
@@ -6783,6 +7437,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_before_getitems' => [
 				'name' => 'php_before_getitems',
@@ -6799,6 +7454,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'filter' => [
 				'name' => 'filter',
@@ -6815,6 +7471,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_after_getitems' => [
 				'name' => 'php_after_getitems',
@@ -6831,6 +7488,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'where' => [
 				'name' => 'where',
@@ -6847,6 +7505,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'order' => [
 				'name' => 'order',
@@ -6863,6 +7522,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addcalculation' => [
 				'name' => 'addcalculation',
@@ -6879,6 +7539,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'group' => [
 				'name' => 'group',
@@ -6895,6 +7556,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'global' => [
 				'name' => 'global',
@@ -6911,6 +7573,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -6927,6 +7590,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'join_view_table' => [
 				'name' => 'join_view_table',
@@ -6943,6 +7607,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -6975,6 +7640,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'path' => [
 				'name' => 'path',
@@ -6991,6 +7664,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'target' => [
 				'name' => 'target',
@@ -7007,6 +7681,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -7023,6 +7698,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'comment_type' => [
 				'name' => 'comment_type',
@@ -7039,6 +7715,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'joomla_version' => [
 				'name' => 'joomla_version',
@@ -7055,6 +7732,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'function_name' => [
 				'name' => 'function_name',
@@ -7071,6 +7749,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'system_name' => [
 				'name' => 'system_name',
@@ -7087,6 +7766,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'code' => [
 				'name' => 'code',
@@ -7103,6 +7783,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'hashendtarget' => [
 				'name' => 'hashendtarget',
@@ -7119,6 +7800,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'to_line' => [
 				'name' => 'to_line',
@@ -7135,6 +7817,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'from_line' => [
 				'name' => 'from_line',
@@ -7151,6 +7834,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'hashtarget' => [
 				'name' => 'hashtarget',
@@ -7167,6 +7851,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7199,6 +7884,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'visibility' => [
 				'name' => 'visibility',
@@ -7215,6 +7901,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'extension_type' => [
 				'name' => 'extension_type',
@@ -7231,6 +7918,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -7247,6 +7935,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'comment' => [
 				'name' => 'comment',
@@ -7263,6 +7952,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'joomla_plugin_group' => [
 				'name' => 'joomla_plugin_group',
@@ -7279,6 +7969,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin_group',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin_group',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'default' => [
 				'name' => 'default',
@@ -7295,6 +7993,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7327,6 +8026,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'visibility' => [
 				'name' => 'visibility',
@@ -7343,6 +8043,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'extension_type' => [
 				'name' => 'extension_type',
@@ -7359,6 +8060,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -7375,6 +8077,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'code' => [
 				'name' => 'code',
@@ -7391,6 +8094,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'comment' => [
 				'name' => 'comment',
@@ -7407,6 +8111,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'joomla_plugin_group' => [
 				'name' => 'joomla_plugin_group',
@@ -7423,6 +8128,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin_group',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin_group',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'arguments' => [
 				'name' => 'arguments',
@@ -7439,6 +8152,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7471,6 +8185,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'value' => [
 				'name' => 'value',
@@ -7487,6 +8202,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7519,6 +8235,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'target' => [
 				'name' => 'target',
@@ -7535,6 +8252,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'how' => [
 				'name' => 'how',
@@ -7551,6 +8269,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 2,
+					'table' => '',
+					'component' => '',
+					'entity' => '',
+					'value' => '',
+					'key' => '',
+				],
 			],
 			'type' => [
 				'name' => 'type',
@@ -7567,6 +8293,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -7583,6 +8310,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'libraries' => [
 				'name' => 'libraries',
@@ -7599,6 +8327,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php_setdocument' => [
 				'name' => 'php_setdocument',
@@ -7615,6 +8351,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addconditions' => [
 				'name' => 'addconditions',
@@ -7631,6 +8368,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -7647,6 +8385,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7679,6 +8418,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'url' => [
 				'name' => 'url',
@@ -7695,6 +8435,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -7711,6 +8452,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_snippet_type',
+					'component' => 'com_componentbuilder',
+					'entity' => 'snippet_type',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'heading' => [
 				'name' => 'heading',
@@ -7727,6 +8476,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'library' => [
 				'name' => 'library',
@@ -7743,6 +8493,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -7759,6 +8517,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'contributor_email' => [
 				'name' => 'contributor_email',
@@ -7775,6 +8534,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'contributor_name' => [
 				'name' => 'contributor_name',
@@ -7791,6 +8551,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'contributor_website' => [
 				'name' => 'contributor_website',
@@ -7807,6 +8568,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'contributor_company' => [
 				'name' => 'contributor_company',
@@ -7823,6 +8585,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'snippet' => [
 				'name' => 'snippet',
@@ -7839,6 +8602,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'usage' => [
 				'name' => 'usage',
@@ -7855,6 +8619,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -7871,6 +8636,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7903,6 +8669,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'short_description' => [
 				'name' => 'short_description',
@@ -7919,6 +8686,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'inherit' => [
 				'name' => 'inherit',
@@ -7935,6 +8703,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_validation_rule',
+					'component' => 'com_componentbuilder',
+					'entity' => 'validation_rule',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'php' => [
 				'name' => 'php',
@@ -7951,6 +8727,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -7983,6 +8760,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'fieldtype' => [
 				'name' => 'fieldtype',
@@ -7999,6 +8777,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_fieldtype',
+					'component' => 'com_componentbuilder',
+					'entity' => 'fieldtype',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'datatype' => [
 				'name' => 'datatype',
@@ -8015,6 +8801,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'indexes' => [
 				'name' => 'indexes',
@@ -8031,6 +8818,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'null_switch' => [
 				'name' => 'null_switch',
@@ -8047,6 +8835,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'store' => [
 				'name' => 'store',
@@ -8063,6 +8852,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'catid' => [
 				'name' => 'catid',
@@ -8079,6 +8869,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'on_get_model_field' => [
 				'name' => 'on_get_model_field',
@@ -8095,6 +8886,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'on_save_model_field' => [
 				'name' => 'on_save_model_field',
@@ -8111,6 +8903,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'initiator_on_get_model' => [
 				'name' => 'initiator_on_get_model',
@@ -8127,6 +8920,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'xml' => [
 				'name' => 'xml',
@@ -8143,6 +8937,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'datalenght' => [
 				'name' => 'datalenght',
@@ -8159,6 +8954,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_view_footer' => [
 				'name' => 'javascript_view_footer',
@@ -8175,6 +8971,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'css_views' => [
 				'name' => 'css_views',
@@ -8191,6 +8988,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'css_view' => [
 				'name' => 'css_view',
@@ -8207,6 +9005,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'datadefault_other' => [
 				'name' => 'datadefault_other',
@@ -8223,6 +9022,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'datadefault' => [
 				'name' => 'datadefault',
@@ -8239,6 +9039,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'datalenght_other' => [
 				'name' => 'datalenght_other',
@@ -8255,6 +9056,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'javascript_views_footer' => [
 				'name' => 'javascript_views_footer',
@@ -8271,6 +9073,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'add_css_view' => [
 				'name' => 'add_css_view',
@@ -8287,6 +9090,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_css_views' => [
 				'name' => 'add_css_views',
@@ -8303,6 +9107,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_view_footer' => [
 				'name' => 'add_javascript_view_footer',
@@ -8319,6 +9124,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'add_javascript_views_footer' => [
 				'name' => 'add_javascript_views_footer',
@@ -8335,6 +9141,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'initiator_on_save_model' => [
 				'name' => 'initiator_on_save_model',
@@ -8351,6 +9158,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -8367,6 +9175,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -8399,6 +9208,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'store' => [
 				'name' => 'store',
@@ -8415,6 +9225,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'null_switch' => [
 				'name' => 'null_switch',
@@ -8431,6 +9242,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'indexes' => [
 				'name' => 'indexes',
@@ -8447,6 +9259,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'datadefault_other' => [
 				'name' => 'datadefault_other',
@@ -8463,6 +9276,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'datadefault' => [
 				'name' => 'datadefault',
@@ -8479,6 +9293,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'short_description' => [
 				'name' => 'short_description',
@@ -8495,6 +9310,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'datatype' => [
 				'name' => 'datatype',
@@ -8511,6 +9327,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'has_defaults' => [
 				'name' => 'has_defaults',
@@ -8527,6 +9344,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'properties' => [
 				'name' => 'properties',
@@ -8543,6 +9361,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -8559,6 +9378,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'datalenght' => [
 				'name' => 'datalenght',
@@ -8575,6 +9395,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'datalenght_other' => [
 				'name' => 'datalenght_other',
@@ -8591,6 +9412,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -8607,6 +9429,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'catid' => [
 				'name' => 'catid',
@@ -8623,6 +9446,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -8655,6 +9479,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'plugins' => [
 				'name' => 'plugins',
@@ -8671,6 +9496,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'modules' => [
 				'name' => 'modules',
@@ -8687,6 +9520,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_module',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_module',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'components' => [
 				'name' => 'components',
@@ -8703,6 +9544,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'translation' => [
 				'name' => 'translation',
@@ -8719,6 +9568,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -8751,6 +9601,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'langtag' => [
 				'name' => 'langtag',
@@ -8767,6 +9618,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -8799,6 +9651,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'protocol' => [
 				'name' => 'protocol',
@@ -8815,6 +9668,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'signature' => [
 				'name' => 'signature',
@@ -8831,6 +9685,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'private_key' => [
 				'name' => 'private_key',
@@ -8847,6 +9702,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'secret' => [
 				'name' => 'secret',
@@ -8863,6 +9719,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'password' => [
 				'name' => 'password',
@@ -8879,6 +9736,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'private' => [
 				'name' => 'private',
@@ -8895,6 +9753,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'authentication' => [
 				'name' => 'authentication',
@@ -8911,6 +9770,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'path' => [
 				'name' => 'path',
@@ -8927,6 +9787,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'port' => [
 				'name' => 'port',
@@ -8943,6 +9804,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'host' => [
 				'name' => 'host',
@@ -8959,6 +9821,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'username' => [
 				'name' => 'username',
@@ -8975,6 +9838,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9007,6 +9871,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'organisation' => [
 				'name' => 'organisation',
@@ -9023,6 +9888,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'repository' => [
 				'name' => 'repository',
@@ -9039,6 +9905,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'target' => [
 				'name' => 'target',
@@ -9055,6 +9922,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -9071,6 +9939,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'base' => [
 				'name' => 'base',
@@ -9087,6 +9956,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'guid' => [
 				'name' => 'guid',
@@ -9103,6 +9973,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'addplaceholders' => [
 				'name' => 'addplaceholders',
@@ -9119,6 +9990,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access_repo' => [
 				'name' => 'access_repo',
@@ -9135,6 +10007,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'write_branch' => [
 				'name' => 'write_branch',
@@ -9151,6 +10024,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'read_branch' => [
 				'name' => 'read_branch',
@@ -9167,6 +10041,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'token' => [
 				'name' => 'token',
@@ -9183,6 +10058,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'username' => [
 				'name' => 'username',
@@ -9199,6 +10075,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9231,6 +10108,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'type' => [
 				'name' => 'type',
@@ -9247,6 +10125,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'groups' => [
 				'name' => 'groups',
@@ -9263,6 +10142,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'location' => [
 				'name' => 'location',
@@ -9279,6 +10159,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'admin_view' => [
 				'name' => 'admin_view',
@@ -9295,6 +10176,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 2,
+					'table' => '',
+					'component' => '',
+					'entity' => '',
+					'value' => '',
+					'key' => '',
+				],
 			],
 			'site_view' => [
 				'name' => 'site_view',
@@ -9311,6 +10200,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => [
+					'type' => 2,
+					'table' => '',
+					'component' => '',
+					'entity' => '',
+					'value' => '',
+					'key' => '',
+				],
 			],
 			'alias' => [
 				'name' => 'alias',
@@ -9327,6 +10224,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'content' => [
 				'name' => 'content',
@@ -9343,6 +10241,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'article' => [
 				'name' => 'article',
@@ -9359,6 +10258,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__content',
+					'component' => 'com_content',
+					'entity' => 'article',
+					'value' => 'title',
+					'key' => 'id',
+				],
 			],
 			'url' => [
 				'name' => 'url',
@@ -9375,6 +10282,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'target' => [
 				'name' => 'target',
@@ -9391,6 +10299,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 		],
 		'admin_fields' => [
@@ -9409,6 +10318,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'admin_view',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addfields' => [
 				'name' => 'addfields',
@@ -9425,6 +10342,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9457,6 +10375,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'admin_view',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addconditions' => [
 				'name' => 'addconditions',
@@ -9473,6 +10399,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9505,6 +10432,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'admin_view',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addrelations' => [
 				'name' => 'addrelations',
@@ -9521,6 +10456,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9553,6 +10489,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_admin_view',
+					'component' => 'com_componentbuilder',
+					'entity' => 'admin_view',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'tabs' => [
 				'name' => 'tabs',
@@ -9569,6 +10513,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9601,6 +10546,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addadmin_views' => [
 				'name' => 'addadmin_views',
@@ -9617,6 +10570,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9649,6 +10603,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addsite_views' => [
 				'name' => 'addsite_views',
@@ -9665,6 +10627,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9697,6 +10660,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addcustom_admin_views' => [
 				'name' => 'addcustom_admin_views',
@@ -9713,6 +10684,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9745,6 +10717,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'version_update' => [
 				'name' => 'version_update',
@@ -9761,6 +10741,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9793,6 +10774,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'sql_tweak' => [
 				'name' => 'sql_tweak',
@@ -9809,6 +10798,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9841,6 +10831,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addcustommenus' => [
 				'name' => 'addcustommenus',
@@ -9857,6 +10855,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -9889,6 +10888,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'mode_constructor_before_parent' => [
 				'name' => 'mode_constructor_before_parent',
@@ -9905,6 +10912,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mode_constructor_after_parent' => [
 				'name' => 'mode_constructor_after_parent',
@@ -9921,6 +10929,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'mode_methods' => [
 				'name' => 'mode_methods',
@@ -9937,6 +10946,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'methods_code' => [
 				'name' => 'methods_code',
@@ -9953,6 +10963,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'constructor_after_parent_code' => [
 				'name' => 'constructor_after_parent_code',
@@ -9969,6 +10980,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'constructor_before_parent_manual' => [
 				'name' => 'constructor_before_parent_manual',
@@ -9985,6 +10997,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'constructor_before_parent_code' => [
 				'name' => 'constructor_before_parent_code',
@@ -10001,6 +11014,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10033,6 +11047,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addconfig' => [
 				'name' => 'addconfig',
@@ -10049,6 +11071,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10081,6 +11104,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'dashboard_tab' => [
 				'name' => 'dashboard_tab',
@@ -10097,6 +11128,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'php_dashboard_methods' => [
 				'name' => 'php_dashboard_methods',
@@ -10113,6 +11145,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10145,6 +11178,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
@@ -10161,6 +11202,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfilesfullpath' => [
 				'name' => 'addfilesfullpath',
@@ -10177,6 +11219,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfolders' => [
 				'name' => 'addfolders',
@@ -10193,6 +11236,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfiles' => [
 				'name' => 'addfiles',
@@ -10209,6 +11253,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10241,6 +11286,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addplaceholders' => [
 				'name' => 'addplaceholders',
@@ -10257,6 +11310,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10289,6 +11343,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addjoomla_plugins' => [
 				'name' => 'addjoomla_plugins',
@@ -10305,6 +11367,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10337,6 +11400,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_component',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_component',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addjoomla_modules' => [
 				'name' => 'addjoomla_modules',
@@ -10353,6 +11424,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10385,6 +11457,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'description' => [
 				'name' => 'description',
@@ -10401,6 +11474,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10433,6 +11507,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'addconfig' => [
 				'name' => 'addconfig',
@@ -10449,6 +11531,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10481,6 +11564,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_library',
+					'component' => 'com_componentbuilder',
+					'entity' => 'library',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
@@ -10497,6 +11588,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfilesfullpath' => [
 				'name' => 'addfilesfullpath',
@@ -10513,6 +11605,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfolders' => [
 				'name' => 'addfolders',
@@ -10529,6 +11622,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfiles' => [
 				'name' => 'addfiles',
@@ -10545,6 +11639,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addurls' => [
 				'name' => 'addurls',
@@ -10561,6 +11656,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10593,6 +11689,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'extension_type' => [
 				'name' => 'extension_type',
@@ -10609,6 +11706,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'head' => [
 				'name' => 'head',
@@ -10625,6 +11723,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'comment' => [
 				'name' => 'comment',
@@ -10641,6 +11740,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10673,6 +11773,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_module',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_module',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'version_update' => [
 				'name' => 'version_update',
@@ -10689,6 +11797,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10721,6 +11830,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_module',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_module',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
@@ -10737,6 +11854,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfilesfullpath' => [
 				'name' => 'addfilesfullpath',
@@ -10753,6 +11871,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfolders' => [
 				'name' => 'addfolders',
@@ -10769,6 +11888,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfiles' => [
 				'name' => 'addfiles',
@@ -10785,6 +11905,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addurls' => [
 				'name' => 'addurls',
@@ -10801,6 +11922,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10833,6 +11955,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => NULL,
 			],
 			'class_extends' => [
 				'name' => 'class_extends',
@@ -10849,6 +11972,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_class_extends',
+					'component' => 'com_componentbuilder',
+					'entity' => 'class_extends',
+					'value' => 'name',
+					'key' => 'id',
+				],
 			],
 			'access' => [
 				'name' => 'access',
@@ -10881,6 +12012,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'version_update' => [
 				'name' => 'version_update',
@@ -10897,6 +12036,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
@@ -10929,6 +12069,14 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => true,
 				],
+				'link' => [
+					'type' => 1,
+					'table' => '#__componentbuilder_joomla_plugin',
+					'component' => 'com_componentbuilder',
+					'entity' => 'joomla_plugin',
+					'value' => 'system_name',
+					'key' => 'id',
+				],
 			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
@@ -10945,6 +12093,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfilesfullpath' => [
 				'name' => 'addfilesfullpath',
@@ -10961,6 +12110,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfolders' => [
 				'name' => 'addfolders',
@@ -10977,6 +12127,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addfiles' => [
 				'name' => 'addfiles',
@@ -10993,6 +12144,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'addurls' => [
 				'name' => 'addurls',
@@ -11009,6 +12161,7 @@ final class Table extends BaseTable implements Tableinterface
 					'unique_key' => false,
 					'key' => false,
 				],
+				'link' => NULL,
 			],
 			'access' => [
 				'name' => 'access',
diff --git a/media/js/admin_fields_relations.js b/media/js/admin_fields_relations.js
index 957ab6c2d..aecf9b115 100644
--- a/media/js/admin_fields_relations.js
+++ b/media/js/admin_fields_relations.js
@@ -109,12 +109,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/admin_view.js b/media/js/admin_view.js
index 7493d3eb5..0653e57db 100644
--- a/media/js/admin_view.js
+++ b/media/js/admin_view.js
@@ -1002,12 +1002,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/class_extends.js b/media/js/class_extends.js
index 10c2e2aa3..fa2f080a1 100644
--- a/media/js/class_extends.js
+++ b/media/js/class_extends.js
@@ -55,12 +55,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/class_method.js b/media/js/class_method.js
index 6de104cf7..74f5ba652 100644
--- a/media/js/class_method.js
+++ b/media/js/class_method.js
@@ -170,12 +170,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/class_property.js b/media/js/class_property.js
index cb1ee0d74..f3324332b 100644
--- a/media/js/class_property.js
+++ b/media/js/class_property.js
@@ -170,12 +170,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/component_dashboard.js b/media/js/component_dashboard.js
index cfa526706..dbc2ab8e2 100644
--- a/media/js/component_dashboard.js
+++ b/media/js/component_dashboard.js
@@ -53,12 +53,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/component_router.js b/media/js/component_router.js
index ecd8d798e..6c610be21 100644
--- a/media/js/component_router.js
+++ b/media/js/component_router.js
@@ -52,12 +52,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/custom_admin_view.js b/media/js/custom_admin_view.js
index 70e7f7680..b51dad6a0 100644
--- a/media/js/custom_admin_view.js
+++ b/media/js/custom_admin_view.js
@@ -275,69 +275,99 @@ function getSnippetDetails(id){
 	})
 }
 
-function getDynamicValues_server(dynamicId){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
-	if(token.length > 0 && dynamicId > 0){
-		var request = token+'=1&view=custom_admin_view&id='+dynamicId;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getDynamicValuesServer(dynamicId) {
+    var getUrl = 'index.php?option=com_componentbuilder&task=ajax.getDynamicValues&raw=true&format=json';
+    if (token.length > 0 && dynamicId > 0) {
+        var request = token + '=1&view=custom_admin_view&id=' + dynamicId;
+    }
+
+    return fetch(getUrl + '&' + request, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        }
+    })
+    .then(response => response.json());
 }
 
-function getDynamicValues(id){
-	getDynamicValues_server(id).done(function(result) {
-		if(result){
-			jQuery('#dynamic_values').remove();
-			jQuery('.dynamic_values').append('<div id="dynamic_values">'+result+'</div>');
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getDynamicValues(id) {
+    getDynamicValuesServer(id).then(function(result) {
+        if (result) {
+            var dynamicValuesElement = document.getElementById('dynamic_values');
+            if (dynamicValuesElement) {
+                dynamicValuesElement.remove();
+            }
+            document.querySelector('.dynamic_values').insertAdjacentHTML('beforeend', '<div id="dynamic_values">' + result + '</div>');
+
+            // Event listener for code blocks
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText(); // Call the custom selText function
+                    codeBlock.classList.add("selected");  // Add the "selected" class
+                });
+            });
+        }
+    }).catch(function(error) {
+        console.error('Error fetching dynamic values:', error);
+    });
 }
 
-function getLayoutDetails_server(id){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
-	if(token.length > 0 && id > 0){
-		var request = token+'=1&id='+id;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getLayoutDetails_server(id) {
+    var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&raw=true&vdm=" + vastDevMod);
+    var request = '';
+
+    // Ensure token and id are present
+    if (token.length > 0 && id > 0) {
+        request = token + '=1&id=' + id;
+    }
+
+    // Return a fetch promise (fetch does not support JSONP, so I assume the server can return JSON)
+    return fetch(getUrl + '&' + request, {
+        method: 'GET'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw new Error("Network response was not ok");
+        }
+        return response.json();  // Assuming the server returns JSON
+    });
 }
 
-function getLayoutDetails(id){
-	getLayoutDetails_server(id).done(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getLayoutDetails(id) {
+    getLayoutDetails_server(id)
+        .then(function(result) {
+            if (result) {
+                document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+                // Re-enable code block text selection functionality
+                document.querySelectorAll("code").forEach(function(codeBlock) {
+                    codeBlock.addEventListener("click", function() {
+                        codeBlock.selText();
+                        codeBlock.classList.add("selected");
+                    });
+                });
+            }
+        })
+        .catch(function(error) {
+            console.error('There was a problem with the fetch operation:', error);
+        });
 }
+
 
-function getTemplateDetails(id){
-	getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getTemplateDetails(id) {
+    getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
+        if (result) {
+            document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+            // Re-enable code block text selection functionality
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText();
+                    codeBlock.classList.add("selected");
+                });
+            });
+        }
+    });
 }
 
 // set snippets that are on the page
@@ -435,12 +465,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/custom_code.js b/media/js/custom_code.js
index 05d0e7042..d30b90f9b 100644
--- a/media/js/custom_code.js
+++ b/media/js/custom_code.js
@@ -408,12 +408,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/dynamic_get.js b/media/js/dynamic_get.js
index 4eec15136..c55cce8fc 100644
--- a/media/js/dynamic_get.js
+++ b/media/js/dynamic_get.js
@@ -1645,12 +1645,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/field.js b/media/js/field.js
index 3f38ea299..fa600a841 100644
--- a/media/js/field.js
+++ b/media/js/field.js
@@ -854,12 +854,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/fieldtype.js b/media/js/fieldtype.js
index de208b2ce..e37647ed8 100644
--- a/media/js/fieldtype.js
+++ b/media/js/fieldtype.js
@@ -940,12 +940,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/joomla_component.js b/media/js/joomla_component.js
index edd73ce0e..70d118f8b 100644
--- a/media/js/joomla_component.js
+++ b/media/js/joomla_component.js
@@ -544,12 +544,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/joomla_module.js b/media/js/joomla_module.js
index 4523b29a9..7e91c44e3 100644
--- a/media/js/joomla_module.js
+++ b/media/js/joomla_module.js
@@ -388,12 +388,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/joomla_plugin.js b/media/js/joomla_plugin.js
index 0b6c1edf7..d688257db 100644
--- a/media/js/joomla_plugin.js
+++ b/media/js/joomla_plugin.js
@@ -746,12 +746,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/layout.js b/media/js/layout.js
index a35dcccc1..ae1faecc8 100644
--- a/media/js/layout.js
+++ b/media/js/layout.js
@@ -39,8 +39,7 @@ function isSet(val)
 }
 
 
-jQuery(document).ready(function($)
-{
+document.addEventListener("DOMContentLoaded", function() {
 	// check and load all the custom code edit buttons
 	getEditCustomCodeButtons();
 });
@@ -105,12 +104,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
@@ -154,58 +157,84 @@ function getSnippetDetails(id){
 	})
 }
 
-function getDynamicValues_server(dynamicId){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
-	if(token.length > 0 && dynamicId > 0){
-		var request = token+'=1&view=layout&id='+dynamicId;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getDynamicValuesServer(dynamicId) {
+    var getUrl = 'index.php?option=com_componentbuilder&task=ajax.getDynamicValues&raw=true&format=json';
+    if (token.length > 0 && dynamicId > 0) {
+        var request = token + '=1&view=layout&id=' + dynamicId;
+    }
+
+    return fetch(getUrl + '&' + request, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        }
+    })
+    .then(response => response.json());
 }
 
-function getDynamicValues(id){
-	getDynamicValues_server(id).done(function(result) {
-		if(result){
-			jQuery('#dynamic_values').remove();
-			jQuery('.dynamic_values').append('<div id="dynamic_values">'+result+'</div>');
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getDynamicValues(id) {
+    getDynamicValuesServer(id).then(function(result) {
+        if (result) {
+            var dynamicValuesElement = document.getElementById('dynamic_values');
+            if (dynamicValuesElement) {
+                dynamicValuesElement.remove();
+            }
+            document.querySelector('.dynamic_values').insertAdjacentHTML('beforeend', '<div id="dynamic_values">' + result + '</div>');
+
+            // Event listener for code blocks
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText(); // Call the custom selText function
+                    codeBlock.classList.add("selected");  // Add the "selected" class
+                });
+            });
+        }
+    }).catch(function(error) {
+        console.error('Error fetching dynamic values:', error);
+    });
 }
 
-function getLayoutDetails_server(id){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
-	if(token.length > 0 && id > 0){
-		var request = token+'=1&id='+id;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getLayoutDetails_server(id) {
+    var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&raw=true&vdm=" + vastDevMod);
+    var request = '';
+
+    // Ensure token and id are present
+    if (token.length > 0 && id > 0) {
+        request = token + '=1&id=' + id;
+    }
+
+    // Return a fetch promise (fetch does not support JSONP, so I assume the server can return JSON)
+    return fetch(getUrl + '&' + request, {
+        method: 'GET'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw new Error("Network response was not ok");
+        }
+        return response.json();  // Assuming the server returns JSON
+    });
 }
 
-function getLayoutDetails(id){
-	getLayoutDetails_server(id).done(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getLayoutDetails(id) {
+    getLayoutDetails_server(id)
+        .then(function(result) {
+            if (result) {
+                document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+                // Re-enable code block text selection functionality
+                document.querySelectorAll("code").forEach(function(codeBlock) {
+                    codeBlock.addEventListener("click", function() {
+                        codeBlock.selText();
+                        codeBlock.classList.add("selected");
+                    });
+                });
+            }
+        })
+        .catch(function(error) {
+            console.error('There was a problem with the fetch operation:', error);
+        });
 }
+
 
 // set snippets that are on the page
 var snippetIds = [];
diff --git a/media/js/library.js b/media/js/library.js
index e17fd0e41..90221eba5 100644
--- a/media/js/library.js
+++ b/media/js/library.js
@@ -947,12 +947,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/power.js b/media/js/power.js
index a38940b6f..9328819ae 100644
--- a/media/js/power.js
+++ b/media/js/power.js
@@ -510,12 +510,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/site_view.js b/media/js/site_view.js
index dc8ab7eca..ab4b68d52 100644
--- a/media/js/site_view.js
+++ b/media/js/site_view.js
@@ -316,69 +316,99 @@ function getSnippetDetails(id){
 	})
 }
 
-function getDynamicValues_server(dynamicId){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
-	if(token.length > 0 && dynamicId > 0){
-		var request = token+'=1&view=site_view&id='+dynamicId;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getDynamicValuesServer(dynamicId) {
+    var getUrl = 'index.php?option=com_componentbuilder&task=ajax.getDynamicValues&raw=true&format=json';
+    if (token.length > 0 && dynamicId > 0) {
+        var request = token + '=1&view=site_view&id=' + dynamicId;
+    }
+
+    return fetch(getUrl + '&' + request, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        }
+    })
+    .then(response => response.json());
 }
 
-function getDynamicValues(id){
-	getDynamicValues_server(id).done(function(result) {
-		if(result){
-			jQuery('#dynamic_values').remove();
-			jQuery('.dynamic_values').append('<div id="dynamic_values">'+result+'</div>');
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getDynamicValues(id) {
+    getDynamicValuesServer(id).then(function(result) {
+        if (result) {
+            var dynamicValuesElement = document.getElementById('dynamic_values');
+            if (dynamicValuesElement) {
+                dynamicValuesElement.remove();
+            }
+            document.querySelector('.dynamic_values').insertAdjacentHTML('beforeend', '<div id="dynamic_values">' + result + '</div>');
+
+            // Event listener for code blocks
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText(); // Call the custom selText function
+                    codeBlock.classList.add("selected");  // Add the "selected" class
+                });
+            });
+        }
+    }).catch(function(error) {
+        console.error('Error fetching dynamic values:', error);
+    });
 }
 
-function getLayoutDetails_server(id){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
-	if(token.length > 0 && id > 0){
-		var request = token+'=1&id='+id;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getLayoutDetails_server(id) {
+    var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&raw=true&vdm=" + vastDevMod);
+    var request = '';
+
+    // Ensure token and id are present
+    if (token.length > 0 && id > 0) {
+        request = token + '=1&id=' + id;
+    }
+
+    // Return a fetch promise (fetch does not support JSONP, so I assume the server can return JSON)
+    return fetch(getUrl + '&' + request, {
+        method: 'GET'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw new Error("Network response was not ok");
+        }
+        return response.json();  // Assuming the server returns JSON
+    });
 }
 
-function getLayoutDetails(id){
-	getLayoutDetails_server(id).done(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getLayoutDetails(id) {
+    getLayoutDetails_server(id)
+        .then(function(result) {
+            if (result) {
+                document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+                // Re-enable code block text selection functionality
+                document.querySelectorAll("code").forEach(function(codeBlock) {
+                    codeBlock.addEventListener("click", function() {
+                        codeBlock.selText();
+                        codeBlock.classList.add("selected");
+                    });
+                });
+            }
+        })
+        .catch(function(error) {
+            console.error('There was a problem with the fetch operation:', error);
+        });
 }
+
 
-function getTemplateDetails(id){
-	getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getTemplateDetails(id) {
+    getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
+        if (result) {
+            document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+            // Re-enable code block text selection functionality
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText();
+                    codeBlock.classList.add("selected");
+                });
+            });
+        }
+    });
 }
 
 // set snippets that are on the page
@@ -476,12 +506,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/media/js/template.js b/media/js/template.js
index a0e567fec..0767d20d9 100644
--- a/media/js/template.js
+++ b/media/js/template.js
@@ -39,8 +39,7 @@ function isSet(val)
 }
 
 
-jQuery(document).ready(function($)
-{
+document.addEventListener("DOMContentLoaded", function() {
 	// check and load all the custom code edit buttons
 	getEditCustomCodeButtons();
 });
@@ -105,12 +104,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
@@ -154,69 +157,99 @@ function getSnippetDetails(id){
 	})
 }
 
-function getDynamicValues_server(dynamicId){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json");
-	if(token.length > 0 && dynamicId > 0){
-		var request = token+'=1&view=template&id='+dynamicId;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getDynamicValuesServer(dynamicId) {
+    var getUrl = 'index.php?option=com_componentbuilder&task=ajax.getDynamicValues&raw=true&format=json';
+    if (token.length > 0 && dynamicId > 0) {
+        var request = token + '=1&view=template&id=' + dynamicId;
+    }
+
+    return fetch(getUrl + '&' + request, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        }
+    })
+    .then(response => response.json());
 }
 
-function getDynamicValues(id){
-	getDynamicValues_server(id).done(function(result) {
-		if(result){
-			jQuery('#dynamic_values').remove();
-			jQuery('.dynamic_values').append('<div id="dynamic_values">'+result+'</div>');
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getDynamicValues(id) {
+    getDynamicValuesServer(id).then(function(result) {
+        if (result) {
+            var dynamicValuesElement = document.getElementById('dynamic_values');
+            if (dynamicValuesElement) {
+                dynamicValuesElement.remove();
+            }
+            document.querySelector('.dynamic_values').insertAdjacentHTML('beforeend', '<div id="dynamic_values">' + result + '</div>');
+
+            // Event listener for code blocks
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText(); // Call the custom selText function
+                    codeBlock.classList.add("selected");  // Add the "selected" class
+                });
+            });
+        }
+    }).catch(function(error) {
+        console.error('Error fetching dynamic values:', error);
+    });
 }
 
-function getLayoutDetails_server(id){
-	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod);
-	if(token.length > 0 && id > 0){
-		var request = token+'=1&id='+id;
-	}
-	return jQuery.ajax({
-		type: 'GET',
-		url: getUrl,
-		dataType: 'jsonp',
-		data: request,
-		jsonp: 'callback'
-	});
+function getLayoutDetails_server(id) {
+    var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&raw=true&vdm=" + vastDevMod);
+    var request = '';
+
+    // Ensure token and id are present
+    if (token.length > 0 && id > 0) {
+        request = token + '=1&id=' + id;
+    }
+
+    // Return a fetch promise (fetch does not support JSONP, so I assume the server can return JSON)
+    return fetch(getUrl + '&' + request, {
+        method: 'GET'
+    })
+    .then(function(response) {
+        if (!response.ok) {
+            throw new Error("Network response was not ok");
+        }
+        return response.json();  // Assuming the server returns JSON
+    });
 }
 
-function getLayoutDetails(id){
-	getLayoutDetails_server(id).done(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getLayoutDetails(id) {
+    getLayoutDetails_server(id)
+        .then(function(result) {
+            if (result) {
+                document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+                // Re-enable code block text selection functionality
+                document.querySelectorAll("code").forEach(function(codeBlock) {
+                    codeBlock.addEventListener("click", function() {
+                        codeBlock.selText();
+                        codeBlock.classList.add("selected");
+                    });
+                });
+            }
+        })
+        .catch(function(error) {
+            console.error('There was a problem with the fetch operation:', error);
+        });
 }
+
 
-function getTemplateDetails(id){
-	getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
-		if(result){
-			jQuery('#details').append(result);
-			// make sure the code bocks are active
-			jQuery("code").click(function() {
-				jQuery(this).selText().addClass("selected");
-			});
-		}
-	})
+function getTemplateDetails(id) {
+    getCodeFrom_server(id, 'type', 'type', 'templateDetails').then(function(result) {
+        if (result) {
+            document.querySelector('#details').insertAdjacentHTML('beforeend', result);
+
+            // Re-enable code block text selection functionality
+            document.querySelectorAll("code").forEach(function(codeBlock) {
+                codeBlock.addEventListener("click", function() {
+                    codeBlock.selText();
+                    codeBlock.classList.add("selected");
+                });
+            });
+        }
+    });
 }
 
 // set snippets that are on the page
diff --git a/media/js/validation_rule.js b/media/js/validation_rule.js
index 252b004ad..ed7f31183 100644
--- a/media/js/validation_rule.js
+++ b/media/js/validation_rule.js
@@ -133,12 +133,16 @@ function getEditCustomCodeButtons() {
 
 				// Insert the div before .control-wrapper-{field}
 				const insertBeforeElement = document.querySelector(".control-wrapper-"+field);
-				insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				if (insertBeforeElement) {
+					insertBeforeElement.parentNode.insertBefore(div, insertBeforeElement);
+				}
 
 				// Adding buttons to the div
 				Object.entries(buttons).forEach(([name, button]) => {
 					const controlsDiv = document.querySelector(".control-customcode-buttons-"+field);
-					controlsDiv.innerHTML += button;
+					if (controlsDiv) {
+						controlsDiv.innerHTML += button;
+					}
 				});
 			});
 		}
diff --git a/script.php b/script.php
index ebbe805fd..ac972ba7f 100644
--- a/script.php
+++ b/script.php
@@ -6372,9 +6372,9 @@ class Com_ComponentbuilderInstallerScript
 				{
 					// check if this install has the wiki file (just remove it)
 					$wiki_menu = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/wiki_menu.txt';
-					if (JFile::exists($wiki_menu))
+					if (is_file($wiki_menu))
 					{
-						JFile::delete($wiki_menu);
+						File::delete($wiki_menu);
 					}
 				}
 				// target version less then or equal to 2.11.2
@@ -9969,7 +9969,7 @@ class Com_ComponentbuilderInstallerScript
 			}
 			// check if this install has the libraries in the helper folder, if so remove it
 			$vendorPath = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/vendor';
-			if (\JFolder::exists($vendorPath))
+			if (is_dir($vendorPath))
 			{
 				ComponentbuilderHelper::removeFolder($vendorPath);
 				// set a notice that this was done
@@ -9977,7 +9977,7 @@ class Com_ComponentbuilderInstallerScript
 			}
 			// check if this install has the libraries in the helper folder, if so remove it
 			$vendorPath = JPATH_ROOT . '/libraries/vdm_io';
-			if (\JFolder::exists($vendorPath))
+			if (is_dir($vendorPath))
 			{
 				ComponentbuilderHelper::removeFolder($vendorPath);
 				// set a notice that this was done
@@ -9985,7 +9985,7 @@ class Com_ComponentbuilderInstallerScript
 			}
 			// check if we still have the old Gitea Classes
 			$giteaPath = JPATH_ROOT . '/libraries/jcb_powers/VDM.Gitea';
-			if (\JFolder::exists($giteaPath))
+			if (is_dir($giteaPath))
 			{
 				ComponentbuilderHelper::removeFolder($giteaPath);
 				// set a notice that this was done
@@ -10001,7 +10001,7 @@ class Com_ComponentbuilderInstallerScript
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 3.2.5-alpha1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.2.5-alpha2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))
diff --git a/site/models/api.php b/site/models/api.php
index 713a4c3f4..c57210a44 100644
--- a/site/models/api.php
+++ b/site/models/api.php
@@ -24,6 +24,7 @@ use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\GetHelper;
+use Joomla\CMS\Filesystem\File;
 
 /**
  * Componentbuilder Api Item Model
@@ -251,7 +252,7 @@ class ComponentbuilderModelApi extends ItemModel
 						$config = Factory::getConfig();
 						$package = $config->get('tmp_path') . '/' . $this->compiler->componentFolderName.'.zip';
 						// just remove from temp
-						if (JFile::delete($package) && !is_file($package))
+						if (File::delete($package) && !is_file($package))
 						{
 							// component was installed
 							$this->messages[] = Text::sprintf('COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_BY_YOUR_REQUEST_AND_IS_ALSO_REMOVED_FROM_TEMP_FOLDER', $this->compiler->componentFolderName);