[TikiWiki-commits] [Git][tikiwiki/tiki][master] [UPD] Update SmartyLint package and switch to Packagist version
"ushindi bienvenu \(@usbbush\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <69eb5388a136a_3818ec6411328@gitlab-sidekiq-low-urgency-cpu-bound-v2-d58b9958b-rtwjb.mail> |
ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
38a01438 by ushindi bienvenu at 2026-04-24T11:19:28+00:00
[UPD] Update SmartyLint package and switch to Packagist version
---
* [UPD] Update SmartyLint package and switch to Packagist version
* [UPD] Update SmartyLint package
See merge request tikiwiki/tiki!7499
- - - - -
8 changed files:
- .gitlab-ci.yml
- installer/composer-patches/README.md
- installer/composer-patches/composer-patches.json
- − installer/composer-patches/smartylint-php8.1-and-other-fixes.patch
- − installer/composer-patches/smartylint-warning-curly-bracket.patch
- vendor_bundled/composer.json
- vendor_bundled/composer.lock
- vendor_bundled/patches.lock.json
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -229,7 +229,7 @@ smarty-lint:
- composer
image: ${DEPENDENCY_PROXY_PREFIX}${BASE_QA_IMAGE}
script:
- - php vendor_bundled/vendor/umakantp/smartylint/smartyl -p --files=lib/test,templates,themes --rules=doc/devtools/smartyl.rules.xml
+ - php vendor_bundled/vendor/smarty/smarty-lint/smartyl -p --files=lib/test,templates,themes --rules=doc/devtools/smartyl.rules.xml
smarty-syntax-check:
stage: code-quality
=====================================
installer/composer-patches/README.md
=====================================
@@ -35,23 +35,6 @@ __Fix visibility issues.__
We will get rid of this patch soon, after the replacement of jQuery.sheet (aka WickedGrid) with a more modern solution.
-### [smartylint-php8.1-and-other-fixes.patch](./smartylint-php8.1-and-other-fixes.patch)
-__Fix smartylint PHP 8.1 support and other fixes.__
-
-SmartyLint seems to be very old not getting any updates since a period over 9 years, so, this patch is valuable. It fixes the following points:
-* Ensure that the `auto_detect_line_endings` INI directive isn't set for PHP version 8.1 and greater.
-* Fixes the iterator wrongly incremented in the lib.
-* Fix the issue: assignement to undefined variable $iPointer.
-
-Related:
-* https://github.com/smarty-php/smarty/discussions/951
-* https://github.com/umakantp/SmartyLint/issues/3
-
-### [smartylint-warning-curly-bracket.patch](./smartylint-warning-curly-bracket.patch)
-__Fix smartylint syntax with curly braces.__
-
-Related to the previous one, this patch replaces the usage of curly-braces syntax to access element or character at a specific index in an array or a string with the square bracket syntax.
-
### [xmpp-prebind-php__php8fixes.patch](./xmpp-prebind-php__php8fixes.patch)
__Removed string access with curly braces syntax in PHP8.__
=====================================
installer/composer-patches/composer-patches.json
=====================================
@@ -8,10 +8,6 @@
},
"nicolaskruchten/pivottable": {
"Sort rows and columns by key_z_to_a and Drag and drop via touch": "../installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a_and_drag_and_drop_via_touch.patch"
- },
- "umakantp/smartylint": {
- "Fix smartylint syntax with curly braces": "../installer/composer-patches/smartylint-warning-curly-bracket.patch",
- "Fix smartylint PHP 8.1 support and other fixes": "../installer/composer-patches/smartylint-php8.1-and-other-fixes.patch"
}
}
}
=====================================
installer/composer-patches/smartylint-php8.1-and-other-fixes.patch deleted
=====================================
@@ -1,56 +0,0 @@
-commit b2163c24c9e313991d481d7002dbfa0be9f56065
-Author: SoftStart Code <code-NHSG37FGo5wS/6/[email protected]>
-Date: Mon Dec 12 00:31:38 2022 +0000
-
- Multiple FIX, mostly PHP8.1 related, but also some functional issues in Tokenizer
-
-diff --git a/SmartyLint.php b/SmartyLint.php
-index 8908d28..0e7e12a 100644
---- a/SmartyLint.php
-+++ b/SmartyLint.php
-@@ -352,7 +352,9 @@ class SmartyLint {
-
- // Ensure this option is enabled or else line endings will not always
- // be detected properly for files created on a Mac with the /r line ending.
-- ini_set('auto_detect_line_endings', true);
-+ if (\PHP_VERSION_ID < 80100) {
-+ ini_set('auto_detect_line_endings', true);
-+ }
-
- $this->setTokenListeners($rules);
- $this->populateRules($rules);
-diff --git a/SmartyLint/File.php b/SmartyLint/File.php
-index 019797c..023982d 100644
---- a/SmartyLint/File.php
-+++ b/SmartyLint/File.php
-@@ -652,7 +652,7 @@ class SmartyLint_File {
- public static function tokenizeString(
- $string,
- $tokenizer,
-- $eolChar='\n',
-+ $eolChar,
- $leftD,
- $rightD,
- $autoLiteral
-diff --git a/SmartyLint/Tokenizer/Smarty.php b/SmartyLint/Tokenizer/Smarty.php
-index 564960a..075e3a0 100644
---- a/SmartyLint/Tokenizer/Smarty.php
-+++ b/SmartyLint/Tokenizer/Smarty.php
-@@ -151,7 +151,7 @@ class SmartyLint_Tokenizer_Smarty {
-
- case '<':
- $k = isset($data[($j + 1)]) ? $data[($j + 1)] : null;
-- $l = isset($data[($k + 1)]) ? $data[($k + 1)] : null;
-+ $l = isset($data[($j + 2)]) ? $data[($j + 2)] : null;
- $multi = false;
- if ($next === '!' && $k === $l && $l === '-') {
- // HTML comment found. Keep adding to content until it ends.
-@@ -173,7 +173,7 @@ class SmartyLint_Tokenizer_Smarty {
- $k = isset($data[($i + 2)]) ?: $data[($i + 2)];
- }
- $content .= $char . $next . $k;
-- $i = $iPointer;
-+ //$i = $iPointer;
- $token['content'] = $content;
- if ($multi) {
- $token['multi'] = true;
=====================================
installer/composer-patches/smartylint-warning-curly-bracket.patch deleted
=====================================
@@ -1,71 +0,0 @@
-commit 00f4bee051fc7c0b87e907d8d6fb0506c0ca203c
-Author: SoftStart Code <code-NHSG37FGo5wS/6/[email protected]>
-Date: Sun Dec 11 23:39:26 2022 +0000
-
- [FIX] Warnings for curly brackets access is deprecated
-
-diff --git a/SmartyLint/Cli.php b/SmartyLint/Cli.php
-index a72aae5..e691296 100644
---- a/SmartyLint/Cli.php
-+++ b/SmartyLint/Cli.php
-@@ -70,14 +70,14 @@ class SmartyLint_Cli {
- continue;
- }
-
-- if ($arg{0} === '-') {
-+ if ($arg[0] === '-') {
- if ($arg === '-' || $arg === '--') {
- // Empty argument, ignore it.
- continue;
- }
-
-
-- if ($arg{1} === '-') {
-+ if ($arg[1] === '-') {
- $values
- = $this->processLongArgument(substr($arg, 2), $i, $values);
- } else {
-@@ -186,7 +186,7 @@ class SmartyLint_Cli {
- */
- public function processUnknownArgument($arg, $pos, $values) {
- // We don't know about any additional switches; just files.
-- if ($arg{0} === '-') {
-+ if ($arg[0] === '-') {
- echo 'ERROR: option "'.$arg.'" not known.'.PHP_EOL.PHP_EOL;
- $this->printUsage();
- exit(2);
-diff --git a/SmartyLint/CommentParser/CommentElement.php b/SmartyLint/CommentParser/CommentElement.php
-index b9e86c2..00c8800 100644
---- a/SmartyLint/CommentParser/CommentElement.php
-+++ b/SmartyLint/CommentParser/CommentElement.php
-@@ -134,7 +134,7 @@ class SmartyLint_CommentParser_CommentElement extends SmartyLint_CommentParser_S
- for ($i = $pos; $i < $count; $i++) {
- $content = trim($this->tokens[$i]);
- if ($content !== '') {
-- if ($content{0} === '@') {
-+ if ($content[0] === '@') {
- return -1;
- }
-
-diff --git a/SmartyLint/CommentParser/FileCommentParser.php b/SmartyLint/CommentParser/FileCommentParser.php
-index 6116dc0..dac4787 100644
---- a/SmartyLint/CommentParser/FileCommentParser.php
-+++ b/SmartyLint/CommentParser/FileCommentParser.php
-@@ -158,7 +158,7 @@ class SmartyLint_CommentParser_FileCommentParser {
- $line = substr($line, $lEnd);
- } else if (substr($line, -($rEnd), $rEnd) === ('*'.$this->smartylFile->rDelimiter)) {
- $line = substr($line, 0, -($rEnd));
-- } else if ($line{0} === '*') {
-+ } else if ($line[0] === '*') {
- $line = substr($line, 1);
- }
-
-@@ -197,7 +197,7 @@ class SmartyLint_CommentParser_FileCommentParser {
- if (trim($word) !== '') {
- $wordWasEmpty = false;
- }
-- if ($word{0} === '@') {
-+ if ($word[0] === '@') {
- $tag = substr($word, 1);
-
- // Filter out @ tags in the comment description.
=====================================
vendor_bundled/composer.json
=====================================
@@ -299,10 +299,10 @@
"rector/rector": "~2.0",
"sebastian/diff": "~5.1",
"squizlabs/php_codesniffer": "~4.0",
+ "smarty/smarty-lint" : "~0.3",
"stevegrunwell/phpunit-markup-assertions": "~2.0",
"symfony/browser-kit": "~6.4",
- "symfony/http-client": "~6.4",
- "umakantp/smartylint": "0.1.4-p1"
+ "symfony/http-client": "~6.4"
},
"extra": {
"composer-patches": {
@@ -539,7 +539,6 @@
"only": [
"openannotation/annotator",
"jquery/jquery-sheet",
- "umakantp/smartylint",
"bower-asset/wodo.texteditor"
]
}
=====================================
vendor_bundled/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": "e5758feed1d143e5b77722048fa30eb8",
+ "content-hash": "27fec80f8035cd7aee966c9542985a37",
"packages": [
{
"name": "amphp/amp",
@@ -741,16 +741,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.379.3",
+ "version": "3.379.6",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "54a7dbb04489a8b330db64ec07c1f658c9262433"
+ "reference": "587f0bafd28a7dc3395b0c55f93f2474657767e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/54a7dbb04489a8b330db64ec07c1f658c9262433",
- "reference": "54a7dbb04489a8b330db64ec07c1f658c9262433",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/587f0bafd28a7dc3395b0c55f93f2474657767e2",
+ "reference": "587f0bafd28a7dc3395b0c55f93f2474657767e2",
"shasum": ""
},
"require": {
@@ -832,9 +832,9 @@
"support": {
"forum": "https://github.com/aws/aws-sdk-php/discussions",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.379.3"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.379.6"
},
- "time": "2026-04-20T18:13:51+00:00"
+ "time": "2026-04-23T18:11:11+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -3293,12 +3293,12 @@
"source": {
"type": "git",
"url": "https://github.com/cypht-org/cypht.git",
- "reference": "8b224bdbb43365103270bae77b104d1f50da0703"
+ "reference": "62f1ab35aebf56c6768dfdecc8c94f9b6143ba5e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cypht-org/cypht/zipball/8b224bdbb43365103270bae77b104d1f50da0703",
- "reference": "8b224bdbb43365103270bae77b104d1f50da0703",
+ "url": "https://api.github.com/repos/cypht-org/cypht/zipball/62f1ab35aebf56c6768dfdecc8c94f9b6143ba5e",
+ "reference": "62f1ab35aebf56c6768dfdecc8c94f9b6143ba5e",
"shasum": ""
},
"require": {
@@ -3376,7 +3376,7 @@
"source": "https://github.com/cypht-org/cypht/",
"wiki": "https://github.com/cypht-org/cypht/wiki"
},
- "time": "2026-04-20T12:43:29+00:00"
+ "time": "2026-04-24T10:45:02+00:00"
},
{
"name": "jean85/pretty-package-versions",
@@ -3529,16 +3529,16 @@
},
{
"name": "kaltura/api-client-library",
- "version": "v22.16.0",
+ "version": "v22.17.0",
"source": {
"type": "git",
"url": "https://github.com/kaltura/KalturaGeneratedAPIClientsPHP53.git",
- "reference": "bceca3294bbaeae1d04ac75ac64b565084681312"
+ "reference": "62e2c219da7a351f1925b1b517c1703ca9f5fd4a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kaltura/KalturaGeneratedAPIClientsPHP53/zipball/bceca3294bbaeae1d04ac75ac64b565084681312",
- "reference": "bceca3294bbaeae1d04ac75ac64b565084681312",
+ "url": "https://api.github.com/repos/kaltura/KalturaGeneratedAPIClientsPHP53/zipball/62e2c219da7a351f1925b1b517c1703ca9f5fd4a",
+ "reference": "62e2c219da7a351f1925b1b517c1703ca9f5fd4a",
"shasum": ""
},
"require": {
@@ -3571,9 +3571,9 @@
],
"support": {
"issues": "https://github.com/kaltura/KalturaGeneratedAPIClientsPHP53/issues",
- "source": "https://github.com/kaltura/KalturaGeneratedAPIClientsPHP53/tree/v22.16.0"
+ "source": "https://github.com/kaltura/KalturaGeneratedAPIClientsPHP53/tree/v22.17.0"
},
- "time": "2026-03-29T06:07:42+00:00"
+ "time": "2026-04-12T06:27:15+00:00"
},
{
"name": "laminas/laminas-captcha",
@@ -11751,16 +11751,16 @@
},
{
"name": "sentry/sentry",
- "version": "4.24.0",
+ "version": "4.25.0",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
- "reference": "5055cc792f630a427fdf9dcccd88faa94b50fd30"
+ "reference": "bfee3381e1f6dea8a5f3a18adba6419fe81c5f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/5055cc792f630a427fdf9dcccd88faa94b50fd30",
- "reference": "5055cc792f630a427fdf9dcccd88faa94b50fd30",
+ "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/bfee3381e1f6dea8a5f3a18adba6419fe81c5f54",
+ "reference": "bfee3381e1f6dea8a5f3a18adba6419fe81c5f54",
"shasum": ""
},
"require": {
@@ -11792,6 +11792,7 @@
"spiral/roadrunner-worker": "^3.6"
},
"suggest": {
+ "ext-excimer": "Enable Sentry profiling with the Excimer PHP extension.",
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
},
"type": "library",
@@ -11828,7 +11829,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
- "source": "https://github.com/getsentry/sentry-php/tree/4.24.0"
+ "source": "https://github.com/getsentry/sentry-php/tree/4.25.0"
},
"funding": [
{
@@ -11840,20 +11841,20 @@
"type": "custom"
}
],
- "time": "2026-04-01T14:34:34+00:00"
+ "time": "2026-04-23T12:50:03+00:00"
},
{
"name": "smalot/pdfparser",
- "version": "v2.12.4",
+ "version": "v2.12.5",
"source": {
"type": "git",
"url": "https://github.com/smalot/pdfparser.git",
- "reference": "028d7cc0ceff323bc001d763caa2bbdf611866c4"
+ "reference": "2cfa0d92bd557875c9f52a75fde0e8392302a354"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/smalot/pdfparser/zipball/028d7cc0ceff323bc001d763caa2bbdf611866c4",
- "reference": "028d7cc0ceff323bc001d763caa2bbdf611866c4",
+ "url": "https://api.github.com/repos/smalot/pdfparser/zipball/2cfa0d92bd557875c9f52a75fde0e8392302a354",
+ "reference": "2cfa0d92bd557875c9f52a75fde0e8392302a354",
"shasum": ""
},
"require": {
@@ -11889,9 +11890,9 @@
],
"support": {
"issues": "https://github.com/smalot/pdfparser/issues",
- "source": "https://github.com/smalot/pdfparser/tree/v2.12.4"
+ "source": "https://github.com/smalot/pdfparser/tree/v2.12.5"
},
- "time": "2026-03-10T15:39:47+00:00"
+ "time": "2026-04-17T11:37:58+00:00"
},
{
"name": "smarty/smarty",
@@ -18165,11 +18166,11 @@
},
{
"name": "phpstan/phpstan",
- "version": "2.1.50",
+ "version": "2.1.51",
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d452086fb4cf648c6b2d8cf3b639351f79e4f3e2",
- "reference": "d452086fb4cf648c6b2d8cf3b639351f79e4f3e2",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc3b523c45e714c70de2ac5113b958223b55dc59",
+ "reference": "dc3b523c45e714c70de2ac5113b958223b55dc59",
"shasum": ""
},
"require": {
@@ -18214,7 +18215,7 @@
"type": "github"
}
],
- "time": "2026-04-17T13:10:32+00:00"
+ "time": "2026-04-21T18:22:01+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -19709,6 +19710,53 @@
],
"time": "2023-02-07T11:34:05+00:00"
},
+ {
+ "name": "smarty/smarty-lint",
+ "version": "v0.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/umakantp/SmartyLint.git",
+ "reference": "db59610dc006a723684f267e6a8603da8f49441a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/umakantp/SmartyLint/zipball/db59610dc006a723684f267e6a8603da8f49441a",
+ "reference": "db59610dc006a723684f267e6a8603da8f49441a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Umakantp\\SmartyLint\\": "SmartLint/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Umakant Patil",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "SmartyLint is a PHP tool that helps you find issues in your Smarty template files. It's designed to assist you in writing cleaner and more consistent Smarty templates",
+ "homepage": "https://github.com/umakantp/SmartyLint",
+ "keywords": [
+ "lint",
+ "php",
+ "smarty",
+ "template"
+ ],
+ "support": {
+ "issues": "https://github.com/umakantp/SmartyLint/issues",
+ "source": "https://github.com/umakantp/SmartyLint/tree/v0.3.1"
+ },
+ "time": "2026-04-22T09:51:14+00:00"
+ },
{
"name": "squizlabs/php_codesniffer",
"version": "4.0.1",
@@ -20041,16 +20089,6 @@
}
],
"time": "2025-11-17T20:03:58+00:00"
- },
- {
- "name": "umakantp/smartylint",
- "version": "0.1.4-p1",
- "dist": {
- "type": "zip",
- "url": "https://composer.tiki.org/dist/umakantp/smartylint/umakantp-smartylint-0.1.4-p1.zip",
- "shasum": "db8c31c54599c95dcdd74d6b3ba6d60563dc7100"
- },
- "type": "library"
}
],
"aliases": [],
@@ -20078,7 +20116,7 @@
"ext-openssl": "*",
"ext-zip": "*"
},
- "platform-dev": [],
+ "platform-dev": {},
"platform-overrides": {
"php": "8.1",
"ext-ldap": "0",
@@ -20086,5 +20124,5 @@
"ext-sockets": "0",
"ext-ftp": "0"
},
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.9.0"
}
=====================================
vendor_bundled/patches.lock.json
=====================================
@@ -1,5 +1,5 @@
{
- "_hash": "6112759526c6c00b6c90c3c8f873596a81a3dd7c24c4d8617dffe8c560a27a65",
+ "_hash": "647a76690f5116d60935257f728859cc50963adf4d5c073bafb8b28fcc58b2f8",
"patches": {
"candy-chat/xmpp-prebind-php": [
{
@@ -36,28 +36,6 @@
"provenance": "patches-file:../installer/composer-patches/composer-patches.json"
}
}
- ],
- "umakantp/smartylint": [
- {
- "package": "umakantp/smartylint",
- "description": "Fix smartylint syntax with curly braces",
- "url": "../installer/composer-patches/smartylint-warning-curly-bracket.patch",
- "sha256": "50b5f06e2677a89c8911957e6173ff86bd490e9f7b2a732123a077aa80a2e110",
- "depth": 1,
- "extra": {
- "provenance": "patches-file:../installer/composer-patches/composer-patches.json"
- }
- },
- {
- "package": "umakantp/smartylint",
- "description": "Fix smartylint PHP 8.1 support and other fixes",
- "url": "../installer/composer-patches/smartylint-php8.1-and-other-fixes.patch",
- "sha256": "4d6756c3c950e3bfc2e7009be37837c52bb70a2823240a45a0e7eec468745dec",
- "depth": 1,
- "extra": {
- "provenance": "patches-file:../installer/composer-patches/composer-patches.json"
- }
- }
]
}
}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/38a0143819963e019d1967bccac31a3c8d45b0b9
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/38a0143819963e019d1967bccac31a3c8d45b0b9
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs