[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] [FIX] Update composer.lock to reflect correct package versions
"SoftStart Code \(@softstartcode\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68914f7564d75_2cd5cf0199c7@gitlab-sidekiq-low-urgency-cpu-bound-v2-58b475bb65-6tprr.mail> |
SoftStart Code pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki
Commits:
a1e65b2c by Sandeep D at 2025-08-05T00:18:33+00:00
[FIX] Update composer.lock to reflect correct package versions
---
* [FIX] Update content-hash in composer.lock to match the correct state
* [FIX] Update composer.lock to reflect correct package versions
See merge request tikiwiki/tiki!8175
- - - - -
3 changed files:
- .gitlab-ci.yml
- vendor_bundled/composer.json
- vendor_bundled/composer.lock
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -307,7 +307,6 @@ composer-validates:
script:
- composer -V | grep "version 2" || composer self-update --2
- composer validate -d vendor_bundled --no-check-all
- # - php doc/devtools/check_composer_dist_urls.php
#This tests if composer COULD update the current composer.lock (it is coherent and installable). This is important because a developer wanting to update or add a dependency wouldn't be able to do so without figuring out why a composer.lock cannot be generated even before his changes.
#What we want to know is if a developer could successfully generate a new composer.lock file to update minor versions, or when adding dependencies. Not if he could generate a minimal-impact composer.lock file with composer update --lock on stable branches, which is much harder, and not necessary for the master branch.
=====================================
vendor_bundled/composer.json
=====================================
@@ -282,7 +282,7 @@
"mikey179/vfsstream": "^1",
"overtrue/phplint": "^9.0.4",
"phpcompatibility/php-compatibility": "^10.x-dev",
- "phpcsstandards/phpcsutils": "^1.0.0-alpha3",
+ "phpcsstandards/phpcsutils": "^1.1.0",
"phpstan/phpstan": "^1.10.57",
"phpstan/phpstan-deprecation-rules": "^1.1.3",
"phpunit/phpunit": "10.5.26",
@@ -468,7 +468,6 @@
"rangy/rangy",
"sam152/javascript-equal-height-responsive-rows",
"walkermatt/ol-layerswitcher"
-
]
}
}
=====================================
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": "648abb7f3c1c7129f42c0126ebdd101e",
+ "content-hash": "dfa2f9d7e3199d6a116ac12050bbca81",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -6926,7 +6926,7 @@
"version": "7.25.9",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz"
+ "url": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz"
},
"type": "npm-asset",
"license": [
@@ -6938,7 +6938,7 @@
"version": "7.25.9",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz"
+ "url": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz"
},
"type": "npm-asset",
"license": [
@@ -6950,7 +6950,7 @@
"version": "7.26.9",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz"
+ "url": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz"
},
"require": {
"npm-asset/babel--types": ">=7.26.9,<8.0.0"
@@ -6965,7 +6965,7 @@
"version": "7.26.9",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz"
+ "url": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz"
},
"require": {
"npm-asset/babel--helper-string-parser": ">=7.25.9,<8.0.0",
@@ -7194,7 +7194,7 @@
"version": "8.5.3",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
+ "url": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz"
},
"require": {
"npm-asset/nanoid": ">=3.3.8,<4.0.0",
@@ -16635,7 +16635,7 @@
},
{
"name": "phpcsstandards/phpcsutils",
- "version": "1.0.12",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
@@ -16650,14 +16650,14 @@
"require": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
"php": ">=5.4",
- "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev"
+ "squizlabs/php_codesniffer": "^3.13.0 || ^4.0"
},
"require-dev": {
"ext-filter": "*",
"php-parallel-lint/php-console-highlighter": "^1.0",
- "php-parallel-lint/php-parallel-lint": "^1.3.2",
+ "php-parallel-lint/php-parallel-lint": "^1.4.0",
"phpcsstandards/phpcsdevcs": "^1.1.6",
- "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0"
+ "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0 || ^3.0.0"
},
"type": "phpcodesniffer-standard",
"extra": {
@@ -18279,7 +18279,7 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.11.3",
+ "version": "3.13.2",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a1e65b2c66161b2226435fd52e895abbe6381b36
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a1e65b2c66161b2226435fd52e895abbe6381b36
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs