aboutsummaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/composer/installed.json14
-rw-r--r--vendor/composer/installed.php10
-rw-r--r--vendor/smarty/smarty/CHANGELOG.md13
-rw-r--r--vendor/smarty/smarty/libs/Smarty.class.php2
-rw-r--r--vendor/smarty/smarty/libs/debug.tpl4
-rw-r--r--vendor/smarty/smarty/libs/plugins/function.math.php2
-rw-r--r--vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php2
-rw-r--r--vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php9
-rw-r--r--vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php13
-rw-r--r--vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php2
10 files changed, 49 insertions, 22 deletions
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c7122c496..fe7a4e8c7 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1781,17 +1781,17 @@
},
{
"name": "smarty/smarty",
- "version": "v4.3.1",
- "version_normalized": "4.3.1.0",
+ "version": "v4.3.4",
+ "version_normalized": "4.3.4.0",
"source": {
"type": "git",
"url": "https://github.com/smarty-php/smarty.git",
- "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5"
+ "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e28cb0915b4e3749bf57d4ebae2984e25395cfe5",
- "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5",
+ "url": "https://api.github.com/repos/smarty-php/smarty/zipball/3931d8f54b8f7a4ffab538582d34d4397ba8daa5",
+ "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5",
"shasum": ""
},
"require": {
@@ -1801,7 +1801,7 @@
"phpunit/phpunit": "^8.5 || ^7.5",
"smarty/smarty-lexer": "^3.1"
},
- "time": "2023-03-28T19:47:03+00:00",
+ "time": "2023-09-14T10:59:08+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1844,7 +1844,7 @@
"support": {
"forum": "https://github.com/smarty-php/smarty/discussions",
"issues": "https://github.com/smarty-php/smarty/issues",
- "source": "https://github.com/smarty-php/smarty/tree/v4.3.1"
+ "source": "https://github.com/smarty-php/smarty/tree/v4.3.4"
},
"install-path": "../smarty/smarty"
},
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 0d575ecf8..56e9c53fa 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'zotlabs/hubzilla',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '600e8081a82f088ff513664379a1557ae5078193',
+ 'reference' => '6e09754d067f19fb38d26f3c8e6afd6551fb9e9d',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -242,9 +242,9 @@
'dev_requirement' => false,
),
'smarty/smarty' => array(
- 'pretty_version' => 'v4.3.1',
- 'version' => '4.3.1.0',
- 'reference' => 'e28cb0915b4e3749bf57d4ebae2984e25395cfe5',
+ 'pretty_version' => 'v4.3.4',
+ 'version' => '4.3.4.0',
+ 'reference' => '3931d8f54b8f7a4ffab538582d34d4397ba8daa5',
'type' => 'library',
'install_path' => __DIR__ . '/../smarty/smarty',
'aliases' => array(),
@@ -304,7 +304,7 @@
'zotlabs/hubzilla' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '600e8081a82f088ff513664379a1557ae5078193',
+ 'reference' => '6e09754d067f19fb38d26f3c8e6afd6551fb9e9d',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/vendor/smarty/smarty/CHANGELOG.md b/vendor/smarty/smarty/CHANGELOG.md
index 899cfd7e7..04be00ec8 100644
--- a/vendor/smarty/smarty/CHANGELOG.md
+++ b/vendor/smarty/smarty/CHANGELOG.md
@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [4.3.4] - 2023-09-14
+
+## [4.3.3] - 2023-09-14
+
+### Fixed
+- `|strip_tags` does not work if the input is 0 [#890](https://github.com/smarty-php/smarty/issues/890)
+- Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895)
+
+## [4.3.2] - 2023-07-19
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP8 warnings for undefined properties
+
## [4.3.1] - 2023-03-28
### Security
diff --git a/vendor/smarty/smarty/libs/Smarty.class.php b/vendor/smarty/smarty/libs/Smarty.class.php
index 81dc6ab52..f102d889e 100644
--- a/vendor/smarty/smarty/libs/Smarty.class.php
+++ b/vendor/smarty/smarty/libs/Smarty.class.php
@@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
- const SMARTY_VERSION = '4.3.1';
+ const SMARTY_VERSION = '4.3.4';
/**
* define variable scopes
*/
diff --git a/vendor/smarty/smarty/libs/debug.tpl b/vendor/smarty/smarty/libs/debug.tpl
index 4f82a5820..cd9325668 100644
--- a/vendor/smarty/smarty/libs/debug.tpl
+++ b/vendor/smarty/smarty/libs/debug.tpl
@@ -167,9 +167,7 @@
</html>
{/capture}
<script type="text/javascript">
- {$id = '__Smarty__'}
- {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
- _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+ _smarty_console = window.open("", "console{$targetWindow}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
_smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
_smarty_console.document.close();
</script>
diff --git a/vendor/smarty/smarty/libs/plugins/function.math.php b/vendor/smarty/smarty/libs/plugins/function.math.php
index f9cf67fe7..34912d239 100644
--- a/vendor/smarty/smarty/libs/plugins/function.math.php
+++ b/vendor/smarty/smarty/libs/plugins/function.math.php
@@ -67,7 +67,7 @@ function smarty_function_math($params, $template)
$equation = preg_replace('/\s+/', '', $equation);
// Adapted from https://www.php.net/manual/en/function.eval.php#107377
- $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
+ $number = '-?(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
$functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
$operators = '[,+\/*\^%-]'; // Allowed math operators
$regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php
index bd866a61f..fd6cc7251 100644
--- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -21,7 +21,7 @@
function smarty_modifiercompiler_strip_tags($params)
{
if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
- return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
+ return "preg_replace('!<[^>]*?>!', ' ', (string) {$params[0]})";
} else {
return 'strip_tags((string) ' . $params[ 0 ] . ')';
}
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php
index 570819d26..da67904c5 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php
@@ -238,9 +238,12 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$_config_vars = $ptr->config_vars;
ksort($_config_vars);
$debugging = $smarty->debugging;
+ $templateName = $obj->source->type . ':' . $obj->source->name;
+ $displayMode = $debugging === 2 || !$full;
+ $offset = $this->offset * 50;
$_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
if ($obj->_isTplObj()) {
- $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
+ $_template->assign('template_name', $templateName);
}
if ($obj->_objType === 1 || $full) {
$_template->assign('template_data', $this->template_data[ $this->index ]);
@@ -250,8 +253,8 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$_template->assign('assigned_vars', $_assigned_vars);
$_template->assign('config_vars', $_config_vars);
$_template->assign('execution_time', microtime(true) - $smarty->start_time);
- $_template->assign('display_mode', $debugging === 2 || !$full);
- $_template->assign('offset', $this->offset * 50);
+ $_template->assign('targetWindow', $displayMode ? md5("$offset$templateName") : '__Smarty__');
+ $_template->assign('offset', $offset);
echo $_template->fetch();
if (isset($full)) {
$this->index--;
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php
index f57cc21ff..6f526c38a 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php
@@ -18,6 +18,12 @@ class Smarty_Internal_ErrorHandler
public $allowUndefinedVars = true;
/**
+ * Allows {$foo->propName} where propName is undefined.
+ * @var bool
+ */
+ public $allowUndefinedProperties = true;
+
+ /**
* Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
* @var bool
*/
@@ -80,6 +86,13 @@ class Smarty_Internal_ErrorHandler
return; // suppresses this error
}
+ if ($this->allowUndefinedProperties && preg_match(
+ '/^(Undefined property)/',
+ $errstr
+ )) {
+ return; // suppresses this error
+ }
+
if ($this->allowUndefinedArrayKeys && preg_match(
'/^(Undefined index|Undefined array key|Trying to access array offset on value of type)/',
$errstr
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php b/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php
index 37d8f0a9e..b78a3b600 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php
@@ -85,7 +85,7 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
*
* @param Smarty_Internal_Template $_template
*
- * @return string
+ * @return void
* @throws Exception
*/
public function render(Smarty_Internal_Template $_template)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 11:12:59 +0000