From 3365760c8705006a8881e618f225ce7d28b3537b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Oct 2025 10:21:49 +0200 Subject: [PATCH 1/3] add extra plugin to merge composer-local.json --- composer-dist.json | 20 +++++++++++++++++++- composer.json | 7 ++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/composer-dist.json b/composer-dist.json index 8d63f2f38..c58f08e11 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -13,6 +13,9 @@ "config": { "platform": { "php": "8.2" + }, + "allow-plugins": { + "wikimedia/composer-merge-plugin": true } }, "require": { @@ -46,11 +49,26 @@ "seeddms/lucene": "dev-master", "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", - "seeddms/http_webdav_server": "dev-master" + "seeddms/http_webdav_server": "dev-master", + "wikimedia/composer-merge-plugin": "dev-master" }, "require-dev": { "composer/composer": "dev-main" }, + "extra": { + "merge-plugin": { + "include": [ + "composer.local.json" + ], + "recurse": false, + "replace": true, + "ignore-duplicates": true, + "merge-dev": true, + "merge-extra": false, + "merge-extra-deep": false, + "merge-scripts": true + } + }, "repositories": [ { "type": "path", diff --git a/composer.json b/composer.json index 75bac27ec..e39a55b09 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,8 @@ "seeddms/lucene": "dev-master", "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", - "seeddms/http_webdav_server": "dev-master" + "seeddms/http_webdav_server": "dev-master", + "wikimedia/composer-merge-plugin": "dev-master" }, "require-dev": { "composer/composer": "dev-main", @@ -110,9 +111,9 @@ "include": [ "composer.local.json" ], - "recurse": true, + "recurse": false, "replace": true, - "ignore-duplicates": false, + "ignore-duplicates": true, "merge-dev": true, "merge-extra": false, "merge-extra-deep": false, From f88acd0ebd8f4ab0dedc86ddde3dc1cb0498654f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Oct 2025 16:14:49 +0200 Subject: [PATCH 2/3] use php-cache instead of memcached --- composer-dist.json | 3 ++- composer.json | 3 ++- inc/inc.DBInit.php | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-dist.json b/composer-dist.json index c58f08e11..c914d1c32 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -50,7 +50,8 @@ "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", "seeddms/http_webdav_server": "dev-master", - "wikimedia/composer-merge-plugin": "dev-master" + "wikimedia/composer-merge-plugin": "dev-master", + "cache/memcached-adapter": "^1.2" }, "require-dev": { "composer/composer": "dev-main" diff --git a/composer.json b/composer.json index e39a55b09..196257a4f 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "seeddms/preview": "dev-master", "seeddms/sqlitefts": "dev-master", "seeddms/http_webdav_server": "dev-master", - "wikimedia/composer-merge-plugin": "dev-master" + "wikimedia/composer-merge-plugin": "dev-master", + "cache/memcached-adapter": "^1.2" }, "require-dev": { "composer/composer": "dev-main", diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php index 72c70f15d..6434b55f2 100644 --- a/inc/inc.DBInit.php +++ b/inc/inc.DBInit.php @@ -58,11 +58,12 @@ $dms = new SeedDMS_Core_DMS($db, $storage ? $storage : $settings->_contentDir.$s $memcache = null; if($settings->_enableMemcached && extension_loaded('memcached')) { - $memcache = new Memcached('seeddms'); - $memcache->addServers(array( + $mc = new Memcached('seeddms'); + $mc->addServers(array( array($settings->_memcachedHost ?? 'localhost', $settings->_memcachedPort ?? 11211), )); - $dms->setMemcache($memcache); + $memcache = new \Cache\Adapter\Memcached\MemcachedCachePool($mc); + $dms->setCache($memcache); } if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) { From 73db1e87c9ae13c28735e31424167137a8b8527e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Oct 2025 17:08:04 +0200 Subject: [PATCH 3/3] add changes for 5.1.42 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 6ef53b266..6065b0385 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - memcached support can be configured (still rarely used) - fix folder parameter passed to hook 'folderRowAction' - require unrestricted access on document/folder for deletion by rest api +- use php-cache instead of native memcached -------------------------------------------------------------------------------- Changes in version 5.1.41