Add CI for MW 1.44-1.45 and remove MW 1.39-1.42

.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
-            database_type: mysql
-            database_image: "mariadb:11.2"
-            coverage: false
-            experimental: false
-          - mediawiki_version: '1.42'
-            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.43'
-            php_version: 8.1
+          - mediawiki_version: '1.45'
+            php_version: 8.3
             database_type: mysql
-            database_image: "mariadb:11.2"
+            database_image: "mariadb:11.8"
             coverage: false
             experimental: false
 

extension.json

@@ -7,7 +7,7 @@
 	"namemsg": "knowledge-graph-name",
 	"type":"semantic",
 	"requires":{
-		"MediaWiki": ">= 1.39"
+		"MediaWiki": ">= 1.43"
 	},
 	"MessagesDirs": {
 		"KnowledgeGraph":[
@@ -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",
@@ -132,4 +129,4 @@
 		}
 	},
 	"manifest_version": 2
-}
+}

includes/KnowledgeGraph.php

@@ -7,10 +7,10 @@
  * @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\Revision\SlotRecord;
+use MediaWiki\Title\Title;
 use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions;
 
 class KnowledgeGraph {
@@ -255,15 +255,15 @@ 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];
 				}
 			}
 		}
 
 		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_ );
@@ -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 ) {
@@ -594,15 +594,15 @@ 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_;
 			}
 		}
 		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() ) {
@@ -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

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(

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;
 			}

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(

includes/specials/SpecialKnowledgeGraphDesigner.php

@@ -1,6 +1,6 @@
 <?php
 
-use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
+use MediaWiki\Title\Title;
 
 /**
  * @ingroup SpecialPage
@@ -45,7 +45,7 @@ public function execute( $par ) {
 		$params = \KnowledgeGraph::applyDefaultParams( $defaultParameters, $params );
 
 		\KnowledgeGraph::initSMW();
-		$title_ = TitleClass::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
+		$title_ = Title::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
 
 		$graphOptions = [];
 		if ( $title_ && $title_->isKnown() ) {