Skip to content

Remove CI for MW 1.42 and less and add it for 1.44 and 1.45 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paladox wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Remove CI for MW 1.42 and less and add it for 1.44 and 1.45 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b629081
Remove CI for MW 1.42 and less and add it for 1.44 and 1.45
paladox Mar 13, 2026
cf93f4f
Update MediaWiki version requirement to 1.43
paladox Mar 13, 2026
ff43830
Add Title class import to KnowledgeGraph.php
paladox Mar 13, 2026
30e14bb
Replace TitleClass with Title in KnowledgeGraph.php
paladox Mar 13, 2026
f881c58
Replace TitleClass with Title in SpecialKnowledgeGraphDesigner
paladox Mar 13, 2026
514e72d
Replace TitleClass with Title in KnowledgeGraphApiLoadCategories
paladox Mar 13, 2026
b31fce7
Replace TitleClass with MediaWiki Title class
paladox Mar 13, 2026
84a483a
Update KnowledgeGraphApiLoadProperties.php
paladox Mar 13, 2026
3ceb932
Delete includes/aliases/Title.php
paladox Mar 13, 2026
fe1dd91
Update KnowledgeGraph.php
paladox Mar 13, 2026
56edc61
Delete includes/aliases/Category.php
paladox Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"namemsg": "knowledge-graph-name",
"type":"semantic",
"requires":{
"MediaWiki": ">= 1.39"
"MediaWiki": ">= 1.43"
},
"MessagesDirs": {
"KnowledgeGraph":[
Expand Down Expand Up @@ -132,4 +132,4 @@
}
},
"manifest_version": 2
}
}
16 changes: 8 additions & 8 deletions includes/KnowledgeGraph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'] );
Expand All @@ -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 );
Expand All @@ -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_ );
Expand Down Expand Up @@ -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() ) {
Expand Down
19 changes: 0 additions & 19 deletions includes/aliases/Category.php
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions includes/aliases/Title.php
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions includes/api/KnowledgeGraphApiLoadCategories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions includes/api/KnowledgeGraphApiLoadNodes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions includes/api/KnowledgeGraphApiLoadProperties.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions includes/specials/SpecialKnowledgeGraphDesigner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
use MediaWiki\Title\Title;

/**
* @ingroup SpecialPage
Expand Down Expand Up @@ -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() ) {
Expand Down
Loading