From 7025581b993756f1dfabb710abb4258d7ed9872d Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 31 Oct 2025 15:00:40 +0100 Subject: [PATCH 1/4] use dev magnustools --- Dockerfile | 8 +- composer.json | 2 +- composer.lock | 221 +++++++++++++++++++++++++++++--------------------- 3 files changed, 132 insertions(+), 99 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e52dd7..ef01583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ LABEL org.opencontainers.image.source="https://github.com/wbstack/quickstatement RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ - libasprintf0v5=0.21-12 \ - jq=1.6-2.1 \ - libicu-dev=72.1-3 \ - icu-devtools=72.1-3 && \ + libasprintf0v5=0.23.1-2 \ + jq=1.7.1-6+deb13u1 \ + libicu-dev=76.1-4 \ + icu-devtools=76.1-4 && \ rm -rf /var/lib/apt/lists/* && \ docker-php-ext-configure intl && \ docker-php-ext-install intl && \ diff --git a/composer.json b/composer.json index 71fe781..b95b9db 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { "addwiki/mediawiki-api": "~2.0", - "wbstack/magnustools": "dev-main#e3ddd872410e3d25cec63c5d646ba8cdd9a813ae" + "wbstack/magnustools": "dev-de/backend-api-query#96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index feca4f8..c67d32e 100644 --- a/composer.lock +++ b/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": "54ef9d2e47dcdb1014d1d9765dd8835c", + "content-hash": "4acd3130a26ae0c48ffdff6a0eb429ca", "packages": [ { "name": "abraham/twitteroauth", @@ -117,6 +117,9 @@ "api", "mediawiki" ], + "support": { + "source": "https://github.com/addwiki/mediawiki-api/tree/2.8.0" + }, "time": "2021-02-16T19:46:17+00:00" }, { @@ -172,6 +175,9 @@ "api", "mediawiki" ], + "support": { + "source": "https://github.com/addwiki/mediawiki-api-base/tree/2.8.0" + }, "time": "2021-02-16T19:46:17+00:00" }, { @@ -220,20 +226,23 @@ "keywords": [ "mediawiki" ], + "support": { + "source": "https://github.com/addwiki/mediawiki-datamodel/tree/2.8.0" + }, "time": "2021-02-16T19:46:19+00:00" }, { "name": "composer/ca-bundle", - "version": "1.5.5", + "version": "1.5.8", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6" + "reference": "719026bb30813accb68271fee7e39552a58e9f65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/08c50d5ec4c6ced7d0271d2862dec8c1033283e6", - "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/719026bb30813accb68271fee7e39552a58e9f65", + "reference": "719026bb30813accb68271fee7e39552a58e9f65", "shasum": "" }, "require": { @@ -280,7 +289,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.5" + "source": "https://github.com/composer/ca-bundle/tree/1.5.8" }, "funding": [ { @@ -290,44 +299,41 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2025-01-08T16:17:16+00:00" + "time": "2025-08-20T18:49:47+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.0", + "version": "7.9.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^2.7.0", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2" + "symfony/deprecation-contracts": "^2.2 || ^3.0" }, "provide": { "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "guzzle/client-integration-tests": "3.0.2", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -337,17 +343,18 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "7.4-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -402,6 +409,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.9.3" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -416,20 +427,20 @@ "type": "tidelift" } ], - "time": "2021-10-18T09:52:00+00:00" + "time": "2025-03-27T13:37:11+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.0", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/136a635e2b4a49b9d79e9c8fee267ffb257fdba0", - "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -439,18 +450,13 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -482,6 +488,10 @@ "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.3" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -496,26 +506,26 @@ "type": "tidelift" } ], - "time": "2021-10-07T13:05:22+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -523,17 +533,18 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "2.1-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { @@ -593,6 +604,10 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.8.0" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -607,7 +622,7 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "mediawiki/oauthclient", @@ -671,21 +686,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -705,7 +720,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -716,25 +731,28 @@ "psr", "psr-18" ], - "time": "2020-06-29T06:28:15+00:00" + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -754,10 +772,10 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -768,29 +786,32 @@ "request", "response" ], - "time": "2019-04-30T12:38:16+00:00" + "support": { + "source": "https://github.com/php-fig/http-factory" + }, + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -805,7 +826,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -818,7 +839,10 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "support": { + "source": "https://github.com/php-fig/http-message/tree/2.0" + }, + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", @@ -865,6 +889,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, "time": "2021-05-03T11:20:27+00:00" }, { @@ -905,33 +932,37 @@ } ], "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, "time": "2019-03-08T08:55:37+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.4-dev" - }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.6-dev" } }, "autoload": { @@ -955,6 +986,9 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -969,20 +1003,20 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "wbstack/magnustools", - "version": "dev-main", + "version": "dev-de/backend-api-query", "source": { "type": "git", "url": "https://github.com/wbstack/magnustools.git", - "reference": "e3ddd872410e3d25cec63c5d646ba8cdd9a813ae" + "reference": "96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wbstack/magnustools/zipball/e3ddd872410e3d25cec63c5d646ba8cdd9a813ae", - "reference": "e3ddd872410e3d25cec63c5d646ba8cdd9a813ae", + "url": "https://api.github.com/repos/wbstack/magnustools/zipball/96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6", + "reference": "96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6", "shasum": "" }, "require": { @@ -994,7 +1028,6 @@ "require-dev": { "phpunit/phpunit": "^8.0" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1018,7 +1051,7 @@ "issues": "https://bitbucket.org/magnusmanske/magnustools/issues?status=new&status=open", "source": "https://bitbucket.org/magnusmanske/magnustools/" }, - "time": "2025-01-29T10:54:17+00:00" + "time": "2025-10-31T13:23:44+00:00" } ], "packages-dev": [], From 9b92eb30a915b68445a442a21906cfcd97792f4d Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 4 Nov 2025 11:42:27 +0100 Subject: [PATCH 2/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b95b9db..b152b08 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { "addwiki/mediawiki-api": "~2.0", - "wbstack/magnustools": "dev-de/backend-api-query#96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6" + "wbstack/magnustools": "dev-de/backend-api-query#95546e3eb3dd293c250b7ea0b041570d1185cc6a" }, "scripts": { "post-install-cmd": [ From bc54df5d64b3ce83c2b5b02a2ea58a4673d8cc24 Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Tue, 4 Nov 2025 14:42:06 +0100 Subject: [PATCH 3/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b152b08..e0b8406 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { "addwiki/mediawiki-api": "~2.0", - "wbstack/magnustools": "dev-de/backend-api-query#95546e3eb3dd293c250b7ea0b041570d1185cc6a" + "wbstack/magnustools": "dev-main#855a8bb2e24433c2cf582c0dcbd504bf902f1ad1" }, "scripts": { "post-install-cmd": [ From c3a8f6dd9da539948fc0185cdaf9daaf8acfef35 Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 4 Nov 2025 14:43:14 +0100 Subject: [PATCH 4/4] update composer lock file --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index c67d32e..080aa00 100644 --- a/composer.lock +++ b/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": "4acd3130a26ae0c48ffdff6a0eb429ca", + "content-hash": "6cec40bbc8ee253be7d447dc032a3f8d", "packages": [ { "name": "abraham/twitteroauth", @@ -1007,16 +1007,16 @@ }, { "name": "wbstack/magnustools", - "version": "dev-de/backend-api-query", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/wbstack/magnustools.git", - "reference": "96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6" + "reference": "855a8bb2e24433c2cf582c0dcbd504bf902f1ad1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wbstack/magnustools/zipball/96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6", - "reference": "96464e6b94a8ac3bbf9cb9c2b254a0a02ad00ec6", + "url": "https://api.github.com/repos/wbstack/magnustools/zipball/855a8bb2e24433c2cf582c0dcbd504bf902f1ad1", + "reference": "855a8bb2e24433c2cf582c0dcbd504bf902f1ad1", "shasum": "" }, "require": { @@ -1028,6 +1028,7 @@ "require-dev": { "phpunit/phpunit": "^8.0" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1051,7 +1052,7 @@ "issues": "https://bitbucket.org/magnusmanske/magnustools/issues?status=new&status=open", "source": "https://bitbucket.org/magnusmanske/magnustools/" }, - "time": "2025-10-31T13:23:44+00:00" + "time": "2025-11-04T13:40:11+00:00" } ], "packages-dev": [],