From 5e917770d2f748cb553b3f1da97ae5cf260a6a32 Mon Sep 17 00:00:00 2001 From: Nightprince Date: Tue, 3 Dec 2024 17:36:59 +0330 Subject: [PATCH] Bump smarty/smarty from 5.4.1 to 5.4.2 #96 --- vendor/composer/installed.json | 38 +++++++++---------- vendor/composer/installed.php | 6 +-- vendor/smarty/smarty/CHANGELOG.md | 5 +++ vendor/smarty/smarty/README.md | 2 +- .../smarty/run-tests-for-all-php-versions.sh | 1 + .../smarty/smarty/src/Cacheresource/Base.php | 2 +- .../smarty/src/Cacheresource/Custom.php | 2 +- .../smarty/smarty/src/Cacheresource/File.php | 2 +- .../src/Cacheresource/KeyValueStore.php | 2 +- .../smarty/smarty/src/Compiler/CodeFrame.php | 2 +- .../smarty/smarty/src/Compiler/Template.php | 2 +- .../smarty/smarty/src/CompilerException.php | 4 +- .../smarty/smarty/src/Resource/BasePlugin.php | 2 +- .../smarty/src/Resource/CustomPlugin.php | 2 +- .../smarty/src/Resource/ExtendsPlugin.php | 2 +- .../smarty/smarty/src/Resource/FilePlugin.php | 2 +- .../smarty/src/Resource/StreamPlugin.php | 2 +- .../smarty/src/Resource/StringPlugin.php | 2 +- .../smarty/src/Runtime/InheritanceRuntime.php | 2 +- vendor/smarty/smarty/src/Smarty.php | 2 +- vendor/smarty/smarty/src/Template.php | 6 +-- vendor/smarty/smarty/src/Template/Source.php | 6 +-- vendor/smarty/smarty/src/TemplateBase.php | 2 +- 23 files changed, 51 insertions(+), 47 deletions(-) diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8aa17ebeb..0e6051b95 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -557,35 +557,34 @@ }, { "name": "kint-php/kint", - "version": "5.1.1", - "version_normalized": "5.1.1.0", + "version": "6.0", + "version_normalized": "6.0.0.0", "source": { "type": "git", "url": "https://github.com/kint-php/kint.git", - "reference": "8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b" + "reference": "371e67a3036fcfb7cec06481ab44eba15e338db7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kint-php/kint/zipball/8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b", - "reference": "8c5ec370c3382ceae0b88e91f9bbb00e6bb4f93b", + "url": "https://api.github.com/repos/kint-php/kint/zipball/371e67a3036fcfb7cec06481ab44eba15e338db7", + "reference": "371e67a3036fcfb7cec06481ab44eba15e338db7", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3", - "phpspec/prophecy-phpunit": "^2", "phpunit/phpunit": "^9", "seld/phar-utils": "^1", - "symfony/finder": ">=4.0", + "symfony/finder": ">=7", "vimeo/psalm": "^5" }, "suggest": { "kint-php/kint-helpers": "Provides extra helper functions", "kint-php/kint-twig": "Provides d() and s() functions in twig templates" }, - "time": "2024-04-26T14:20:09+00:00", + "time": "2024-11-16T18:50:50+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -610,16 +609,15 @@ "homepage": "https://github.com/kint-php/kint/graphs/contributors" } ], - "description": "Kint - debugging tool for PHP developers", + "description": "Kint - Advanced PHP dumper", "homepage": "https://kint-php.github.io/kint/", "keywords": [ "debug", - "kint", - "php" + "dump" ], "support": { "issues": "https://github.com/kint-php/kint/issues", - "source": "https://github.com/kint-php/kint/tree/5.1.1" + "source": "https://github.com/kint-php/kint/tree/6.0" }, "install-path": "../kint-php/kint" }, @@ -1032,17 +1030,17 @@ }, { "name": "smarty/smarty", - "version": "v5.4.1", - "version_normalized": "5.4.1.0", + "version": "v5.4.2", + "version_normalized": "5.4.2.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "cd58df7a2603b7d925e5db5c9d50f10987695fd3" + "reference": "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/cd58df7a2603b7d925e5db5c9d50f10987695fd3", - "reference": "cd58df7a2603b7d925e5db5c9d50f10987695fd3", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f", + "reference": "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f", "shasum": "" }, "require": { @@ -1053,7 +1051,7 @@ "phpunit/phpunit": "^8.5 || ^7.5", "smarty/smarty-lexer": "^4.0.2" }, - "time": "2024-08-29T23:10:45+00:00", + "time": "2024-11-20T21:18:16+00:00", "type": "library", "extra": { "branch-alias": { @@ -1099,7 +1097,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/v5.4.1" + "source": "https://github.com/smarty-php/smarty/tree/v5.4.2" }, "install-path": "../smarty/smarty" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index d5e658131..38a2ecaac 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -167,9 +167,9 @@ ), ), 'smarty/smarty' => array( - 'pretty_version' => 'v5.4.1', - 'version' => '5.4.1.0', - 'reference' => 'cd58df7a2603b7d925e5db5c9d50f10987695fd3', + 'pretty_version' => 'v5.4.2', + 'version' => '5.4.2.0', + 'reference' => '642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f', 'type' => 'library', 'install_path' => __DIR__ . '/../smarty/smarty', 'aliases' => array(), diff --git a/vendor/smarty/smarty/CHANGELOG.md b/vendor/smarty/smarty/CHANGELOG.md index 154c1a892..f796e12e2 100644 --- a/vendor/smarty/smarty/CHANGELOG.md +++ b/vendor/smarty/smarty/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.4.2] - 2024-11-20 + + +- Support the deprecations introduced in PHP 8.4 and added tests for PHP 8.4 [#1043](https://github.com/smarty-php/smarty/pull/1043) + ## [5.4.1] - 2024-08-29 diff --git a/vendor/smarty/smarty/README.md b/vendor/smarty/smarty/README.md index f73647e59..755d73ea0 100644 --- a/vendor/smarty/smarty/README.md +++ b/vendor/smarty/smarty/README.md @@ -7,7 +7,7 @@ Smarty is a template engine for PHP, facilitating the separation of presentation Read the [documentation](https://smarty-php.github.io/smarty/) to find out how to use it. ## Requirements -Smarty v5 can be run with PHP 7.2 to PHP 8.3. +Smarty v5 can be run with PHP 7.2 to PHP 8.4. ## Installation Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/). diff --git a/vendor/smarty/smarty/run-tests-for-all-php-versions.sh b/vendor/smarty/smarty/run-tests-for-all-php-versions.sh index 494b127b5..efff5713d 100644 --- a/vendor/smarty/smarty/run-tests-for-all-php-versions.sh +++ b/vendor/smarty/smarty/run-tests-for-all-php-versions.sh @@ -14,3 +14,4 @@ $COMPOSE_CMD run --rm php80 ./run-tests.sh $@ && \ $COMPOSE_CMD run --rm php81 ./run-tests.sh $@ && \ $COMPOSE_CMD run --rm php82 ./run-tests.sh $@ $COMPOSE_CMD run --rm php83 ./run-tests.sh $@ +$COMPOSE_CMD run --rm php84 ./run-tests.sh $@ diff --git a/vendor/smarty/smarty/src/Cacheresource/Base.php b/vendor/smarty/smarty/src/Cacheresource/Base.php index 54a141921..41c4f6bc6 100644 --- a/vendor/smarty/smarty/src/Cacheresource/Base.php +++ b/vendor/smarty/smarty/src/Cacheresource/Base.php @@ -44,7 +44,7 @@ abstract public function populateTimestamp(Cached $cached); */ abstract public function process( Template $_template, - Cached $cached = null, + ?Cached $cached = null, $update = false ); diff --git a/vendor/smarty/smarty/src/Cacheresource/Custom.php b/vendor/smarty/smarty/src/Cacheresource/Custom.php index c049246c8..f9eb858e4 100644 --- a/vendor/smarty/smarty/src/Cacheresource/Custom.php +++ b/vendor/smarty/smarty/src/Cacheresource/Custom.php @@ -139,7 +139,7 @@ public function populateTimestamp(\Smarty\Template\Cached $cached) */ public function process( Template $_smarty_tpl, - \Smarty\Template\Cached $cached = null, + ?\Smarty\Template\Cached $cached = null, $update = false ) { if (!$cached) { diff --git a/vendor/smarty/smarty/src/Cacheresource/File.php b/vendor/smarty/smarty/src/Cacheresource/File.php index 538f01034..4b4198ec2 100644 --- a/vendor/smarty/smarty/src/Cacheresource/File.php +++ b/vendor/smarty/smarty/src/Cacheresource/File.php @@ -99,7 +99,7 @@ public function populateTimestamp(Cached $cached) */ public function process( Template $_smarty_tpl, - Cached $cached = null, + ?Cached $cached = null, $update = false ) { $_smarty_tpl->getCached()->setValid(false); diff --git a/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php b/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php index 733d27765..1953bb20f 100644 --- a/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php +++ b/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php @@ -103,7 +103,7 @@ public function populateTimestamp(Cached $cached) */ public function process( Template $_smarty_tpl, - Cached $cached = null, + ?Cached $cached = null, $update = false ) { if (!$cached) { diff --git a/vendor/smarty/smarty/src/Compiler/CodeFrame.php b/vendor/smarty/smarty/src/Compiler/CodeFrame.php index 5e7821509..d0e1cc120 100644 --- a/vendor/smarty/smarty/src/Compiler/CodeFrame.php +++ b/vendor/smarty/smarty/src/Compiler/CodeFrame.php @@ -41,7 +41,7 @@ public function create( $content = '', $functions = '', $cache = false, - \Smarty\Compiler\Template $compiler = null + ?\Smarty\Compiler\Template $compiler = null ) { // build property code $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION; diff --git a/vendor/smarty/smarty/src/Compiler/Template.php b/vendor/smarty/smarty/src/Compiler/Template.php index 9b2c1a1f2..de802e1cc 100644 --- a/vendor/smarty/smarty/src/Compiler/Template.php +++ b/vendor/smarty/smarty/src/Compiler/Template.php @@ -374,7 +374,7 @@ public function compileTemplate(\Smarty\Template $template) { * @throws CompilerException * @throws Exception */ - public function compileTemplateSource(\Smarty\Template $template, \Smarty\Compiler\Template $parent_compiler = null) { + public function compileTemplateSource(\Smarty\Template $template, ?\Smarty\Compiler\Template $parent_compiler = null) { try { // save template object in compiler class $this->template = $template; diff --git a/vendor/smarty/smarty/src/CompilerException.php b/vendor/smarty/smarty/src/CompilerException.php index e3d67b46c..60af9db7c 100644 --- a/vendor/smarty/smarty/src/CompilerException.php +++ b/vendor/smarty/smarty/src/CompilerException.php @@ -16,14 +16,14 @@ class CompilerException extends Exception { * @param int $code The Exception code. * @param string|null $filename The filename where the exception is thrown. * @param int|null $line The line number where the exception is thrown. - * @param Throwable|null $previous The previous exception used for the exception chaining. + * @param \Throwable|null $previous The previous exception used for the exception chaining. */ public function __construct( string $message = "", int $code = 0, ?string $filename = null, ?int $line = null, - Throwable $previous = null + ?\Throwable $previous = null ) { parent::__construct($message, $code, $previous); diff --git a/vendor/smarty/smarty/src/Resource/BasePlugin.php b/vendor/smarty/smarty/src/Resource/BasePlugin.php index 56f7dfa05..6d2222237 100644 --- a/vendor/smarty/smarty/src/Resource/BasePlugin.php +++ b/vendor/smarty/smarty/src/Resource/BasePlugin.php @@ -112,7 +112,7 @@ abstract public function getContent(Source $source); * @param Source $source source object * @param Template|null $_template template object */ - abstract public function populate(Source $source, \Smarty\Template $_template = null); + abstract public function populate(Source $source, ?\Smarty\Template $_template = null); /** * populate Source Object with timestamp and exists from Resource diff --git a/vendor/smarty/smarty/src/Resource/CustomPlugin.php b/vendor/smarty/smarty/src/Resource/CustomPlugin.php index b50ef7aaf..895e97108 100644 --- a/vendor/smarty/smarty/src/Resource/CustomPlugin.php +++ b/vendor/smarty/smarty/src/Resource/CustomPlugin.php @@ -50,7 +50,7 @@ protected function fetchTimestamp($name) { * @param Source $source source object * @param Template|null $_template template object */ - public function populate(Source $source, Template $_template = null) { + public function populate(Source $source, ?Template $_template = null) { $source->uid = sha1($source->type . ':' . $source->name); $mtime = $this->fetchTimestamp($source->name); if ($mtime !== null) { diff --git a/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php b/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php index 0f9c9de25..960e37971 100644 --- a/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php +++ b/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php @@ -23,7 +23,7 @@ class ExtendsPlugin extends BasePlugin * * @throws Exception */ - public function populate(Source $source, Template $_template = null) + public function populate(Source $source, ?Template $_template = null) { $uid = ''; $sources = array(); diff --git a/vendor/smarty/smarty/src/Resource/FilePlugin.php b/vendor/smarty/smarty/src/Resource/FilePlugin.php index c59595783..0033c8348 100644 --- a/vendor/smarty/smarty/src/Resource/FilePlugin.php +++ b/vendor/smarty/smarty/src/Resource/FilePlugin.php @@ -32,7 +32,7 @@ class FilePlugin extends BasePlugin { * * @throws Exception */ - public function populate(Source $source, Template $_template = null) { + public function populate(Source $source, ?Template $_template = null) { $source->uid = sha1( $source->name . ($source->isConfig ? $source->getSmarty()->_joined_config_dir : diff --git a/vendor/smarty/smarty/src/Resource/StreamPlugin.php b/vendor/smarty/smarty/src/Resource/StreamPlugin.php index 91afffdcd..9b5b3f579 100644 --- a/vendor/smarty/smarty/src/Resource/StreamPlugin.php +++ b/vendor/smarty/smarty/src/Resource/StreamPlugin.php @@ -33,7 +33,7 @@ class StreamPlugin extends RecompiledPlugin { * * @return void */ - public function populate(Source $source, Template $_template = null) { + public function populate(Source $source, ?Template $_template = null) { $source->uid = false; $source->content = $this->getContent($source); $source->timestamp = $source->exists = !!$source->content; diff --git a/vendor/smarty/smarty/src/Resource/StringPlugin.php b/vendor/smarty/smarty/src/Resource/StringPlugin.php index 6b5bee4dd..fb3692c73 100644 --- a/vendor/smarty/smarty/src/Resource/StringPlugin.php +++ b/vendor/smarty/smarty/src/Resource/StringPlugin.php @@ -31,7 +31,7 @@ class StringPlugin extends BasePlugin { * * @return void */ - public function populate(Source $source, Template $_template = null) { + public function populate(Source $source, ?Template $_template = null) { $source->uid = sha1($source->name); $source->timestamp = $source->exists = true; } diff --git a/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php b/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php index ffd7aae66..74ea85440 100644 --- a/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php +++ b/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php @@ -162,7 +162,7 @@ public function instanceBlock(Template $tpl, $className, $name, $tplIndex = null private function processBlock( Template $tpl, \Smarty\Runtime\Block $block, - \Smarty\Runtime\Block $parent = null + ?\Smarty\Runtime\Block $parent = null ) { if ($block->hide && !isset($block->child)) { return; diff --git a/vendor/smarty/smarty/src/Smarty.php b/vendor/smarty/smarty/src/Smarty.php index a89617975..b8d1bc7da 100644 --- a/vendor/smarty/smarty/src/Smarty.php +++ b/vendor/smarty/smarty/src/Smarty.php @@ -54,7 +54,7 @@ class Smarty extends \Smarty\TemplateBase { /** * smarty version */ - const SMARTY_VERSION = '5.4.1'; + const SMARTY_VERSION = '5.4.2'; /** * define caching modes diff --git a/vendor/smarty/smarty/src/Template.php b/vendor/smarty/smarty/src/Template.php index fcb0f58d2..242fb2388 100644 --- a/vendor/smarty/smarty/src/Template.php +++ b/vendor/smarty/smarty/src/Template.php @@ -115,7 +115,7 @@ class Template extends TemplateBase { public function __construct( $template_resource, Smarty $smarty, - \Smarty\Data $_parent = null, + ?\Smarty\Data $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, @@ -248,7 +248,7 @@ public function renderSubTemplate( $caching, $cache_lifetime, array $extra_vars = [], - int $scope = null, + ?int $scope = null, ?string $currentDir = null ) { @@ -462,7 +462,7 @@ public function getCompiler() { * @return string * @throws Exception */ - public function createCodeFrame($content = '', $functions = '', $cache = false, \Smarty\Compiler\Template $compiler = null) { + public function createCodeFrame($content = '', $functions = '', $cache = false, ?\Smarty\Compiler\Template $compiler = null) { return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler); } diff --git a/vendor/smarty/smarty/src/Template/Source.php b/vendor/smarty/smarty/src/Template/Source.php index 382e710a7..2ef13a48c 100644 --- a/vendor/smarty/smarty/src/Template/Source.php +++ b/vendor/smarty/smarty/src/Template/Source.php @@ -134,9 +134,9 @@ public function __construct(Smarty $smarty, $type, $name) { * @throws Exception */ public static function load( - Template $_template = null, - Smarty $smarty = null, - $template_resource = null + ?Template $_template = null, + ?Smarty $smarty = null, + $template_resource = null ) { if ($_template) { $smarty = $_template->getSmarty(); diff --git a/vendor/smarty/smarty/src/TemplateBase.php b/vendor/smarty/smarty/src/TemplateBase.php index 3674edf7c..f01d11076 100644 --- a/vendor/smarty/smarty/src/TemplateBase.php +++ b/vendor/smarty/smarty/src/TemplateBase.php @@ -179,7 +179,7 @@ public function setCacheId($cache_id) { * @api Smarty::createData() * */ - public function createData(Data $parent = null, $name = null) { + public function createData(?Data $parent = null, $name = null) { /* @var Smarty $smarty */ $smarty = $this->getSmarty(); $dataObj = new Data($parent, $smarty, $name);