From 891d2cebc3c9885499079a55819b9157cc3e27f9 Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 14 May 2026 00:50:42 +0100 Subject: [PATCH 1/5] Add MW 1.44-1,45 to ci and remove MW 1.39 --- .github/workflows/ci.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baa1bc2..5d2a2a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,20 +17,34 @@ jobs: strategy: matrix: include: - - mediawiki_version: '1.39' - smw_version: '5.1.0' + - mediawiki_version: '1.43' + smw_version: 6.0.1 php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" coverage: false experimental: false - mediawiki_version: '1.43' - smw_version: '6.0.1' - php_version: 8.3 + smw_version: 6.0.1 + php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" coverage: true experimental: false + - mediawiki_version: '1.44' + smw_version: dev-master + php_version: 8.2 + database_type: mysql + database_image: "mariadb:11.8" + coverage: false + experimental: false + - mediawiki_version: '1.45' + smw_version: dev-master + php_version: 8.3 + database_type: mysql + database_image: "mariadb:11.8" + coverage: false + experimental: false env: MW_VERSION: ${{ matrix.mediawiki_version }} From 0a29b1d3ffd79e30c1b38c5a1d092ef19d1a2fef Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 14 May 2026 00:51:11 +0100 Subject: [PATCH 2/5] Upgrade PHP requirement from 7.4 to 8.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 218f9df..440e94d 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": ">=7.4", + "php": ">=8.1", "composer/installers": "^2.2.0|^1.0.1" }, "require-dev": { From e44250eaa472c32d813aaa68e719329c930fe889 Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 14 May 2026 00:51:42 +0100 Subject: [PATCH 3/5] Update MediaWiki version requirement to 1.43 --- extension.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension.json b/extension.json index 546571c..669b0a6 100644 --- a/extension.json +++ b/extension.json @@ -10,7 +10,7 @@ "license-name": "GPL-2.0-or-later", "type": "parserhook", "requires": { - "MediaWiki": ">= 1.39" + "MediaWiki": ">= 1.43" }, "ExtensionMessagesFiles": { "MermaidMagic": "i18n/extra/Mermaid.magic.php" From 2f3b58483c8129543c3f752de8b4ea0a1beb8e96 Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 14 May 2026 00:56:17 +0100 Subject: [PATCH 4/5] Add return types to getTestCaseLocation and getPermittedSettings --- .../Integration/JSONScript/JsonTestCaseScriptRunnerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php b/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php index 81f52d1..2539183 100644 --- a/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php +++ b/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php @@ -22,11 +22,11 @@ protected function setUp(): void { Hooks::onParserFirstCallInit( $parser ); } - protected function getTestCaseLocation() { + protected function getTestCaseLocation(): string { return __DIR__ . '/TestCases'; } - protected function getPermittedSettings() { + protected function getPermittedSettings(): array { return array_merge( parent::getPermittedSettings(), [] ); } From c8dbbcb84448e11f33121ef9a20a6fa6bc51c95b Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 14 May 2026 00:57:07 +0100 Subject: [PATCH 5/5] Add return type declaration to getDependencyDefinitions --- .../Integration/JSONScript/JsonTestCaseScriptRunnerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php b/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php index 2539183..d0e26d5 100644 --- a/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php +++ b/tests/phpunit/Integration/JSONScript/JsonTestCaseScriptRunnerTest.php @@ -35,7 +35,7 @@ protected function getPermittedSettings(): array { * * @return array */ - protected function getDependencyDefinitions() { + protected function getDependencyDefinitions(): array { return [ 'Mermaid' => [ $this, 'checkMermaidDependency' ] ];