From d81b19f554013baff0f4953a8a3712bac0130615 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:38:21 +0100 Subject: [PATCH 01/14] Add CI for MW 1.44-1.45 and remove MW 1.39-1.42 --- .github/workflows/ci.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8829e7a..7203710 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,34 +17,28 @@ jobs: strategy: matrix: include: - - mediawiki_version: '1.39' + - mediawiki_version: '1.43' php_version: 8.1 database_type: mysql database_image: "mariadb:10" coverage: false experimental: false - - mediawiki_version: '1.40' + - mediawiki_version: '1.43' php_version: 8.1 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:10" coverage: true experimental: false - - mediawiki_version: '1.41' - php_version: 8.1 + - mediawiki_version: '1.44' + php_version: 8.2 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:11.8" coverage: false experimental: false - - mediawiki_version: '1.42' - php_version: 8.1 - database_type: mysql - database_image: "mariadb:11.2" - coverage: false - experimental: false - - mediawiki_version: '1.43' + - mediawiki_version: '1.45' php_version: 8.1 database_type: mysql - database_image: "mariadb:11.2" + database_image: "mariadb:11.8" coverage: false experimental: false From f3e128d1ba639a50deacc9d807464e4a62579996 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:39:14 +0100 Subject: [PATCH 02/14] Update extension.json --- extension.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension.json b/extension.json index bf1331d..c222b78 100644 --- a/extension.json +++ b/extension.json @@ -7,7 +7,7 @@ "namemsg": "knowledge-graph-name", "type":"semantic", "requires":{ - "MediaWiki": ">= 1.39" + "MediaWiki": ">= 1.43" }, "MessagesDirs": { "KnowledgeGraph":[ @@ -132,4 +132,4 @@ } }, "manifest_version": 2 -} \ No newline at end of file +} From d75dfef34fc7c38518a89fece44e2fdc958fd009 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:40:25 +0100 Subject: [PATCH 03/14] Update extension.json --- extension.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/extension.json b/extension.json index c222b78..7a435db 100644 --- a/extension.json +++ b/extension.json @@ -17,9 +17,6 @@ "ExtensionMessagesFiles": { "KnowledgeGraphMagic": "KnowledgeGraph.i18n.magic.php" }, - "AutoloadNamespaces": { - "MediaWiki\\Extension\\KnowledgeGraph\\Aliases\\": "includes/aliases/" - }, "AutoloadClasses": { "KnowledgeGraph":"includes/KnowledgeGraph.php", "SpecialKnowledgeGraphDesigner":"includes/specials/SpecialKnowledgeGraphDesigner.php", From 3e02709a9f758b47e9949a664a2a30679c9fb7ad Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:40:35 +0100 Subject: [PATCH 04/14] Delete includes/aliases/Title.php --- includes/aliases/Title.php | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 includes/aliases/Title.php diff --git a/includes/aliases/Title.php b/includes/aliases/Title.php deleted file mode 100644 index 7b0d2bb..0000000 --- a/includes/aliases/Title.php +++ /dev/null @@ -1,19 +0,0 @@ - Date: Sun, 12 Apr 2026 14:40:52 +0100 Subject: [PATCH 05/14] Delete includes/aliases/Category.php --- includes/aliases/Category.php | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 includes/aliases/Category.php diff --git a/includes/aliases/Category.php b/includes/aliases/Category.php deleted file mode 100644 index 24edf85..0000000 --- a/includes/aliases/Category.php +++ /dev/null @@ -1,19 +0,0 @@ - Date: Sun, 12 Apr 2026 14:43:37 +0100 Subject: [PATCH 06/14] Update KnowledgeGraph.php --- includes/KnowledgeGraph.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/KnowledgeGraph.php b/includes/KnowledgeGraph.php index 57d4394..3749a18 100644 --- a/includes/KnowledgeGraph.php +++ b/includes/KnowledgeGraph.php @@ -7,9 +7,9 @@ * @author thomas-topway-it for KM-A */ -// use MediaWiki\Extension\KnowledgeGraph\Aliases\Category as CategoryClass; -use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass; +use MediaWiki\Category\Category; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; use MediaWiki\Revision\SlotRecord; use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions; @@ -255,7 +255,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv ) // property-related options foreach ( $values as $val ) { if ( preg_match( '/^property-options(\?(.+))?=(.+)/', $val, $match ) ) { - $title_ = TitleClass::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] ); + $title_ = Title::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] ); if ( $title_ ) { $propertyOptions[$title_->getText()] = $match[3]; } @@ -263,7 +263,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv ) } foreach ( $params['nodes'] as $titleText ) { - $title_ = TitleClass::newFromText( $titleText ); + $title_ = Title::newFromText( $titleText ); if ( $title_ && $title_->isKnown() ) { if ( !isset( self::$data[$title_->getFullText()] ) ) { self::setSemanticDataFromApi( $title_, $params['properties'], 0, $params['depth'] ); @@ -274,7 +274,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv ) $graphOptions = []; if ( !empty( $params['graph-options'] ) ) { // , NS_KNOWLEDGEGRAPH - $title_ = TitleClass::newFromText( $params['graph-options'], NS_MEDIAWIKI ); + $title_ = Title::newFromText( $params['graph-options'], NS_MEDIAWIKI ); if ( $title_ && $title_->isKnown() ) { // $graphOptions = json_decode( self::getWikipageContent( $title_ ), true ); @@ -283,7 +283,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv ) } foreach ( $propertyOptions as $property => $titleText ) { - $title_ = TitleClass::newFromText( $titleText, NS_MEDIAWIKI ); + $title_ = Title::newFromText( $titleText, NS_MEDIAWIKI ); if ( $title_ && $title_->isKnown() ) { // $propertyOptions[$property] = json_decode( self::getWikipageContent( $title_ ), true ); $propertyOptions[$property] = self::getWikipageContent( $title_ ); @@ -594,7 +594,7 @@ public static function articlesInCategories( $category, $limit, $offset ) { ); $ret = []; foreach ( $res as $row ) { - $title_ = TitleClass::newFromID( $row->pageid ); + $title_ = Title::newFromID( $row->pageid ); if ( $title_ ) { $ret[] = $title_; } @@ -602,7 +602,7 @@ public static function articlesInCategories( $category, $limit, $offset ) { return $ret; // *** this does not work with numerical offset - // $cat = CategoryClass::newFromName( str_replace( ' ', '_', $category ) ); + // $cat = Category::newFromName( str_replace( ' ', '_', $category ) ); // $iterator_ = $cat->getMembers( $limit, $offset ); // $ret = []; // while ( $iterator_->valid() ) { From 4087c5cf26133557492246dfc120ce1880787aef Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:44:50 +0100 Subject: [PATCH 07/14] Update KnowledgeGraph.php --- includes/KnowledgeGraph.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/KnowledgeGraph.php b/includes/KnowledgeGraph.php index 3749a18..6c8dcc8 100644 --- a/includes/KnowledgeGraph.php +++ b/includes/KnowledgeGraph.php @@ -449,7 +449,7 @@ public static function getAllPropertiesForNode( string $nodeTitleText ): array { } /** - * @param Title|MediaWiki\Title\Title $title $title + * @param Title $title $title * @return string|null */ public static function getWikipageContent( $title ) { @@ -466,7 +466,7 @@ public static function getWikipageContent( $title ) { } /** - * @param Title|MediaWiki\Title\Title $title + * @param Title $title * @return WikiPage|null */ public static function getWikiPage( $title ) { @@ -614,7 +614,7 @@ public static function articlesInCategories( $category, $limit, $offset ) { /** * @see https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/PageProperties/+/refs/heads/1.0.3/includes/PageProperties.php - * @param Title|MediaWiki\Title\Title $title + * @param Title $title * @param array $onlyProperties * @param int $depth * @param int $maxDepth From 5592fa42217c9ba0e7b4d72f6a8c962c0ff5c782 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:45:22 +0100 Subject: [PATCH 08/14] Update KnowledgeGraphApiLoadCategories.php --- includes/api/KnowledgeGraphApiLoadCategories.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/api/KnowledgeGraphApiLoadCategories.php b/includes/api/KnowledgeGraphApiLoadCategories.php index f7f66ee..736e48d 100644 --- a/includes/api/KnowledgeGraphApiLoadCategories.php +++ b/includes/api/KnowledgeGraphApiLoadCategories.php @@ -7,8 +7,8 @@ * @author thomas-topway-it for KM-A */ -use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\Title; class KnowledgeGraphApiLoadCategories extends ApiBase { @@ -139,7 +139,7 @@ public function execute() { $titles = []; foreach ( $categories as $categoryText ) { - $category_ = TitleClass::makeTitleSafe( NS_CATEGORY, $categoryText ); + $category_ = Title::makeTitleSafe( NS_CATEGORY, $categoryText ); // && $category_->isKnown() if ( $category_ ) { $titles_ = \KnowledgeGraph::articlesInCategories( From d4b76877d8a4980b1cc06fc76ee674f71ff028b6 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:46:00 +0100 Subject: [PATCH 09/14] Update KnowledgeGraphApiLoadNodes.php --- includes/api/KnowledgeGraphApiLoadNodes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/api/KnowledgeGraphApiLoadNodes.php b/includes/api/KnowledgeGraphApiLoadNodes.php index f3f2ca7..cb80e88 100644 --- a/includes/api/KnowledgeGraphApiLoadNodes.php +++ b/includes/api/KnowledgeGraphApiLoadNodes.php @@ -7,7 +7,7 @@ * @author thomas-topway-it for KM-A */ -use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass; +use MediaWiki\Title\Title; class KnowledgeGraphApiLoadNodes extends ApiBase { @@ -107,7 +107,7 @@ public function execute() { $titles = explode( '|', $params['titles'] ); foreach ( $titles as $titleText ) { - $title_ = TitleClass::newFromText( $titleText ); + $title_ = Title::newFromText( $titleText ); if ( !$title_ || !$title_->isKnown() ) { continue; } From 1d5af5c93e52f02e923689d39843c4d6bca8b259 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:46:24 +0100 Subject: [PATCH 10/14] Update KnowledgeGraphApiLoadProperties.php --- includes/api/KnowledgeGraphApiLoadProperties.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/api/KnowledgeGraphApiLoadProperties.php b/includes/api/KnowledgeGraphApiLoadProperties.php index a9374e8..02037c7 100644 --- a/includes/api/KnowledgeGraphApiLoadProperties.php +++ b/includes/api/KnowledgeGraphApiLoadProperties.php @@ -7,7 +7,7 @@ * @author thomas-topway-it for KM-A */ -use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass; +use MediaWiki\Title\Title; class KnowledgeGraphApiLoadProperties extends ApiBase { @@ -45,7 +45,7 @@ public function execute() { $params['nodes'] = explode( '|', $params['nodes'] ); foreach ( $params['nodes'] as $titleText ) { - $title_ = TitleClass::newFromText( $titleText ); + $title_ = Title::newFromText( $titleText ); if ( $title_ && $title_->isKnown() ) { if ( !isset( self::$data[$title_->getFullText()] ) ) { \KnowledgeGraph::setSemanticDataFromApi( From 6a5ef5af0f525ebf04afd5752807c842e6b244b9 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:47:30 +0100 Subject: [PATCH 11/14] Update SpecialKnowledgeGraphDesigner.php --- includes/specials/SpecialKnowledgeGraphDesigner.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialKnowledgeGraphDesigner.php b/includes/specials/SpecialKnowledgeGraphDesigner.php index edfe734..8f83798 100644 --- a/includes/specials/SpecialKnowledgeGraphDesigner.php +++ b/includes/specials/SpecialKnowledgeGraphDesigner.php @@ -1,6 +1,6 @@ isKnown() ) { From 7262a9065efd285b1dc8a98f822e400e5fd46e68 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:48:44 +0100 Subject: [PATCH 12/14] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7203710..21d1fe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: coverage: false experimental: false - mediawiki_version: '1.45' - php_version: 8.1 + php_version: 8.3 database_type: mysql database_image: "mariadb:11.8" coverage: false From aa9eabb681d05d8d48266579cf2766bf07ddc40e Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:53:02 +0100 Subject: [PATCH 13/14] Update KnowledgeGraph.php --- includes/KnowledgeGraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/KnowledgeGraph.php b/includes/KnowledgeGraph.php index 6c8dcc8..7f0188f 100644 --- a/includes/KnowledgeGraph.php +++ b/includes/KnowledgeGraph.php @@ -7,7 +7,7 @@ * @author thomas-topway-it for KM-A */ -use MediaWiki\Category\Category; +// use MediaWiki\Category\Category; use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; use MediaWiki\Revision\SlotRecord; From b866d17a60626387cda81f1bf345bf5f211f9ff7 Mon Sep 17 00:00:00 2001 From: paladox Date: Sun, 12 Apr 2026 14:53:44 +0100 Subject: [PATCH 14/14] Update KnowledgeGraph.php --- includes/KnowledgeGraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/KnowledgeGraph.php b/includes/KnowledgeGraph.php index 7f0188f..d95cf88 100644 --- a/includes/KnowledgeGraph.php +++ b/includes/KnowledgeGraph.php @@ -9,8 +9,8 @@ // use MediaWiki\Category\Category; use MediaWiki\MediaWikiServices; -use MediaWiki\Title\Title; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Title\Title; use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions; class KnowledgeGraph {