[TikiWiki-commits] [Git][tikiwiki/tiki][master] [UPD] Restore temporarily removed composer dependencies after dual repo support

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
1967b3fb by Sandeep D at 2025-08-29T14:41:02+00:00
[UPD] Restore temporarily removed composer dependencies after dual repo support
---
* [UPD] Restore temporarily removed composer dependencies after dual repo support

- Restore packages removed (https://gitlab.com/tikiwiki/tiki/-/merge_requests/7572)
- Update composer files

See merge request tikiwiki/tiki!8454

- - - - -


2 changed files:

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


Changes:

=====================================
vendor_bundled/composer.json
=====================================
@@ -217,6 +217,7 @@
         "hybridauth/hybridauth": "~3.11",
         "jasig/phpcas": "~1.6",
         "jason-munro/cypht": "dev-master",
+        "jquery/jquery-sheet": "3.1",
         "kaltura/api-client-library": "~21.18",
         "laminas/laminas-captcha": "~2.9",
         "laminas/laminas-config": "~3.3",
@@ -250,10 +251,12 @@
         "nicolaskruchten/pivottable": "^2.20.0",
         "nlgen/nlgen": "~0.18",
         "onelogin/php-saml": "~4.2",
+        "openannotation/annotator": ">=1.2.10",
         "paragonie/sodium_compat": "~2.1",
         "pclzip/pclzip": "~2.8",
         "pear/net_socket": "~1.2",
         "pear/pear": "~1.10",
+        "pear/text_wiki_mediawiki": "0.2.0",
         "pear/xml_parser": "~1.3",
         "philippemarcmeyer/fieldslinker": "~1.0",
         "phpseclib/phpseclib": "~3.0",
@@ -317,7 +320,8 @@
         "squizlabs/php_codesniffer": "~3.1",
         "stevegrunwell/phpunit-markup-assertions": "~2.0",
         "symfony/browser-kit": "~6.4",
-        "symfony/http-client": "~6.4"
+        "symfony/http-client": "~6.4",
+        "umakantp/smartylint": "0.1.4-p1"
     },
     "extra": {
         "patches-file": "../installer/composer-patches/composer-patches.json"


=====================================
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": "9fd7b9a9d4718b9b7eb7971c167acff6",
+    "content-hash": "1a2a6570cfdad457853004c2cae25531",
     "packages": [
         {
             "name": "amphp/amp",
@@ -3010,6 +3010,16 @@
             },
             "time": "2025-03-19T14:43:43+00:00"
         },
+        {
+            "name": "jquery/jquery-sheet",
+            "version": "3.1",
+            "dist": {
+                "type": "zip",
+                "url": "https://composer.tiki.org/dist/jquery/jquery-sheet/jquery-jquery-sheet-3.1.zip",
+                "shasum": "f795b13ceb1e95281cd575e92c7666bd6b15ca90"
+            },
+            "type": "library"
+        },
         {
             "name": "kaltura/api-client-library",
             "version": "v21.20.0",
@@ -6750,6 +6760,16 @@
             ],
             "time": "2025-05-25T14:28:00+00:00"
         },
+        {
+            "name": "openannotation/annotator",
+            "version": "1.2.10",
+            "dist": {
+                "type": "zip",
+                "url": "https://composer.tiki.org/dist/openannotation/annotator/openannotation-annotator-1.2.10.zip",
+                "shasum": "0e982ad018a75edd758111f9534c03513c7be9bc"
+            },
+            "type": "library"
+        },
         {
             "name": "paragonie/constant_time_encoding",
             "version": "v3.0.0",
@@ -7385,6 +7405,16 @@
             },
             "time": "2024-06-02T15:12:16+00:00"
         },
+        {
+            "name": "pear/text_wiki_mediawiki",
+            "version": "0.2.0",
+            "dist": {
+                "type": "zip",
+                "url": "https://composer.tiki.org/dist/pear/text_wiki_mediawiki/pear-text_wiki_mediawiki-0.2.0.zip",
+                "shasum": "8e7ab56efd4d446887b601bcfa70ecb2cd495c4d"
+            },
+            "type": "library"
+        },
         {
             "name": "pear/xml_parser",
             "version": "v1.3.8",
@@ -14389,6 +14419,16 @@
             },
             "time": "2025-05-09T23:01:19+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"
+        },
         {
             "name": "voku/portable-ascii",
             "version": "2.0.3",



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/1967b3fb07d3c220d761d327025cf409e109260b

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