From 81c72cf97bb10ba97891ca3f724997fd126425e3 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Fri, 12 Jun 2026 15:44:20 +0300 Subject: [PATCH] Fixed deprecation warnings --- install/core/Installer.php | 7 +++++-- install/vendor/smarty/demo/plugins/resource.extendsall.php | 2 +- .../vendor/smarty/libs/sysplugins/smarty_cacheresource.php | 2 +- .../smarty/libs/sysplugins/smarty_cacheresource_custom.php | 2 +- .../libs/sysplugins/smarty_cacheresource_keyvaluestore.php | 2 +- .../libs/sysplugins/smarty_internal_cacheresource_file.php | 2 +- .../libs/sysplugins/smarty_internal_resource_eval.php | 2 +- .../libs/sysplugins/smarty_internal_resource_extends.php | 2 +- .../libs/sysplugins/smarty_internal_resource_file.php | 2 +- .../libs/sysplugins/smarty_internal_resource_php.php | 2 +- .../sysplugins/smarty_internal_resource_registered.php | 2 +- .../libs/sysplugins/smarty_internal_resource_stream.php | 2 +- .../libs/sysplugins/smarty_internal_resource_string.php | 2 +- install/vendor/smarty/libs/sysplugins/smarty_resource.php | 6 +++--- .../smarty/libs/sysplugins/smarty_resource_custom.php | 2 +- 15 files changed, 21 insertions(+), 18 deletions(-) diff --git a/install/core/Installer.php b/install/core/Installer.php index ef19fe3735..d5ac600c4d 100644 --- a/install/core/Installer.php +++ b/install/core/Installer.php @@ -296,8 +296,11 @@ class Installer return $this->getInstallerConfig()->getAllData(); } - public function getSystemRequirementList($type, $requiredOnly = false, array $additionalData = null) - { + public function getSystemRequirementList( + string $type, + bool $requiredOnly = false, + ?array $additionalData = null + ): array { $platform = $additionalData['databaseParams']['platform'] ?? 'Mysql'; $dbConfigDataProvider = new DatabaseConfigDataProvider($platform); diff --git a/install/vendor/smarty/demo/plugins/resource.extendsall.php b/install/vendor/smarty/demo/plugins/resource.extendsall.php index 586e6c8c94..ed420e2cfb 100644 --- a/install/vendor/smarty/demo/plugins/resource.extendsall.php +++ b/install/vendor/smarty/demo/plugins/resource.extendsall.php @@ -18,7 +18,7 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $uid = ''; $sources = array(); diff --git a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource.php b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource.php index efdc1abe0c..7bda8d6b75 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource.php @@ -53,7 +53,7 @@ abstract class Smarty_CacheResource * @param Smarty_Template_Cached $cached cached object * @return booelan true or false if the cached content does not exist */ - abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null); + abstract public function process(Smarty_Internal_Template $_template, ?Smarty_Template_Cached $cached=null); /** * Write the rendered template output to cache diff --git a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_custom.php index a81b545a0d..11746e7e07 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_custom.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_custom.php @@ -113,7 +113,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource * @param Smarty_Template_Cached $cached cached object * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) + public function process(Smarty_Internal_Template $_template, ?Smarty_Template_Cached $cached=null) { if (!$cached) { $cached = $_template->cached; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php index 0b927aab9b..d44ea2dfbe 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php @@ -84,7 +84,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource * @param Smarty_Template_Cached $cached cached object * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) + public function process(Smarty_Internal_Template $_template, ?Smarty_Template_Cached $cached=null) { if (!$cached) { $cached = $_template->cached; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php index 049cc91b6c..16c7a8584a 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php @@ -84,7 +84,7 @@ * @param Smarty_Template_Cached $cached cached object * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) + public function process(Smarty_Internal_Template $_template, ?Smarty_Template_Cached $cached=null) { $_smarty_tpl = $_template; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_eval.php index 7b19a9136d..1a2bbec20c 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_eval.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_eval.php @@ -27,7 +27,7 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->uid = $source->filepath = sha1($source->name); $source->timestamp = false; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_extends.php index dbbbd7d759..255b49270a 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_extends.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_extends.php @@ -31,7 +31,7 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template = null) { $uid = ''; $sources = array(); diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_file.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_file.php index 2754445986..deb95a84ba 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_file.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_file.php @@ -24,7 +24,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->filepath = $this->buildFilepath($source, $_template); diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_php.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_php.php index a55604f12c..4e00b86aeb 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_php.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_php.php @@ -34,7 +34,7 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->filepath = $this->buildFilepath($source, $_template); diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_registered.php index 961ba83455..edfcf72792 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_registered.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_registered.php @@ -26,7 +26,7 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->filepath = $source->type . ':' . $source->name; $source->uid = sha1($source->filepath); diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_stream.php index f49a9254ef..ed00ec8746 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_stream.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_stream.php @@ -28,7 +28,7 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { if (strpos($source->resource, '://') !== false) { $source->filepath = $source->resource; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_string.php b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_string.php index c58cd5efa7..269d9a3572 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_string.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_internal_resource_string.php @@ -27,7 +27,7 @@ class Smarty_Internal_Resource_String extends Smarty_Resource * @param Smarty_Internal_Template $_template template object * @return void */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->uid = $source->filepath = sha1($source->name); $source->timestamp = 0; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_resource.php b/install/vendor/smarty/libs/sysplugins/smarty_resource.php index 703d6145e2..41973aa926 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_resource.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_resource.php @@ -80,7 +80,7 @@ abstract class Smarty_Resource * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null); + abstract public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null); /** * populate Source Object with timestamp and exists from Resource @@ -203,7 +203,7 @@ abstract class Smarty_Resource * @return string fully qualified filepath * @throws SmartyException if default template handler is registered but not callable */ - protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + protected function buildFilepath(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $file = $source->name; if ($source instanceof Smarty_Config_Source) { @@ -518,7 +518,7 @@ abstract class Smarty_Resource * @param string $template_resource resource identifier * @return Smarty_Template_Source Source Object */ - public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null) + public static function source(?Smarty_Internal_Template $_template=null, ?Smarty $smarty=null, $template_resource=null) { if ($_template) { $smarty = $_template->smarty; diff --git a/install/vendor/smarty/libs/sysplugins/smarty_resource_custom.php b/install/vendor/smarty/libs/sysplugins/smarty_resource_custom.php index bf5c4ea6d0..d5a439cb9b 100644 --- a/install/vendor/smarty/libs/sysplugins/smarty_resource_custom.php +++ b/install/vendor/smarty/libs/sysplugins/smarty_resource_custom.php @@ -46,7 +46,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template=null) { $source->filepath = strtolower($source->type . ':' . $source->name); $source->uid = sha1($source->type . ':' . $source->name);