Skip to content

Commit 7c28042

Browse files
onlionli
authored
Update to smarty 5 (#865)
* 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
1 parent a78a33f commit 7c28042

File tree

577 files changed

+32953
-33992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

577 files changed

+32953
-33992
lines changed

‎bundled-libs/composer/autoload_classmap.php

+163-169
Large diffs are not rendered by default.

‎bundled-libs/composer/autoload_files.php

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
$baseDir = dirname($vendorDir);
77

88
return array(
9+
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
910
'757772e28a0943a9afe83def8db95bdf' => $vendorDir . '/mf2/mf2/Mf2/Parser.php',
1011
'9e71c1459ef1226520e4b26dac3a180d' => $vendorDir . '/php81_bc/strftime/src/php-8.1-strftime.php',
12+
'c15d4a1253e33e055d05e547c61dcb71' => $vendorDir . '/smarty/smarty/src/functions.php',
1113
);

‎bundled-libs/composer/autoload_psr4.php

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
return array(
99
'voku\\cache\\' => array($vendorDir . '/voku/simple-cache/src/voku/cache'),
10+
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
11+
'Smarty\\' => array($vendorDir . '/smarty/smarty/src'),
1012
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
1113
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
1214
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),

‎bundled-libs/composer/autoload_real.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static function getLoader()
3535
require __DIR__ . '/autoload_static.php';
3636
call_user_func(\Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::getInitializer($loader));
3737

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

4141
$filesToLoad = \Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::$files;

‎bundled-libs/composer/autoload_static.php

+178-169
Large diffs are not rendered by default.

‎bundled-libs/composer/installed.json

+100-13
Original file line numberDiff line numberDiff line change
@@ -597,38 +597,42 @@
597597
},
598598
{
599599
"name": "smarty/smarty",
600-
"version": "v4.3.5",
601-
"version_normalized": "4.3.5.0",
600+
"version": "v5.4.3",
601+
"version_normalized": "5.4.3.0",
602602
"source": {
603603
"type": "git",
604604
"url": "https://github.com/smarty-php/smarty.git",
605-
"reference": "e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c"
605+
"reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e"
606606
},
607607
"dist": {
608608
"type": "zip",
609-
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c",
610-
"reference": "e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c",
609+
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/c6bff5795081ca5e60aabda59fb87daa511acd1e",
610+
"reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e",
611611
"shasum": ""
612612
},
613613
"require": {
614-
"php": "^7.1 || ^8.0"
614+
"php": "^7.2 || ^8.0",
615+
"symfony/polyfill-mbstring": "^1.27"
615616
},
616617
"require-dev": {
617618
"phpunit/phpunit": "^8.5 || ^7.5",
618-
"smarty/smarty-lexer": "^3.1"
619+
"smarty/smarty-lexer": "^4.0.2"
619620
},
620-
"time": "2024-01-23T10:47:54+00:00",
621+
"time": "2024-12-23T00:38:44+00:00",
621622
"type": "library",
622623
"extra": {
623624
"branch-alias": {
624-
"dev-master": "4.0.x-dev"
625+
"dev-master": "5.0.x-dev"
625626
}
626627
},
627628
"installation-source": "dist",
628629
"autoload": {
629-
"classmap": [
630-
"libs/"
631-
]
630+
"files": [
631+
"src/functions.php"
632+
],
633+
"psr-4": {
634+
"Smarty\\": "src/"
635+
}
632636
},
633637
"notification-url": "https://packagist.org/downloads/",
634638
"license": [
@@ -660,10 +664,93 @@
660664
"support": {
661665
"forum": "https://github.com/smarty-php/smarty/discussions",
662666
"issues": "https://github.com/smarty-php/smarty/issues",
663-
"source": "https://github.com/smarty-php/smarty/tree/v4.3.5"
667+
"source": "https://github.com/smarty-php/smarty/tree/v5.4.3"
664668
},
665669
"install-path": "../smarty/smarty"
666670
},
671+
{
672+
"name": "symfony/polyfill-mbstring",
673+
"version": "v1.31.0",
674+
"version_normalized": "1.31.0.0",
675+
"source": {
676+
"type": "git",
677+
"url": "https://github.com/symfony/polyfill-mbstring.git",
678+
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
679+
},
680+
"dist": {
681+
"type": "zip",
682+
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
683+
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
684+
"shasum": ""
685+
},
686+
"require": {
687+
"php": ">=7.2"
688+
},
689+
"provide": {
690+
"ext-mbstring": "*"
691+
},
692+
"suggest": {
693+
"ext-mbstring": "For best performance"
694+
},
695+
"time": "2024-09-09T11:45:10+00:00",
696+
"type": "library",
697+
"extra": {
698+
"thanks": {
699+
"url": "https://github.com/symfony/polyfill",
700+
"name": "symfony/polyfill"
701+
}
702+
},
703+
"installation-source": "dist",
704+
"autoload": {
705+
"files": [
706+
"bootstrap.php"
707+
],
708+
"psr-4": {
709+
"Symfony\\Polyfill\\Mbstring\\": ""
710+
}
711+
},
712+
"notification-url": "https://packagist.org/downloads/",
713+
"license": [
714+
"MIT"
715+
],
716+
"authors": [
717+
{
718+
"name": "Nicolas Grekas",
719+
"email": "p@tchwork.com"
720+
},
721+
{
722+
"name": "Symfony Community",
723+
"homepage": "https://symfony.com/contributors"
724+
}
725+
],
726+
"description": "Symfony polyfill for the Mbstring extension",
727+
"homepage": "https://symfony.com",
728+
"keywords": [
729+
"compatibility",
730+
"mbstring",
731+
"polyfill",
732+
"portable",
733+
"shim"
734+
],
735+
"support": {
736+
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
737+
},
738+
"funding": [
739+
{
740+
"url": "https://symfony.com/sponsor",
741+
"type": "custom"
742+
},
743+
{
744+
"url": "https://github.com/fabpot",
745+
"type": "github"
746+
},
747+
{
748+
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
749+
"type": "tidelift"
750+
}
751+
],
752+
"install-path": "../symfony/polyfill-mbstring"
753+
},
667754
{
668755
"name": "voku/simple-cache",
669756
"version": "4.1.0",

‎bundled-libs/composer/installed.php

+14-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 's9y/serendipity',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '1c75f6692d9e6c69e2152dc4e9348759a3db8daf',
6+
'reference' => '3734df1293d92a06d20881f12018113eae617005',
77
'type' => 's9y-core',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -109,21 +109,30 @@
109109
's9y/serendipity' => array(
110110
'pretty_version' => 'dev-master',
111111
'version' => 'dev-master',
112-
'reference' => '1c75f6692d9e6c69e2152dc4e9348759a3db8daf',
112+
'reference' => '3734df1293d92a06d20881f12018113eae617005',
113113
'type' => 's9y-core',
114114
'install_path' => __DIR__ . '/../../',
115115
'aliases' => array(),
116116
'dev_requirement' => false,
117117
),
118118
'smarty/smarty' => array(
119-
'pretty_version' => 'v4.3.5',
120-
'version' => '4.3.5.0',
121-
'reference' => 'e0cbbdf6ea21768d0194e59d2f8c2e20d5f0868c',
119+
'pretty_version' => 'v5.4.3',
120+
'version' => '5.4.3.0',
121+
'reference' => 'c6bff5795081ca5e60aabda59fb87daa511acd1e',
122122
'type' => 'library',
123123
'install_path' => __DIR__ . '/../smarty/smarty',
124124
'aliases' => array(),
125125
'dev_requirement' => false,
126126
),
127+
'symfony/polyfill-mbstring' => array(
128+
'pretty_version' => 'v1.31.0',
129+
'version' => '1.31.0.0',
130+
'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341',
131+
'type' => 'library',
132+
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
133+
'aliases' => array(),
134+
'dev_requirement' => false,
135+
),
127136
'voku/simple-cache' => array(
128137
'pretty_version' => '4.1.0',
129138
'version' => '4.1.0.0',

‎bundled-libs/composer/platform_check.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
$issues = array();
66

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

1111
if ($issues) {

0 commit comments

Comments
 (0)