Skip to content

Commit

Permalink
Update to smarty 5 (#865)
Browse files Browse the repository at this point in the history
* smarty update to 5.4.3 in bundled_libs/

* Fixes for the smarty integration for v5

* Fix entry creation by restoring smarty access to PHP modifiers
Also removes unused code from the smarty security wrapper

* Fix second constant definition of SMARTY_DIR

* Fix plugin upgrade page, smarty version check failed

* Init smarty test

* Add tests for some smarty functions

* Fix serendipity_detectLang error when no lang is set
Happens in a test environment

* Try fix for PHP 8.1 strftime test

* Try alternative PHP 8.1 strftime test fix

* Try alternative PHP 8.1 strftime fix

* Drop broken formatTime test
Fails on PHP 8.1, though it should work

* Add PHP function and modifier test

* Document smarty upgrade
  • Loading branch information
onli authored Jan 31, 2025
1 parent a78a33f commit 7c28042
Show file tree
Hide file tree
Showing 577 changed files with 32,953 additions and 33,992 deletions.
332 changes: 163 additions & 169 deletions bundled-libs/composer/autoload_classmap.php

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions bundled-libs/composer/autoload_files.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
$baseDir = dirname($vendorDir);

return array(
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'757772e28a0943a9afe83def8db95bdf' => $vendorDir . '/mf2/mf2/Mf2/Parser.php',
'9e71c1459ef1226520e4b26dac3a180d' => $vendorDir . '/php81_bc/strftime/src/php-8.1-strftime.php',
'c15d4a1253e33e055d05e547c61dcb71' => $vendorDir . '/smarty/smarty/src/functions.php',
);
2 changes: 2 additions & 0 deletions bundled-libs/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

return array(
'voku\\cache\\' => array($vendorDir . '/voku/simple-cache/src/voku/cache'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
'Smarty\\' => array($vendorDir . '/smarty/smarty/src'),
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
Expand Down
2 changes: 1 addition & 1 deletion bundled-libs/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static function getLoader()
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::getInitializer($loader));

$loader->setApcuPrefix('r2+EHEPg0eh7Zqg6S7lL2');
$loader->setApcuPrefix('dbdd5152a690720408f5');
$loader->register(true);

$filesToLoad = \Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::$files;
Expand Down
347 changes: 178 additions & 169 deletions bundled-libs/composer/autoload_static.php

Large diffs are not rendered by default.

113 changes: 100 additions & 13 deletions bundled-libs/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -597,38 +597,42 @@
},
{
"name": "smarty/smarty",
"version": "v4.3.5",
"version_normalized": "4.3.5.0",
"version": "v5.4.3",
"version_normalized": "5.4.3.0",
"source": {
"type": "git",
"url": "https://github.com/smarty-php/smarty.git",
"reference": "e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c"
"reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c",
"reference": "e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/c6bff5795081ca5e60aabda59fb87daa511acd1e",
"reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
"php": "^7.2 || ^8.0",
"symfony/polyfill-mbstring": "^1.27"
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^7.5",
"smarty/smarty-lexer": "^3.1"
"smarty/smarty-lexer": "^4.0.2"
},
"time": "2024-01-23T10:47:54+00:00",
"time": "2024-12-23T00:38:44+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0.x-dev"
"dev-master": "5.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"classmap": [
"libs/"
]
"files": [
"src/functions.php"
],
"psr-4": {
"Smarty\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
Expand Down Expand Up @@ -660,10 +664,93 @@
"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.5"
"source": "https://github.com/smarty-php/smarty/tree/v5.4.3"
},
"install-path": "../smarty/smarty"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.31.0",
"version_normalized": "1.31.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"time": "2024-09-09T11:45:10+00:00",
"type": "library",
"extra": {
"thanks": {
"url": "https://github.com/symfony/polyfill",
"name": "symfony/polyfill"
}
},
"installation-source": "dist",
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "[email protected]"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"install-path": "../symfony/polyfill-mbstring"
},
{
"name": "voku/simple-cache",
"version": "4.1.0",
Expand Down
19 changes: 14 additions & 5 deletions bundled-libs/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 's9y/serendipity',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '1c75f6692d9e6c69e2152dc4e9348759a3db8daf',
'reference' => '3734df1293d92a06d20881f12018113eae617005',
'type' => 's9y-core',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -109,21 +109,30 @@
's9y/serendipity' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '1c75f6692d9e6c69e2152dc4e9348759a3db8daf',
'reference' => '3734df1293d92a06d20881f12018113eae617005',
'type' => 's9y-core',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev_requirement' => false,
),
'smarty/smarty' => array(
'pretty_version' => 'v4.3.5',
'version' => '4.3.5.0',
'reference' => 'e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c',
'pretty_version' => 'v5.4.3',
'version' => '5.4.3.0',
'reference' => 'c6bff5795081ca5e60aabda59fb87daa511acd1e',
'type' => 'library',
'install_path' => __DIR__ . '/../smarty/smarty',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-mbstring' => array(
'pretty_version' => 'v1.31.0',
'version' => '1.31.0.0',
'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
'aliases' => array(),
'dev_requirement' => false,
),
'voku/simple-cache' => array(
'pretty_version' => '4.1.0',
'version' => '4.1.0.0',
Expand Down
4 changes: 2 additions & 2 deletions bundled-libs/composer/platform_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

$issues = array();

if (!(PHP_VERSION_ID >= 70100)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.';
if (!(PHP_VERSION_ID >= 70200)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
}

if ($issues) {
Expand Down
Loading

0 comments on commit 7c28042

Please sign in to comment.