From dcb09a8b39191049773068d9e70985595486c266 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 21 Nov 2025 16:45:54 +0100 Subject: [PATCH] update smarty and base58 --- composer.json | 2 +- composer.lock | 45 +++++++++------ vendor/composer/autoload_classmap.php | 6 +- vendor/composer/autoload_psr4.php | 1 - vendor/composer/autoload_static.php | 11 +--- vendor/composer/installed.json | 49 ++++++++++------- vendor/composer/installed.php | 16 +++--- vendor/smarty/smarty/CHANGELOG.md | 4 ++ vendor/smarty/smarty/README.md | 2 +- vendor/smarty/smarty/docs/getting-started.md | 2 +- vendor/smarty/smarty/src/Smarty.php | 2 +- vendor/smarty/smarty/src/TemplateBase.php | 2 +- vendor/stephenhill/base58/.github/FUNDING.yml | 1 + .../base58/.github/workflows/php.yml | 29 ++++++++++ vendor/stephenhill/base58/.gitignore | 1 + vendor/stephenhill/base58/.travis.yml | 15 ----- .../base58/benchmarks/Base16Event.php | 24 -------- .../base58/benchmarks/Base58BCMathEvent.php | 33 ----------- .../base58/benchmarks/Base58GMPEvent.php | 33 ----------- .../base58/benchmarks/Base64Event.php | 24 -------- vendor/stephenhill/base58/composer.json | 13 +++-- vendor/stephenhill/base58/phpunit.xml | 55 +++++++++---------- vendor/stephenhill/base58/readme.md | 54 +++--------------- .../stephenhill/base58/src/BCMathService.php | 21 +------ vendor/stephenhill/base58/src/Base58.php | 46 +++++++++++++--- vendor/stephenhill/base58/src/GMPService.php | 21 +------ .../base58/src/ServiceInterface.php | 4 +- 27 files changed, 196 insertions(+), 320 deletions(-) create mode 100644 vendor/stephenhill/base58/.github/FUNDING.yml create mode 100644 vendor/stephenhill/base58/.github/workflows/php.yml delete mode 100644 vendor/stephenhill/base58/.travis.yml delete mode 100644 vendor/stephenhill/base58/benchmarks/Base16Event.php delete mode 100644 vendor/stephenhill/base58/benchmarks/Base58BCMathEvent.php delete mode 100644 vendor/stephenhill/base58/benchmarks/Base58GMPEvent.php delete mode 100644 vendor/stephenhill/base58/benchmarks/Base64Event.php diff --git a/composer.json b/composer.json index f0ddc6146..a7bb9362f 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "chillerlan/php-qrcode": "^5.0.3", "spomky-labs/otphp": "^11.1", "patrickschur/language-detection": "^5.3", - "stephenhill/base58": "^1.1", + "stephenhill/base58": "^2.1", "scssphp/scssphp": "^2.0.1", "twbs/bootstrap-icons": "^1.11", "macgirvin/http-message-signer": "^0.2.6", diff --git a/composer.lock b/composer.lock index 2b54ce52c..d4f816d21 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4e8f12e610e0ac056f5f8473415e9a6c", + "content-hash": "08bc7d463277e84c8db1ce8cf1a90b7b", "packages": [ { "name": "bakame/http-structured-fields", @@ -3051,16 +3051,16 @@ }, { "name": "smarty/smarty", - "version": "v5.6.0", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "1fc41e385da8a27a87bec5914392ab662a7bb8ec" + "reference": "73da7e90f302175a570662fcb0ba41f57b7a92ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/1fc41e385da8a27a87bec5914392ab662a7bb8ec", - "reference": "1fc41e385da8a27a87bec5914392ab662a7bb8ec", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/73da7e90f302175a570662fcb0ba41f57b7a92ab", + "reference": "73da7e90f302175a570662fcb0ba41f57b7a92ab", "shasum": "" }, "require": { @@ -3115,7 +3115,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.6.0" + "source": "https://github.com/smarty-php/smarty/tree/v5.7.0" }, "funding": [ { @@ -3123,7 +3123,7 @@ "type": "github" } ], - "time": "2025-10-03T21:22:25+00:00" + "time": "2025-11-19T21:36:38+00:00" }, { "name": "spomky-labs/otphp", @@ -3209,27 +3209,32 @@ }, { "name": "stephenhill/base58", - "version": "v1.1.5", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/stephen-hill/base58php.git", - "reference": "bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99" + "reference": "3030c00c0a1e1b78520f3ace6fbf813dacddfab5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stephen-hill/base58php/zipball/bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99", - "reference": "bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99", + "url": "https://api.github.com/repos/stephen-hill/base58php/zipball/3030c00c0a1e1b78520f3ace6fbf813dacddfab5", + "reference": "3030c00c0a1e1b78520f3ace6fbf813dacddfab5", "shasum": "" }, + "require": { + "php": ">=8.1" + }, "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "10.*" + }, + "suggest": { + "ext-bcmath": "Required for BC Math support", + "ext-gmp": "Required for GMP support" }, "type": "library", "autoload": { "psr-4": { - "StephenHill\\": "src/", - "StephenHill\\Benchmarks\\": "benchmarks/" + "StephenHill\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3245,9 +3250,15 @@ "description": "Base58 Encoding and Decoding Library for PHP", "support": { "issues": "https://github.com/stephen-hill/base58php/issues", - "source": "https://github.com/stephen-hill/base58php/tree/v1.1.5" + "source": "https://github.com/stephen-hill/base58php/tree/v2.1.0" }, - "time": "2019-08-22T16:51:59+00:00" + "funding": [ + { + "url": "https://github.com/stephen-hill", + "type": "github" + } + ], + "time": "2025-11-19T11:50:12+00:00" }, { "name": "symfony/deprecation-contracts", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index f3ccb3931..643745bc9 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1798,10 +1798,6 @@ return array( 'SourceSpan\\Util' => $vendorDir . '/scssphp/source-span/src/Util.php', 'StephenHill\\BCMathService' => $vendorDir . '/stephenhill/base58/src/BCMathService.php', 'StephenHill\\Base58' => $vendorDir . '/stephenhill/base58/src/Base58.php', - 'StephenHill\\Benchmarks\\Base16Event' => $vendorDir . '/stephenhill/base58/benchmarks/Base16Event.php', - 'StephenHill\\Benchmarks\\Base58BCMathEvent' => $vendorDir . '/stephenhill/base58/benchmarks/Base58BCMathEvent.php', - 'StephenHill\\Benchmarks\\Base58GMPEvent' => $vendorDir . '/stephenhill/base58/benchmarks/Base58GMPEvent.php', - 'StephenHill\\Benchmarks\\Base64Event' => $vendorDir . '/stephenhill/base58/benchmarks/Base64Event.php', 'StephenHill\\GMPService' => $vendorDir . '/stephenhill/base58/src/GMPService.php', 'StephenHill\\ServiceInterface' => $vendorDir . '/stephenhill/base58/src/ServiceInterface.php', 'Symfony\\Component\\Filesystem\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/filesystem/Exception/ExceptionInterface.php', @@ -1919,6 +1915,7 @@ return array( 'Zotlabs\\Lib\\MarkdownSoap' => $baseDir . '/Zotlabs/Lib/MarkdownSoap.php', 'Zotlabs\\Lib\\MessageFilter' => $baseDir . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\Multibase' => $baseDir . '/Zotlabs/Lib/Multibase.php', + 'Zotlabs\\Lib\\ObjCache' => $baseDir . '/Zotlabs/Lib/ObjCache.php', 'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php', @@ -2002,7 +1999,6 @@ return array( 'Zotlabs\\Module\\Editwebpage' => $baseDir . '/Zotlabs/Module/Editwebpage.php', 'Zotlabs\\Module\\Email_resend' => $baseDir . '/Zotlabs/Module/Email_resend.php', 'Zotlabs\\Module\\Email_validation' => $baseDir . '/Zotlabs/Module/Email_validation.php', - 'Zotlabs\\Module\\Embed' => $baseDir . '/Zotlabs/Module/Embed.php', 'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php', 'Zotlabs\\Module\\Emoji' => $baseDir . '/Zotlabs/Module/Emoji.php', 'Zotlabs\\Module\\Event' => $baseDir . '/Zotlabs/Module/Event.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 0f9569fa4..d6b87bfda 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -15,7 +15,6 @@ return array( 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'), - 'StephenHill\\Benchmarks\\' => array($vendorDir . '/stephenhill/base58/benchmarks'), 'StephenHill\\' => array($vendorDir . '/stephenhill/base58/src'), 'SourceSpan\\' => array($vendorDir . '/scssphp/source-span/src'), 'Smarty\\' => array($vendorDir . '/smarty/smarty/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index febd406a3..c8796e03b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -50,7 +50,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Ctype\\' => 23, 'Symfony\\Component\\Filesystem\\' => 29, - 'StephenHill\\Benchmarks\\' => 23, 'StephenHill\\' => 12, 'SourceSpan\\' => 11, 'Smarty\\' => 7, @@ -163,10 +162,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d array ( 0 => __DIR__ . '/..' . '/symfony/filesystem', ), - 'StephenHill\\Benchmarks\\' => - array ( - 0 => __DIR__ . '/..' . '/stephenhill/base58/benchmarks', - ), 'StephenHill\\' => array ( 0 => __DIR__ . '/..' . '/stephenhill/base58/src', @@ -2142,10 +2137,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'SourceSpan\\Util' => __DIR__ . '/..' . '/scssphp/source-span/src/Util.php', 'StephenHill\\BCMathService' => __DIR__ . '/..' . '/stephenhill/base58/src/BCMathService.php', 'StephenHill\\Base58' => __DIR__ . '/..' . '/stephenhill/base58/src/Base58.php', - 'StephenHill\\Benchmarks\\Base16Event' => __DIR__ . '/..' . '/stephenhill/base58/benchmarks/Base16Event.php', - 'StephenHill\\Benchmarks\\Base58BCMathEvent' => __DIR__ . '/..' . '/stephenhill/base58/benchmarks/Base58BCMathEvent.php', - 'StephenHill\\Benchmarks\\Base58GMPEvent' => __DIR__ . '/..' . '/stephenhill/base58/benchmarks/Base58GMPEvent.php', - 'StephenHill\\Benchmarks\\Base64Event' => __DIR__ . '/..' . '/stephenhill/base58/benchmarks/Base64Event.php', 'StephenHill\\GMPService' => __DIR__ . '/..' . '/stephenhill/base58/src/GMPService.php', 'StephenHill\\ServiceInterface' => __DIR__ . '/..' . '/stephenhill/base58/src/ServiceInterface.php', 'Symfony\\Component\\Filesystem\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/filesystem/Exception/ExceptionInterface.php', @@ -2263,6 +2254,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\MarkdownSoap' => __DIR__ . '/../..' . '/Zotlabs/Lib/MarkdownSoap.php', 'Zotlabs\\Lib\\MessageFilter' => __DIR__ . '/../..' . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\Multibase' => __DIR__ . '/../..' . '/Zotlabs/Lib/Multibase.php', + 'Zotlabs\\Lib\\ObjCache' => __DIR__ . '/../..' . '/Zotlabs/Lib/ObjCache.php', 'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => __DIR__ . '/../..' . '/Zotlabs/Lib/PermissionDescription.php', @@ -2346,7 +2338,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Editwebpage' => __DIR__ . '/../..' . '/Zotlabs/Module/Editwebpage.php', 'Zotlabs\\Module\\Email_resend' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_resend.php', 'Zotlabs\\Module\\Email_validation' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_validation.php', - 'Zotlabs\\Module\\Embed' => __DIR__ . '/../..' . '/Zotlabs/Module/Embed.php', 'Zotlabs\\Module\\Embedphotos' => __DIR__ . '/../..' . '/Zotlabs/Module/Embedphotos.php', 'Zotlabs\\Module\\Emoji' => __DIR__ . '/../..' . '/Zotlabs/Module/Emoji.php', 'Zotlabs\\Module\\Event' => __DIR__ . '/../..' . '/Zotlabs/Module/Event.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6ee7d6beb..9e8073e55 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -3172,17 +3172,17 @@ }, { "name": "smarty/smarty", - "version": "v5.6.0", - "version_normalized": "5.6.0.0", + "version": "v5.7.0", + "version_normalized": "5.7.0.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "1fc41e385da8a27a87bec5914392ab662a7bb8ec" + "reference": "73da7e90f302175a570662fcb0ba41f57b7a92ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/1fc41e385da8a27a87bec5914392ab662a7bb8ec", - "reference": "1fc41e385da8a27a87bec5914392ab662a7bb8ec", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/73da7e90f302175a570662fcb0ba41f57b7a92ab", + "reference": "73da7e90f302175a570662fcb0ba41f57b7a92ab", "shasum": "" }, "require": { @@ -3193,7 +3193,7 @@ "phpunit/phpunit": "^8.5 || ^7.5", "smarty/smarty-lexer": "^4.0.2" }, - "time": "2025-10-03T21:22:25+00:00", + "time": "2025-11-19T21:36:38+00:00", "type": "library", "extra": { "branch-alias": { @@ -3239,7 +3239,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.6.0" + "source": "https://github.com/smarty-php/smarty/tree/v5.7.0" }, "funding": [ { @@ -3336,30 +3336,35 @@ }, { "name": "stephenhill/base58", - "version": "v1.1.5", - "version_normalized": "1.1.5.0", + "version": "v2.1.0", + "version_normalized": "2.1.0.0", "source": { "type": "git", "url": "https://github.com/stephen-hill/base58php.git", - "reference": "bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99" + "reference": "3030c00c0a1e1b78520f3ace6fbf813dacddfab5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stephen-hill/base58php/zipball/bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99", - "reference": "bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99", + "url": "https://api.github.com/repos/stephen-hill/base58php/zipball/3030c00c0a1e1b78520f3ace6fbf813dacddfab5", + "reference": "3030c00c0a1e1b78520f3ace6fbf813dacddfab5", "shasum": "" }, - "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "4.*" + "require": { + "php": ">=8.1" }, - "time": "2019-08-22T16:51:59+00:00", + "require-dev": { + "phpunit/phpunit": "10.*" + }, + "suggest": { + "ext-bcmath": "Required for BC Math support", + "ext-gmp": "Required for GMP support" + }, + "time": "2025-11-19T11:50:12+00:00", "type": "library", "installation-source": "dist", "autoload": { "psr-4": { - "StephenHill\\": "src/", - "StephenHill\\Benchmarks\\": "benchmarks/" + "StephenHill\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3375,8 +3380,14 @@ "description": "Base58 Encoding and Decoding Library for PHP", "support": { "issues": "https://github.com/stephen-hill/base58php/issues", - "source": "https://github.com/stephen-hill/base58php/tree/v1.1.5" + "source": "https://github.com/stephen-hill/base58php/tree/v2.1.0" }, + "funding": [ + { + "url": "https://github.com/stephen-hill", + "type": "github" + } + ], "install-path": "../stephenhill/base58" }, { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 9ee3bc95a..2dc84f021 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'zotlabs/hubzilla', 'pretty_version' => 'dev-10.6RC', 'version' => 'dev-10.6RC', - 'reference' => '6320506c2738258c0bab9a6778342fbdc958b022', + 'reference' => '57c22f4d0f70650b67db1ed5068fee8ca0410a5f', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -437,9 +437,9 @@ 'dev_requirement' => false, ), 'smarty/smarty' => array( - 'pretty_version' => 'v5.6.0', - 'version' => '5.6.0.0', - 'reference' => '1fc41e385da8a27a87bec5914392ab662a7bb8ec', + 'pretty_version' => 'v5.7.0', + 'version' => '5.7.0.0', + 'reference' => '73da7e90f302175a570662fcb0ba41f57b7a92ab', 'type' => 'library', 'install_path' => __DIR__ . '/../smarty/smarty', 'aliases' => array(), @@ -455,9 +455,9 @@ 'dev_requirement' => false, ), 'stephenhill/base58' => array( - 'pretty_version' => 'v1.1.5', - 'version' => '1.1.5.0', - 'reference' => 'bd9fc19c788160a2f85ba0a19cd800eaf5ba5e99', + 'pretty_version' => 'v2.1.0', + 'version' => '2.1.0.0', + 'reference' => '3030c00c0a1e1b78520f3ace6fbf813dacddfab5', 'type' => 'library', 'install_path' => __DIR__ . '/../stephenhill/base58', 'aliases' => array(), @@ -544,7 +544,7 @@ 'zotlabs/hubzilla' => array( 'pretty_version' => 'dev-10.6RC', 'version' => 'dev-10.6RC', - 'reference' => '6320506c2738258c0bab9a6778342fbdc958b022', + 'reference' => '57c22f4d0f70650b67db1ed5068fee8ca0410a5f', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/smarty/smarty/CHANGELOG.md b/vendor/smarty/smarty/CHANGELOG.md index 085d0a25c..59225433b 100644 --- a/vendor/smarty/smarty/CHANGELOG.md +++ b/vendor/smarty/smarty/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.7.0] - 2025-11-19 +- PHP 8.5 support + + ## [5.6.0] - 2025-10-03 - Added support for shorttags in functions [#1005](https://github.com/smarty-php/smarty/issues/1005) diff --git a/vendor/smarty/smarty/README.md b/vendor/smarty/smarty/README.md index 1b44172dc..3c6edc29c 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.4. +Smarty v5 can be run with PHP 7.2 to PHP 8.5. ## Installation Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/). diff --git a/vendor/smarty/smarty/docs/getting-started.md b/vendor/smarty/smarty/docs/getting-started.md index 1ea927e92..17a0042bc 100644 --- a/vendor/smarty/smarty/docs/getting-started.md +++ b/vendor/smarty/smarty/docs/getting-started.md @@ -1,7 +1,7 @@ # Getting started ## Requirements -Smarty can be run with PHP 7.2 to PHP 8.4. +Smarty can be run with PHP 7.2 to PHP 8.5. ## Installation Smarty can be installed with [Composer](https://getcomposer.org/). diff --git a/vendor/smarty/smarty/src/Smarty.php b/vendor/smarty/smarty/src/Smarty.php index fbb7314db..b53a36c20 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.6.0'; + const SMARTY_VERSION = '5.7.0'; /** * define caching modes diff --git a/vendor/smarty/smarty/src/TemplateBase.php b/vendor/smarty/smarty/src/TemplateBase.php index f01d11076..e06b5917a 100644 --- a/vendor/smarty/smarty/src/TemplateBase.php +++ b/vendor/smarty/smarty/src/TemplateBase.php @@ -104,7 +104,7 @@ abstract class TemplateBase extends Data { } // register the object $smarty->registered_objects[$object_name] = - [$object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods]; + [$object, (array)$allowed_methods_properties, (bool)$format, (array)$block_methods]; return $this; } diff --git a/vendor/stephenhill/base58/.github/FUNDING.yml b/vendor/stephenhill/base58/.github/FUNDING.yml new file mode 100644 index 000000000..2501d4a64 --- /dev/null +++ b/vendor/stephenhill/base58/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [stephen-hill] diff --git a/vendor/stephenhill/base58/.github/workflows/php.yml b/vendor/stephenhill/base58/.github/workflows/php.yml new file mode 100644 index 000000000..a8588b115 --- /dev/null +++ b/vendor/stephenhill/base58/.github/workflows/php.yml @@ -0,0 +1,29 @@ +name: Base58 + +on: + push: + branches: [main, goodsprings] + pull_request: + branches: [main] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + php-version: [8.1, 8.2, 8.3, 8.4, 8.5] + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Install Composer dependencies + run: composer install --no-progress --prefer-dist + + - name: Run PHPUnit + run: bin/phpunit --no-coverage \ No newline at end of file diff --git a/vendor/stephenhill/base58/.gitignore b/vendor/stephenhill/base58/.gitignore index b2df07bd9..955fe3591 100644 --- a/vendor/stephenhill/base58/.gitignore +++ b/vendor/stephenhill/base58/.gitignore @@ -1,3 +1,4 @@ /vendor/ +/coverage/ /bin/ composer.lock diff --git a/vendor/stephenhill/base58/.travis.yml b/vendor/stephenhill/base58/.travis.yml deleted file mode 100644 index 3e995f336..000000000 --- a/vendor/stephenhill/base58/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: php - -before_script: - - composer install - -php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - 7 - - 7.1 - - hhvm - -script: bin/phpunit diff --git a/vendor/stephenhill/base58/benchmarks/Base16Event.php b/vendor/stephenhill/base58/benchmarks/Base16Event.php deleted file mode 100644 index f3ec0034d..000000000 --- a/vendor/stephenhill/base58/benchmarks/Base16Event.php +++ /dev/null @@ -1,24 +0,0 @@ -base58 = new Base58(null, new BCMathService()); - } - - /** - * @iterations 10000 - */ - public function encodeBase58() - { - $this->base58->encode('Hello World'); - } - - /** - * @iterations 10000 - */ - public function decodeBase58() - { - $this->base58->decode('JxF12TrwUP45BMd'); - } -} diff --git a/vendor/stephenhill/base58/benchmarks/Base58GMPEvent.php b/vendor/stephenhill/base58/benchmarks/Base58GMPEvent.php deleted file mode 100644 index d8a4d20bf..000000000 --- a/vendor/stephenhill/base58/benchmarks/Base58GMPEvent.php +++ /dev/null @@ -1,33 +0,0 @@ -base58 = new Base58(null, new GMPService()); - } - - /** - * @iterations 10000 - */ - public function encodeBase58() - { - $this->base58->encode('Hello World'); - } - - /** - * @iterations 10000 - */ - public function decodeBase58() - { - $this->base58->decode('JxF12TrwUP45BMd'); - } -} diff --git a/vendor/stephenhill/base58/benchmarks/Base64Event.php b/vendor/stephenhill/base58/benchmarks/Base64Event.php deleted file mode 100644 index a558968a3..000000000 --- a/vendor/stephenhill/base58/benchmarks/Base64Event.php +++ /dev/null @@ -1,24 +0,0 @@ -=8.1" + }, + "suggest": { + "ext-bcmath": "Required for BC Math support", + "ext-gmp": "Required for GMP support" + }, "require-dev": { - "phpunit/phpunit": "4.*", - "athletic/athletic": "~0.1" + "phpunit/phpunit": "10.*" }, "license": "MIT", "authors": [ @@ -17,8 +23,7 @@ }, "autoload": { "psr-4": { - "StephenHill\\": "src/", - "StephenHill\\Benchmarks\\": "benchmarks/" + "StephenHill\\": "src/" } } } \ No newline at end of file diff --git a/vendor/stephenhill/base58/phpunit.xml b/vendor/stephenhill/base58/phpunit.xml index 06362417f..08c2af717 100644 --- a/vendor/stephenhill/base58/phpunit.xml +++ b/vendor/stephenhill/base58/phpunit.xml @@ -1,31 +1,28 @@ - - - - ./tests/ - - + - - - src - - vendor - - - - + + + tests + + + + + + src + + + + + + + + + \ No newline at end of file diff --git a/vendor/stephenhill/base58/readme.md b/vendor/stephenhill/base58/readme.md index 9723a91dd..94b184682 100644 --- a/vendor/stephenhill/base58/readme.md +++ b/vendor/stephenhill/base58/readme.md @@ -1,15 +1,15 @@ # Base58 Encoding and Decoding Library for PHP -[![Build Status](https://travis-ci.org/stephen-hill/base58php.png)](https://travis-ci.org/stephen-hill/base58php) [![Packagist Release](http://img.shields.io/packagist/v/stephenhill/base58.svg)](https://packagist.org/packages/stephenhill/base58) [![MIT License](http://img.shields.io/packagist/l/stephenhill/base58.svg)](https://github.com/stephen-hill/base58php/blob/master/license) -[![Flattr this](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=stephen-hill&url=https%3A%2F%2Fgithub.com%2Fstephen-hill%2Fbase58php) +[![Action Status](https://github.com/stephen-hill/base58php/actions/workflows/php.yml/badge.svg)](https://github.com/stephen-hill/base58php/actions/workflows/php.yml) ## Long Term Support Each major version of this library will be supported for 5 years after it's initial release. Support will be provided for security and bug fixes. -Version 1 will therefore be supported until the 11th September 2019. +- Version 2 will be supported until the 1st Janurary 2031. +- Version 1 support expired on the 11th September 2019. ## Background @@ -26,8 +26,8 @@ So I decided to create a library with the following goals: This library has the following requirements: -- PHP => 5.3 -- BC Math Extension +- PHP => 8.1 +- GMP or BC Math Extension ## Installation @@ -36,7 +36,7 @@ I recommend you install this library via Composer. ```json { "require": { - "stephenhill/base58": "~1.0" + "stephenhill/base58": "~2.0" } } ``` @@ -87,46 +87,6 @@ This library is tested using PHPUnit. $ bin/phpunit ``` -## Benchmarking - -You can benchmark this library using [Athletic](https://github.com/polyfractal/athletic). -The benchmarking suite also benchmarks PHP's built-in Base64 and Base16 encoding for comparison. - -```bash -$ bin/athletic -p benchmarks -``` - -Example output. - -``` -StephenHill\Benchmarks\Base16Event - Method Name Iterations Average Time Ops/second - ------------ ------------ -------------- ------------- - encodeBase16: [10,000 ] [0.0000010839939] [922,514.40637] - decodeBase16: [10,000 ] [0.0000011516809] [868,296.03561] - - -StephenHill\Benchmarks\Base58BCMathEvent - Method Name Iterations Average Time Ops/second - ------------ ------------ -------------- ------------- - encodeBase58: [10,000 ] [0.0001500048161] [6,666.45263] - decodeBase58: [10,000 ] [0.0001741812706] [5,741.14540] - - -StephenHill\Benchmarks\Base58GMPEvent - Method Name Iterations Average Time Ops/second - ------------ ------------ -------------- ------------- - encodeBase58: [10,000 ] [0.0001168665648] [8,556.76730] - decodeBase58: [10,000 ] [0.0001385705233] [7,216.54199] - - -StephenHill\Benchmarks\Base64Event - Method Name Iterations Average Time Ops/second - ------------ ------------ -------------- ------------- - encodeBase64: [10,000 ] [0.0000009050369] [1,104,927.29189] - decodeBase64: [10,000 ] [0.0000009787321] [1,021,730.04312] -``` - ## Contributing I welcome everyone to contribute to this library. Please see the Contributing document for details. @@ -143,3 +103,5 @@ Some of the unit tests were based on the following: - https://code.google.com/p/bitcoinj/source/browse/core/src/test/java/com/google/bitcoin/core/Base58Test.java - https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/fixtures/base58.json + +In no particular order, I would like to thank the following for pushing me to release a PHP 8 compatible version: @git-marijus, @VandalorumRex, @bacheson, @kalifg diff --git a/vendor/stephenhill/base58/src/BCMathService.php b/vendor/stephenhill/base58/src/BCMathService.php index 329e1ceba..d42433577 100644 --- a/vendor/stephenhill/base58/src/BCMathService.php +++ b/vendor/stephenhill/base58/src/BCMathService.php @@ -24,18 +24,13 @@ class BCMathService implements ServiceInterface * @param string $alphabet optional * @since v1.1.0 */ - public function __construct($alphabet = null) + public function __construct(?string $alphabet = null) { // Handle null alphabet if (is_null($alphabet) === true) { $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'; } - // Type validation - if (is_string($alphabet) === false) { - throw new InvalidArgumentException('Argument $alphabet must be a string.'); - } - // The alphabet must contain 58 characters if (strlen($alphabet) !== 58) { throw new InvalidArgumentException('Argument $alphabet must contain 58 characters.'); @@ -51,13 +46,8 @@ class BCMathService implements ServiceInterface * @since Release v1.1.0 * @return string The Base58 encoded string. */ - public function encode($string) + public function encode(string $string) : string { - // Type validation - if (is_string($string) === false) { - throw new InvalidArgumentException('Argument $string must be a string.'); - } - // If the string is empty, then the encoded string is obviously empty if (strlen($string) === 0) { return ''; @@ -113,13 +103,8 @@ class BCMathService implements ServiceInterface * @since Release v1.1.0 * @return string Returns the decoded string. */ - public function decode($base58) + public function decode(string $base58) : string { - // Type Validation - if (is_string($base58) === false) { - throw new InvalidArgumentException('Argument $base58 must be a string.'); - } - // If the string is empty, then the decoded string is obviously empty if (strlen($base58) === 0) { return ''; diff --git a/vendor/stephenhill/base58/src/Base58.php b/vendor/stephenhill/base58/src/Base58.php index 2b44b22b2..1c2119e54 100644 --- a/vendor/stephenhill/base58/src/Base58.php +++ b/vendor/stephenhill/base58/src/Base58.php @@ -20,6 +20,12 @@ class Base58 */ protected $service; + /** + * @var StephenHill\Base58 + * @since v2.1.0 + */ + private static $instance; + /** * Constructor * @@ -29,19 +35,14 @@ class Base58 * @since v1.1.0 Added the optional $service argument. */ public function __construct( - string|null $alphabet = null, - ServiceInterface|null $service = null + ?string $alphabet = null, + ?ServiceInterface $service = null ) { // Handle null alphabet if (is_null($alphabet) === true) { $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'; } - // Type validation - if (is_string($alphabet) === false) { - throw new InvalidArgumentException('Argument $alphabet must be a string.'); - } - // The alphabet must contain 58 characters if (strlen($alphabet) !== 58) { throw new InvalidArgumentException('Argument $alphabet must contain 58 characters.'); @@ -71,7 +72,7 @@ class Base58 * @since v1.0.0 * @return string The Base58 encoded string. */ - public function encode($string) + public function encode(string $string) : string { return $this->service->encode($string); } @@ -83,8 +84,35 @@ class Base58 * @since v1.0.0 * @return string Returns the decoded string. */ - public function decode($base58) + public function decode(string $base58) : string { return $this->service->decode($base58); } + + /** + * Return a new instance of the Base58 class using the default arguments. + * + * @since v2.1.0 + * @return StephenHill\Base58 + */ + public static function create() + { + return new self(); + } + + /** + * Return a singleton instance of the Base58 class using the default arguments. + * + * @since v2.1.0 + * @return StephenHill\Base58 + */ + public static function singleton() + { + if (isset(self::$instance) === false) + { + self::$instance = new self(); + } + + return self::$instance; + } } diff --git a/vendor/stephenhill/base58/src/GMPService.php b/vendor/stephenhill/base58/src/GMPService.php index 0dde30594..60a8d19c9 100644 --- a/vendor/stephenhill/base58/src/GMPService.php +++ b/vendor/stephenhill/base58/src/GMPService.php @@ -24,18 +24,13 @@ class GMPService implements ServiceInterface * @param string $alphabet optional * @since v1.1.0 */ - public function __construct($alphabet = null) + public function __construct(?string $alphabet = null) { // Handle null alphabet if (is_null($alphabet) === true) { $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'; } - // Type validation - if (is_string($alphabet) === false) { - throw new InvalidArgumentException('Argument $alphabet must be a string.'); - } - // The alphabet must contain 58 characters if (strlen($alphabet) !== 58) { throw new InvalidArgumentException('Argument $alphabet must contain 58 characters.'); @@ -51,13 +46,8 @@ class GMPService implements ServiceInterface * @since Release v1.1.0 * @return string The Base58 encoded string. */ - public function encode($string) + public function encode(string $string) : string { - // Type validation - if (is_string($string) === false) { - throw new InvalidArgumentException('Argument $string must be a string.'); - } - // If the string is empty, then the encoded string is obviously empty if (strlen($string) === 0) { return ''; @@ -105,13 +95,8 @@ class GMPService implements ServiceInterface * @since Release v1.1.0 * @return string Returns the decoded string. */ - public function decode($base58) + public function decode(string $base58) : string { - // Type Validation - if (is_string($base58) === false) { - throw new InvalidArgumentException('Argument $base58 must be a string.'); - } - // If the string is empty, then the decoded string is obviously empty if (strlen($base58) === 0) { return ''; diff --git a/vendor/stephenhill/base58/src/ServiceInterface.php b/vendor/stephenhill/base58/src/ServiceInterface.php index 0fe374524..71ccf845f 100644 --- a/vendor/stephenhill/base58/src/ServiceInterface.php +++ b/vendor/stephenhill/base58/src/ServiceInterface.php @@ -11,7 +11,7 @@ interface ServiceInterface * @since v1.1.0 * @return string The Base58 encoded string. */ - public function encode($string); + public function encode(string $string) : string; /** * Decode base58 into a PHP string. @@ -20,5 +20,5 @@ interface ServiceInterface * @since v1.1.0 * @return string Returns the decoded string. */ - public function decode($base58); + public function decode(string $base58) : string; }