[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] [FIX] composer.json: fix composer update failures related to league/commonmark conflict

Marc Laporte pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki


Commits:
37007c08 by Alfred Syatsukwa at 2026-04-13T02:15:14+00:00
[FIX] composer.json: fix composer update failures related to league/commonmark conflict
---
* [FIX] composer.json: fix composer update failures related to league/commonmark conflict

See merge request tikiwiki/tiki!9998

- - - - -


2 changed files:

- vendor_bundled/composer.json
- vendor_bundled/composer.lock


Changes:

=====================================
vendor_bundled/composer.json
=====================================
@@ -530,9 +530,8 @@
             "type": "composer",
             "url": "https://packagist.org",
             "exclude": [
-                "pear/text_wiki_mediawiki",
                 "itsjavi/bootstrap-colorpicker",
-                "league/commonmark"
+                "pear/text_wiki_mediawiki"
             ]
         },
         "asset-packagist.org": {
@@ -544,16 +543,11 @@
             "url": "https://composer.tiki.org",
             "canonical": false,
             "only": [
-                "simile_timeline/simile_timeline",
-                "openannotation/annotator",
-                "jquery-plugins/reflection-jquery",
-                "jquery/jquery-sheet",
-                "umakantp/smartylint",
-                "bower-asset/wodo.texteditor",
-                "pear/text_wiki_mediawiki",
                 "avianey/jqdoublescroll",
+                "bower-asset/wodo.texteditor",
                 "codemirror/codemirror",
                 "css-tricks/anythingslider-themes",
+                "itsjavi/bootstrap-colorpicker",
                 "jquery-plugins/anythingslider",
                 "jquery-plugins/async",
                 "jquery-plugins/colorbox",
@@ -562,20 +556,24 @@
                 "jquery-plugins/infinitecarousel",
                 "jquery-plugins/jquery-json",
                 "jquery-plugins/nestedsortable",
+                "jquery-plugins/reflection-jquery",
                 "jquery-plugins/tagcanvas",
                 "jquery-plugins/treetable",
                 "jquery-plugins/zoom",
+                "jquery/jquery-sheet",
                 "jquery/jquery-timepicker-addon",
                 "jquery/minicart",
                 "jquery/photoswipe",
                 "mrrio/jspdf",
+                "openannotation/annotator",
                 "openlayers/openlayers",
+                "pear/text_wiki_mediawiki",
                 "rangy/rangy",
                 "sam152/javascript-equal-height-responsive-rows",
+                "simile_timeline/simile_timeline",
                 "svg-edit/svg-edit",
-                "walkermatt/ol-layerswitcher",
-                "itsjavi/bootstrap-colorpicker",
-                "league/commonmark"
+                "umakantp/smartylint",
+                "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": "2be799eca83ff6a694188113b7eefe19",
+    "content-hash": "bca84cc9d8ac314084016f4a6ef7adee",
     "packages": [
         {
             "name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -18398,8 +18398,8 @@
     "stability-flags": {
         "candy-chat/xmpp-prebind-php": 20,
         "npm-asset/select2": 5,
-        "rubix/extras": 10,
-        "phpcompatibility/php-compatibility": 15
+        "phpcompatibility/php-compatibility": 15,
+        "rubix/extras": 10
     },
     "prefer-stable": false,
     "prefer-lowest": false,
@@ -18416,12 +18416,12 @@
         "ext-openssl": "*",
         "ext-zip": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1",
         "ext-ldap": "0",
         "ext-soap": "0",
         "ext-sockets": "0"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/37007c08131acdd5cb761104847ec34c8e42c3bf

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/37007c08131acdd5cb761104847ec34c8e42c3bf
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