diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8829e7a..20937c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,32 +17,26 @@ jobs: strategy: matrix: include: - - mediawiki_version: '1.39' + - mediawiki_version: '1.43' php_version: 8.1 database_type: mysql - database_image: "mariadb:10" + database_image: "mariadb:11.2" coverage: false experimental: false - - mediawiki_version: '1.40' + - mediawiki_version: '1.43' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" 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" 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' - php_version: 8.1 + - mediawiki_version: '1.45' + php_version: 8.3 database_type: mysql database_image: "mariadb:11.2" coverage: false 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 +} diff --git a/includes/KnowledgeGraph.php b/includes/KnowledgeGraph.php index 57d4394..892d309 100644 --- a/includes/KnowledgeGraph.php +++ b/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\Title\Category; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Title\Title; use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions; class KnowledgeGraph { @@ -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() ) { 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 @@ -isKnown() if ( $category_ ) { $titles_ = \KnowledgeGraph::articlesInCategories( 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; } 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( 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() ) {