[TikiWiki-commits] [Git][tikiwiki/tiki][master] [UPD] Upgrade composer-patches from V1.7 to V2.0
Benoit Grégoire (@benoitg) via TikiWiki-cvs <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <698bb6b1ea63_3b184ef89722b@gitlab-sidekiq-low-urgency-cpu-bound-v2-6c7f7654c9-k48lw.mail> |
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
2e18c0a4 by ushindi bienvenu at 2026-02-10T22:43:21+00:00
[UPD] Upgrade composer-patches from V1.7 to V2.0
---
* [UPD] Upgrade composer-patches from V1.7 to V2.0
See merge request tikiwiki/tiki!9531
- - - - -
6 changed files:
- installer/composer-patches/composer-patches.json
- installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a.patch → installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a_and_drag_and_drop_via_touch.patch
- − installer/composer-patches/nicolaskruchten_pivottable_drag_and_drop_via_touch.patch
- vendor_bundled/composer.json
- vendor_bundled/composer.lock
- + vendor_bundled/patches.lock.json
Changes:
=====================================
installer/composer-patches/composer-patches.json
=====================================
@@ -7,8 +7,7 @@
"Fix visibility issues": "../installer/composer-patches/jquery-sheet_fix-visibility-issues.patch"
},
"nicolaskruchten/pivottable": {
- "Sort rows and columns by key_z_to_a": "../installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a.patch",
- "Drag and drop via touch": "../installer/composer-patches/nicolaskruchten_pivottable_drag_and_drop_via_touch.patch"
+ "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",
=====================================
installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a.patch → installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a_and_drag_and_drop_via_touch.patch
=====================================
@@ -1,5 +1,5 @@
diff --git a/dist/pivot.js b/dist/pivot.js
-index 489e412a7aa5d198e329315d39824b0947b1f33c..d6e77079c1d14bcf974984b64fecdabcfd4e39d5 100644
+index 489e412..1c85e61 100644
--- a/dist/pivot.js
+++ b/dist/pivot.js
@@ -455,7 +455,11 @@
@@ -94,3 +94,78 @@ index 489e412a7aa5d198e329315d39824b0947b1f33c..d6e77079c1d14bcf974984b64fecdabc
return refresh();
});
$("<td>").addClass('pvtVals pvtUiCell').appendTo(tr1).append(aggregator).append(rowOrderArrow).append(colOrderArrow).append($("<br>"));
+@@ -1753,6 +1781,74 @@
+ return this;
+ };
+
++ /*
++ Support Touch Event
++ */
++ var supportTouch = function () {
++ $.support.touch = true;
++
++ if (!$.support.touch) {
++ return;
++ }
++
++ var proto = $.ui.mouse.prototype,
++ _mouseInit = proto._mouseInit;
++
++ $.extend(proto, {
++ _getElementToBind: function() {
++ var el = this.element;
++ return el;
++ },
++
++ _mouseInit: function() {
++ this._getElementToBind().bind("touchstart." + this.widgetName, $.proxy(this, "_touchStart"));
++ _mouseInit.apply(this, arguments);
++ },
++
++ _touchStart: function(event) {
++ if (event.originalEvent.targetTouches.length != 1) {
++ return false;
++ }
++
++ if (!this._mouseCapture(event, false)) {
++ return true;
++ }
++
++ this.element
++ .bind("touchmove." + this.widgetName, $.proxy(this, "_touchMove"))
++ .bind("touchend." + this.widgetName, $.proxy(this, "_touchEnd"));
++
++ this._modifyEvent(event);
++
++ $(document).trigger($.Event("mouseup"));
++ this._mouseDown(event);
++
++ return false;
++ },
++
++ _touchMove: function(event) {
++ this._modifyEvent(event);
++ this._mouseMove(event);
++ },
++
++ _touchEnd: function(event) {
++ this.element
++ .unbind("touchmove." + this.widgetName)
++ .unbind("touchend." + this.widgetName);
++ this._mouseUp(event);
++ },
++
++ _modifyEvent: function(event) {
++ event.which = 1;
++ var target = event.originalEvent.targetTouches[0];
++ event.pageX = target.clientX;
++ event.pageY = target.clientY;
++ }
++
++ });
++ }
++ supportTouch();
++
+ /*
+ Barchart post-processing
+ */
=====================================
installer/composer-patches/nicolaskruchten_pivottable_drag_and_drop_via_touch.patch deleted
=====================================
@@ -1,87 +0,0 @@
-From 1abf234f1844094060cda1cbfe5904aeaae81d78 Mon Sep 17 00:00:00 2001
-From: Domeshow <[email protected]>
-Date: Mon, 15 May 2023 12:00:19 +0200
-Subject: [PATCH] [ENH] Drag and drop on mobile without touchpunch
-
----
- dist/pivot.js | 68 ++++++++++++++++++++++++++++++++++++++
-
-diff --git a/dist/pivot.js b/dist/pivot.js
-index 489e412a..af36bc32 100644
---- a/dist/pivot.js
-+++ b/dist/pivot.js
-@@ -1753,6 +1753,74 @@
- return this;
- };
-
-+ /*
-+ Support Touch Event
-+ */
-+ var supportTouch = function () {
-+ $.support.touch = true;
-+
-+ if (!$.support.touch) {
-+ return;
-+ }
-+
-+ var proto = $.ui.mouse.prototype,
-+ _mouseInit = proto._mouseInit;
-+
-+ $.extend(proto, {
-+ _getElementToBind: function() {
-+ var el = this.element;
-+ return el;
-+ },
-+
-+ _mouseInit: function() {
-+ this._getElementToBind().bind("touchstart." + this.widgetName, $.proxy(this, "_touchStart"));
-+ _mouseInit.apply(this, arguments);
-+ },
-+
-+ _touchStart: function(event) {
-+ if (event.originalEvent.targetTouches.length != 1) {
-+ return false;
-+ }
-+
-+ if (!this._mouseCapture(event, false)) {
-+ return true;
-+ }
-+
-+ this.element
-+ .bind("touchmove." + this.widgetName, $.proxy(this, "_touchMove"))
-+ .bind("touchend." + this.widgetName, $.proxy(this, "_touchEnd"));
-+
-+ this._modifyEvent(event);
-+
-+ $(document).trigger($.Event("mouseup"));
-+ this._mouseDown(event);
-+
-+ return false;
-+ },
-+
-+ _touchMove: function(event) {
-+ this._modifyEvent(event);
-+ this._mouseMove(event);
-+ },
-+
-+ _touchEnd: function(event) {
-+ this.element
-+ .unbind("touchmove." + this.widgetName)
-+ .unbind("touchend." + this.widgetName);
-+ this._mouseUp(event);
-+ },
-+
-+ _modifyEvent: function(event) {
-+ event.which = 1;
-+ var target = event.originalEvent.targetTouches[0];
-+ event.pageX = target.clientX;
-+ event.pageY = target.clientY;
-+ }
-+
-+ });
-+ }
-+ supportTouch();
-+
- /*
- Barchart post-processing
- */
\ No newline at end of file
=====================================
vendor_bundled/composer.json
=====================================
@@ -187,7 +187,7 @@
"chrome-php/chrome": "~1.14",
"codercat/jwk-to-pem": "~1.1",
"composer/semver": "~3.4",
- "cweagans/composer-patches": "~1.7",
+ "cweagans/composer-patches": "~2.0",
"dragonmantank/cron-expression": "~3.5",
"ecphp/cas-lib": "~3.0",
"elliotjreed/disposable-emails-filter": "~4.0",
@@ -324,7 +324,9 @@
"umakantp/smartylint": "0.1.4-p1"
},
"extra": {
- "patches-file": "../installer/composer-patches/composer-patches.json",
+ "composer-patches": {
+ "patches-file": "../installer/composer-patches/composer-patches.json"
+ },
"stability-ignore": {
"_comment": [
"Packages with non-standard version constraints that require explanation.",
=====================================
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": "107246acd96c18f07e78e3961e96480a",
+ "content-hash": "70ed5b88fb19490f68dae73dafcadeb0",
"packages": [
{
"name": "amphp/amp",
@@ -732,16 +732,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.369.29",
+ "version": "3.369.30",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "068195b2980cf5cf4ade2515850d461186db3310"
+ "reference": "8a0fc0da51eff807f8978613a82df9871b236718"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/068195b2980cf5cf4ade2515850d461186db3310",
- "reference": "068195b2980cf5cf4ade2515850d461186db3310",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8a0fc0da51eff807f8978613a82df9871b236718",
+ "reference": "8a0fc0da51eff807f8978613a82df9871b236718",
"shasum": ""
},
"require": {
@@ -823,9 +823,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.369.29"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.369.30"
},
- "time": "2026-02-06T19:08:50+00:00"
+ "time": "2026-02-09T19:19:31+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -1602,31 +1602,100 @@
],
"time": "2025-08-20T19:15:30+00:00"
},
+ {
+ "name": "cweagans/composer-configurable-plugin",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/cweagans/composer-configurable-plugin.git",
+ "reference": "15433906511a108a1806710e988629fd24b89974"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/cweagans/composer-configurable-plugin/zipball/15433906511a108a1806710e988629fd24b89974",
+ "reference": "15433906511a108a1806710e988629fd24b89974",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=8.0.0"
+ },
+ "require-dev": {
+ "codeception/codeception": "~4.0",
+ "codeception/module-asserts": "^2.0",
+ "composer/composer": "~2.0",
+ "php-coveralls/php-coveralls": "~2.0",
+ "php-parallel-lint/php-parallel-lint": "^1.0.0",
+ "phpro/grumphp": "^1.8.0",
+ "sebastian/phpcpd": "^6.0",
+ "squizlabs/php_codesniffer": "^3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "cweagans\\Composer\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Cameron Eagans",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "Provides a lightweight configuration system for Composer plugins.",
+ "support": {
+ "issues": "https://github.com/cweagans/composer-configurable-plugin/issues",
+ "source": "https://github.com/cweagans/composer-configurable-plugin/tree/2.0.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/cweagans",
+ "type": "github"
+ }
+ ],
+ "time": "2023-02-12T04:58:58+00:00"
+ },
{
"name": "cweagans/composer-patches",
- "version": "1.7.3",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/cweagans/composer-patches.git",
- "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db"
+ "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db",
- "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db",
+ "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/bfa6018a5f864653d9ed899b902ea72f858a2cf7",
+ "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0 || ^2.0",
- "php": ">=5.3.0"
+ "composer-plugin-api": "^2.0",
+ "cweagans/composer-configurable-plugin": "^2.0",
+ "ext-json": "*",
+ "php": ">=8.0.0"
},
"require-dev": {
- "composer/composer": "~1.0 || ~2.0",
- "phpunit/phpunit": "~4.6"
+ "codeception/codeception": "~4.0",
+ "codeception/module-asserts": "^2.0",
+ "codeception/module-cli": "^2.0",
+ "codeception/module-filesystem": "^2.0",
+ "composer/composer": "~2.0",
+ "php-coveralls/php-coveralls": "~2.0",
+ "php-parallel-lint/php-parallel-lint": "^1.0.0",
+ "phpro/grumphp": "^1.8.0",
+ "sebastian/phpcpd": "^6.0",
+ "squizlabs/php_codesniffer": "^4.0"
},
"type": "composer-plugin",
"extra": {
- "class": "cweagans\\Composer\\Patches"
+ "_": "The following two lines ensure that composer-patches is loaded as early as possible.",
+ "class": "cweagans\\Composer\\Plugin\\Patches",
+ "plugin-modifies-downloads": true,
+ "plugin-modifies-install-path": true
},
"autoload": {
"psr-4": {
@@ -1646,9 +1715,15 @@
"description": "Provides a way to patch Composer packages.",
"support": {
"issues": "https://github.com/cweagans/composer-patches/issues",
- "source": "https://github.com/cweagans/composer-patches/tree/1.7.3"
+ "source": "https://github.com/cweagans/composer-patches/tree/2.0.0"
},
- "time": "2022-12-20T22:53:13+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/cweagans",
+ "type": "github"
+ }
+ ],
+ "time": "2025-10-30T23:44:22+00:00"
},
{
"name": "dasprid/enum",
@@ -16164,25 +16239,29 @@
},
{
"name": "xemlock/htmlpurifier-html5",
- "version": "v0.1.11",
+ "version": "v0.1.12",
"source": {
"type": "git",
"url": "https://github.com/xemlock/htmlpurifier-html5.git",
- "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255"
+ "reference": "535349cb160bf79752920e1e83c4a94c3e7d2b21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
- "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
+ "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/535349cb160bf79752920e1e83c4a94c3e7d2b21",
+ "reference": "535349cb160bf79752920e1e83c4a94c3e7d2b21",
"shasum": ""
},
"require": {
"ezyang/htmlpurifier": "^4.8",
- "php": ">=5.2"
+ "php": ">=5.3"
},
"require-dev": {
+ "masterminds/html5": "^2.7",
"php-coveralls/php-coveralls": "^1.1|^2.1",
- "phpunit/phpunit": ">=4.7 <8.0"
+ "phpunit/phpunit": ">=4.7 <10.0"
+ },
+ "suggest": {
+ "masterminds/html5": "Required to use HTMLPurifier_Lexer_HTML5"
},
"type": "library",
"autoload": {
@@ -16200,7 +16279,8 @@
"email": "[email protected]"
}
],
- "description": "HTML5 element definitions for HTML Purifier",
+ "description": "HTML5 support for HTML Purifier",
+ "homepage": "https://github.com/xemlock/htmlpurifier-html5",
"keywords": [
"HTML5",
"Purifier",
@@ -16213,9 +16293,9 @@
],
"support": {
"issues": "https://github.com/xemlock/htmlpurifier-html5/issues",
- "source": "https://github.com/xemlock/htmlpurifier-html5/tree/master"
+ "source": "https://github.com/xemlock/htmlpurifier-html5/tree/v0.1.12"
},
- "time": "2019-08-07T17:19:21+00:00"
+ "time": "2026-02-09T21:03:14+00:00"
},
{
"name": "zbateson/mail-mime-parser",
=====================================
vendor_bundled/patches.lock.json
=====================================
@@ -0,0 +1,63 @@
+{
+ "_hash": "6112759526c6c00b6c90c3c8f873596a81a3dd7c24c4d8617dffe8c560a27a65",
+ "patches": {
+ "candy-chat/xmpp-prebind-php": [
+ {
+ "package": "candy-chat/xmpp-prebind-php",
+ "description": "Removed string access with curly braces syntax in PHP8",
+ "url": "../installer/composer-patches/xmpp-prebind-php__php8fixes.patch",
+ "sha256": "897978b92944a9215c5064502538c99044445c49a9f2e8bc0e80583ea712dd01",
+ "depth": 1,
+ "extra": {
+ "provenance": "patches-file:../installer/composer-patches/composer-patches.json"
+ }
+ }
+ ],
+ "jquery/jquery-sheet": [
+ {
+ "package": "jquery/jquery-sheet",
+ "description": "Fix visibility issues",
+ "url": "../installer/composer-patches/jquery-sheet_fix-visibility-issues.patch",
+ "sha256": "a0c5316561e8bae7f7664e1cd5f89c701b2e437fc3711ec304e5f47c99031e87",
+ "depth": 1,
+ "extra": {
+ "provenance": "patches-file:../installer/composer-patches/composer-patches.json"
+ }
+ }
+ ],
+ "nicolaskruchten/pivottable": [
+ {
+ "package": "nicolaskruchten/pivottable",
+ "description": "Sort rows and columns by key_z_to_a and Drag and drop via touch",
+ "url": "../installer/composer-patches/nicolaskruchten_pivottable__sort_by_key_z_to_a_and_drag_and_drop_via_touch.patch",
+ "sha256": "e3b31a4b1b6efa7412991977286873de4eaf5349d7340e44088db7503442104c",
+ "depth": 1,
+ "extra": {
+ "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/2e18c0a40289efa46970e318e4e8a02454f95daa
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/2e18c0a40289efa46970e318e4e8a02454f95daa
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