From 21ac91d2e605db576c612dce92e17b298a65ea5b Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 16 Apr 2024 18:27:55 +0900 Subject: [PATCH] Composer update for Smarty v4.5.2 --- www/composer.lock | 8 +++---- www/vendor/composer/installed.json | 10 ++++---- www/vendor/composer/installed.php | 4 ++-- .../smarty-extended/publish/last.published | 2 +- .../egrajp/smarty-extended/publish/publish.sh | 2 ++ .../smarty_internal_templatecompilerbase.php | 23 ++++++++++--------- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/www/composer.lock b/www/composer.lock index 11802c34..faecd3f1 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "egrajp/smarty-extended", - "version": "4.5.1", + "version": "4.5.2", "dist": { "type": "zip", - "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip", - "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip", + "shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c" }, "type": "library", "autoload": { @@ -34,7 +34,7 @@ "keywords": [ "templating" ], - "time": "2024-03-19T10:35:55+09:00" + "time": "2024-04-16T18:25:27+09:00" }, { "name": "gullevek/dotenv", diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 3e039b70..fee99149 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -2,14 +2,14 @@ "packages": [ { "name": "egrajp/smarty-extended", - "version": "4.5.1", - "version_normalized": "4.5.1.0", + "version": "4.5.2", + "version_normalized": "4.5.2.0", "dist": { "type": "zip", - "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip", - "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip", + "shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c" }, - "time": "2024-03-19T10:35:55+09:00", + "time": "2024-04-16T18:25:27+09:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index f9efd2d4..ab34286a 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -20,8 +20,8 @@ 'dev_requirement' => false, ), 'egrajp/smarty-extended' => array( - 'pretty_version' => '4.5.1', - 'version' => '4.5.1.0', + 'pretty_version' => '4.5.2', + 'version' => '4.5.2.0', 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/smarty-extended', diff --git a/www/vendor/egrajp/smarty-extended/publish/last.published b/www/vendor/egrajp/smarty-extended/publish/last.published index cca25a93..4404a17b 100644 --- a/www/vendor/egrajp/smarty-extended/publish/last.published +++ b/www/vendor/egrajp/smarty-extended/publish/last.published @@ -1 +1 @@ -4.4.1 +4.5.1 diff --git a/www/vendor/egrajp/smarty-extended/publish/publish.sh b/www/vendor/egrajp/smarty-extended/publish/publish.sh index 7095275c..e74a53db 100755 --- a/www/vendor/egrajp/smarty-extended/publish/publish.sh +++ b/www/vendor/egrajp/smarty-extended/publish/publish.sh @@ -49,6 +49,7 @@ if [ "${go_flag}" != "go" ]; then fi; echo "[START]"; + # gitea if [ ! -z "${GITEA_UPLOAD_FILENAME}" ] && [ ! -z "${GITEA_URL_DL}" ] && [ ! -z "${GITEA_URL_PUSH}" ] && @@ -82,6 +83,7 @@ if [ ! -z "${GITLAB_URL}" ] && [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then else echo "Missing GITLAB_DEPLOY_TOKEN environment variable"; fi; + echo ""; echo "[DONE]"; diff --git a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php index 10caf590..f5d2c438 100644 --- a/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php +++ b/www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php @@ -640,17 +640,18 @@ abstract class Smarty_Internal_TemplateCompilerBase return $func_name . '(' . $parameter[ 0 ] . ')'; } } else { - $first_param = array_shift($parameter); - $modifier = array_merge(array($name), $parameter); - // Now, compile the function call as a modifier - return $this->compileTag( - 'private_modifier', - array(), - array( - 'modifierlist' => array($modifier), - 'value' => $first_param - ) - ); + + if ( + !$this->smarty->loadPlugin('smarty_modifiercompiler_' . $name) + && !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name]) + && !in_array($name, ['time', 'join', 'is_array', 'in_array']) + ) { + trigger_error('Using unregistered function "' . $name . '" in a template is deprecated and will be ' . + 'removed in a future release. Use Smarty::registerPlugin to explicitly register ' . + 'a custom modifier.', E_USER_DEPRECATED); + } + + return $name . '(' . implode(',', $parameter) . ')'; } } else { $this->trigger_template_error("unknown function '{$name}'");