From 1b2e4ecedac0cf344ec5d73e15fa132811a023f7 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:19:49 +0100 Subject: [PATCH 01/10] Add CI for MW 1.44-1.45, remove MW 1.39-1.42 --- .github/workflows/ci.yaml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c279b05..0e3178a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,39 +17,32 @@ jobs: strategy: matrix: include: - - mediawiki_version: '1.39' + - mediawiki_version: '1.43' smw_version: dev-master php_version: 8.1 database_type: mysql - database_image: "mariadb:10" + database_image: "mariadb:10.11" coverage: false experimental: false - - mediawiki_version: '1.40' + - mediawiki_version: '1.43' smw_version: dev-master - php_version: 8.1 + php_version: 8.2 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:11.4" coverage: true experimental: false - - mediawiki_version: '1.41' - smw_version: dev-master - php_version: 8.1 - database_type: mysql - database_image: "mariadb:11.2" - coverage: false - experimental: false - - mediawiki_version: '1.42' + - mediawiki_version: '1.44' smw_version: dev-master - php_version: 8.1 + php_version: 8.3 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:11.4" coverage: false experimental: false - - mediawiki_version: '1.43' + - mediawiki_version: '1.45' smw_version: dev-master php_version: 8.1 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:11.8" coverage: false experimental: false From ffdaf7c492fb38d5402ca42655b912253e1da493 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:22:12 +0100 Subject: [PATCH 02/10] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0e3178a..03f0a85 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,7 +40,7 @@ jobs: experimental: false - mediawiki_version: '1.45' smw_version: dev-master - php_version: 8.1 + php_version: 8.4 database_type: mysql database_image: "mariadb:11.8" coverage: false From f6d504585d8df248e6f524c16f6473ff77b244c8 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:30:31 +0100 Subject: [PATCH 03/10] Update CannedResultArray.php --- src/ByHttpRequest/CannedResultArray.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ByHttpRequest/CannedResultArray.php b/src/ByHttpRequest/CannedResultArray.php index 5a6907d..db45bdd 100644 --- a/src/ByHttpRequest/CannedResultArray.php +++ b/src/ByHttpRequest/CannedResultArray.php @@ -57,7 +57,7 @@ public function __construct( DIWikiPage $resultPage, PrintRequest $printRequest, * * @return DIWikiPage */ - public function getResultSubject() { + public function getResultSubject(): DIWikiPage { return $this->mResult; } From 46d77d3f256ab8b416af3396bafbe2aad7305daf Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:34:12 +0100 Subject: [PATCH 04/10] Update CannedResultArray.php --- src/ByHttpRequest/CannedResultArray.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ByHttpRequest/CannedResultArray.php b/src/ByHttpRequest/CannedResultArray.php index db45bdd..79c8429 100644 --- a/src/ByHttpRequest/CannedResultArray.php +++ b/src/ByHttpRequest/CannedResultArray.php @@ -66,7 +66,7 @@ public function getResultSubject(): DIWikiPage { * * @return SMWDataItem[]|false */ - public function getContent() { + public function getContent(): array|false { $this->loadContent(); if ( !$this->mContent ) { @@ -87,7 +87,7 @@ public function getContent() { * * @return PrintRequest */ - public function getPrintRequest() { + public function getPrintRequest(): PrintRequest { return $this->mPrintRequest; } @@ -113,7 +113,7 @@ public function getNextDataItem() { * * @return SMWDataItem|false */ - public function reset() { + public function reset(): mixed { $this->loadContent(); $result = reset( $this->mContent ); From df8f491e55fa761fa0ccda751a94118f628a5838 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:37:07 +0100 Subject: [PATCH 05/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 491a15a..4d0d3a5 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "mediawiki/http-request": "~2.0|~1.1" }, "require-dev": { - "mediawiki/mediawiki-codesniffer": "43.0.0", + "mediawiki/mediawiki-codesniffer": "46.0.0", "mediawiki/minus-x": "1.1.3", "php-parallel-lint/php-console-highlighter": "1.0.0", "php-parallel-lint/php-parallel-lint": "1.4.0" From 5243d23f2bf41db0235ab41d323e00694243918a Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:38:55 +0100 Subject: [PATCH 06/10] Update QueryResult.php --- src/ByHttpRequest/QueryResult.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ByHttpRequest/QueryResult.php b/src/ByHttpRequest/QueryResult.php index 304e791..c4c7cf6 100644 --- a/src/ByHttpRequest/QueryResult.php +++ b/src/ByHttpRequest/QueryResult.php @@ -48,7 +48,7 @@ public function setJsonResponseParser( JsonResponseParser $jsonResponseParser ) * * @return array */ - public function toArray() { + public function toArray(): array { return $this->jsonResponseParser->getRawResponseResult(); } @@ -59,7 +59,7 @@ public function toArray() { * * @return array */ - public function serializeToArray() { + public function serializeToArray(): array { return $this->toArray(); } @@ -68,7 +68,7 @@ public function serializeToArray() { * * @return CannedResultArray[]|false */ - public function getNext() { + public function getNext(): false|array { $page = current( $this->mResults ); next( $this->mResults ); From ef08401c8e869ddcba0ca56306fbecfa77efb373 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:42:45 +0100 Subject: [PATCH 07/10] Update ResponsePropertyList.php --- src/ByHttpRequest/ResponsePropertyList.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ByHttpRequest/ResponsePropertyList.php b/src/ByHttpRequest/ResponsePropertyList.php index 3cfe2d6..da89f3e 100644 --- a/src/ByHttpRequest/ResponsePropertyList.php +++ b/src/ByHttpRequest/ResponsePropertyList.php @@ -118,10 +118,10 @@ private function newProperty( $value ) { $property = DIProperty::newFromUserLabel( $value['label'] ); if ( $property->isUserDefined() ) { - return $property->setPropertyTypeId( $value['typeid'] ); + return $property->setPropertyValueType( $value['typeid'] ); } - if ( $property->findPropertyTypeID() === $value['typeid'] ) { + if ( $property->findPropertyValueType() === $value['typeid'] ) { return $property; } From d95ef3d2c3f20d852822bbbe73d5076b8419251e Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:43:26 +0100 Subject: [PATCH 08/10] Update DataValueDeserializerTest.php --- tests/phpunit/Unit/DataValueDeserializerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/Unit/DataValueDeserializerTest.php b/tests/phpunit/Unit/DataValueDeserializerTest.php index a8a5048..68ced1b 100644 --- a/tests/phpunit/Unit/DataValueDeserializerTest.php +++ b/tests/phpunit/Unit/DataValueDeserializerTest.php @@ -51,7 +51,7 @@ public function testNewTimeValueForOutOfRangeTimestamp() { $instance = new DataValueDeserializer( 'foo' ); $property = new DIProperty( 'Bar' ); - $property->setPropertyTypeId( '_dat' ); + $property->setPropertyValueType( '_dat' ); $this->assertNotEquals( DITime::doUnserialize( '2/-200' ), @@ -63,7 +63,7 @@ public function testNewTimeValueForRawTimeFromat() { $instance = new DataValueDeserializer( 'foo' ); $property = new DIProperty( 'Bar' ); - $property->setPropertyTypeId( '_dat' ); + $property->setPropertyValueType( '_dat' ); $this->assertEquals( DITime::doUnserialize( '2/-200' ), @@ -75,7 +75,7 @@ public function testNewRecordValue() { $instance = new DataValueDeserializer( 'foo' ); $property = new DIProperty( 'Foo' ); - $property->setPropertyTypeId( '_rec' ); + $property->setPropertyValueType( '_rec' ); $item = [ 'namespace' => NS_MAIN, @@ -98,7 +98,7 @@ public function testTextValueWithEmbeddedLink() { $instance = new DataValueDeserializer( 'abc' ); $property = new DIProperty( 'Bar' ); - $property->setPropertyTypeId( '_txt' ); + $property->setPropertyValueType( '_txt' ); $dataValue = $instance->newDataValueFrom( $property, 'Foo [[42]] bar' ); From 9a3c4b88887c301bd75b0853412c36cb21d91e1d Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:43:46 +0100 Subject: [PATCH 09/10] Update DataValueDeserializer.php --- src/DataValueDeserializer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DataValueDeserializer.php b/src/DataValueDeserializer.php index f1e9890..8bba5b8 100644 --- a/src/DataValueDeserializer.php +++ b/src/DataValueDeserializer.php @@ -2,6 +2,7 @@ namespace SEQL; +use MediaWiki\Title\Title; use SMW\DataModel\ContainerSemanticData; use SMW\DataValueFactory; use SMW\DIProperty; @@ -97,7 +98,7 @@ public function newDiWikiPage( array $value ) { $value['fulltext'] = substr( $value['fulltext'], ( $pos = strpos( $value['fulltext'], ':' ) ) !== false ? $pos + 1 : 0 ); } - $title = \Title::newFromText( $this->querySource . ':' . str_replace( " ", "_", $value['fulltext'] ), $ns ); + $title = Title::newFromText( $this->querySource . ':' . str_replace( " ", "_", $value['fulltext'] ), $ns ); return DIWikiPage::newFromTitle( $title ); } From b4796aac1a00771b26ca7231b477330984d09d88 Mon Sep 17 00:00:00 2001 From: paladox Date: Fri, 5 Jun 2026 17:44:03 +0100 Subject: [PATCH 10/10] Update extension.json --- extension.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension.json b/extension.json index 0bc368d..2f7a5fb 100644 --- a/extension.json +++ b/extension.json @@ -9,9 +9,9 @@ "license-name": "GPL-2.0-or-later", "type": "semantic", "requires": { - "MediaWiki": ">= 1.39", + "MediaWiki": ">= 1.43", "extensions": { - "SemanticMediaWiki": ">= 4.2" + "SemanticMediaWiki": ">= 6.0" } }, "MessagesDirs": {