[TikiWiki-commits] [Git][tikiwiki/tiki][24.x] [REF] Enable multi-repository support with Packagist.org, Asset-Packagist.org, ...

SoftStart Code pushed to branch 24.x at Tiki Wiki CMS Groupware / Tiki


Commits:
86f2234c by Sandeep D at 2025-08-05T01:03:46+00:00
[REF] Enable multi-repository support with Packagist.org, Asset-Packagist.org, and composer.tiki.org
---
* [FIX] Update content-hash in composer.lock to match the correct state

* [REF] Enable multi-repository support with Packagist.org, Asset-Packagist.org, and composer.tiki.org

See merge request tikiwiki/tiki!8178

- - - - -


4 changed files:

- composer.json.dist
- doc/devtools/update_vendor_bundled.php
- vendor_bundled/composer.json
- vendor_bundled/composer.lock


Changes:

=====================================
composer.json.dist
=====================================
@@ -18,6 +18,10 @@
         }
     },
     "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packagist.org"
+        },
         {
             "type": "composer",
             "url": "https://composer.tiki.org"


=====================================
doc/devtools/update_vendor_bundled.php
=====================================
@@ -38,28 +38,6 @@ $final_md5 = md5_file($composerLock);
 printf('Getting md5 from %s after composer update...' . PHP_EOL . 'result: %s' . PHP_EOL, $composerLock, $final_md5);
 
 if ($initial_md5 !== $final_md5) {
-    $jsonContent = json_decode(file_get_contents($composerLock));
-
-    if (! empty($jsonContent->packages)) {
-        $errors = [];
-        foreach ($jsonContent->packages as $package) {
-            if (! empty($package->type) && $package->type === "metapackage") {
-                continue; // metapackage is a empty package and does not have dist.url
-            }
-            if (strrpos($package->dist->url, 'https://composer.tiki.org') !== 0) {
-                $errors[] = "Package: " . $package->name . ", dist.url: " . $package->dist->url;
-            }
-        }
-        if (count($errors)) {
-            echo PHP_EOL;
-            foreach ($errors as $error) {
-                echo $error . PHP_EOL;
-            }
-            echo PHP_EOL . "Error: composer.lock might contain packages from unverified sources. Aborting." . PHP_EOL . PHP_EOL;
-            exit(1);
-        }
-    }
-
     printf("Vendor bundled dependencies updated");
 } else {
     printf("Nothing to be done...");


=====================================
vendor_bundled/composer.json
=====================================
@@ -325,15 +325,66 @@
         ],
         "test": "php ../lib/test/phpunit.php -c phpunit.xml.dist --colors=always"
     },
-    "repositories": [
-        {
+    "repositories": {
+        "packagist.org": {
             "type": "composer",
-            "url": "https://composer.tiki.org",
-            "exclude": ["jason-munro/cypht"]
+            "url": "https://packagist.org",
+            "exclude": [
+                "pear/text_wiki_mediawiki",
+                "itsjavi/bootstrap-colorpicker",
+                "openid/php-openid"
+            ]
         },
-        {
+        "asset-packagist.org": {
             "type": "composer",
             "url": "https://asset-packagist.org"
+        },
+        "tiki.org": {
+            "type": "composer",
+            "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",
+                "sam152/javascript-equal-height-responsive-rows",
+                "avianey/jqdoublescroll",
+                "christian-vigh-phpclasses/pdftotext",
+                "codemirror/codemirror",
+                "css-tricks/anythingslider-themes",
+                "jquery-plugins/anythingslider",
+                "jquery-plugins/async",
+                "jquery-plugins/colorbox",
+                "jquery-plugins/fitvidjs",
+                "jquery-plugins/galleriffic",
+                "jquery-plugins/infinitecarousel",
+                "jquery-plugins/jquery-json",
+                "jquery-plugins/jquery-validation",
+                "jquery-plugins/media",
+                "jquery-plugins/nestedsortable",
+                "jquery-plugins/superfish",
+                "jquery-plugins/tagcanvas",
+                "jquery-plugins/treetable",
+                "jquery/jquery-timepicker-addon",
+                "jquery/md5",
+                "jquery/minicart",
+                "jquery/photoswipe",
+                "jquery-plugins/zoom",
+                "mrrio/jspdf",
+                "openlayers/openlayers",
+                "walkermatt/ol-layerswitcher",
+                "pear/xml_rpc",
+                "player/flv",
+                "player/mp3",
+                "rangy/rangy",
+                "svg-edit/svg-edit",
+                "itsjavi/bootstrap-colorpicker",
+                "openid/php-openid"
+            ]
         }
-    ]
+    }
 }


=====================================
vendor_bundled/composer.lock
=====================================
The diff for this file was not included because it is too large.


View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/86f2234cd05106583d9eca3762be218a87918c24

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