Skip to content

Commit 787e834

Browse files
jaiderafjaideraf
authored
Merge pull request #45 from SemanticMediaWiki/paladox-patch-2
Add CI for MW 1.44-1.45 and remove MW 1.39-1.42
2 parents 7b64256 + b866d17 commit 787e834

9 files changed

Lines changed: 30 additions & 77 deletions

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,28 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- mediawiki_version: '1.39'
20+
- mediawiki_version: '1.43'
2121
php_version: 8.1
2222
database_type: mysql
2323
database_image: "mariadb:10"
2424
coverage: false
2525
experimental: false
26-
- mediawiki_version: '1.40'
26+
- mediawiki_version: '1.43'
2727
php_version: 8.1
2828
database_type: mysql
29-
database_image: "mariadb:11.2"
29+
database_image: "mariadb:10"
3030
coverage: true
3131
experimental: false
32-
- mediawiki_version: '1.41'
33-
php_version: 8.1
34-
database_type: mysql
35-
database_image: "mariadb:11.2"
36-
coverage: false
37-
experimental: false
38-
- mediawiki_version: '1.42'
39-
php_version: 8.1
32+
- mediawiki_version: '1.44'
33+
php_version: 8.2
4034
database_type: mysql
41-
database_image: "mariadb:11.2"
35+
database_image: "mariadb:11.8"
4236
coverage: false
4337
experimental: false
44-
- mediawiki_version: '1.43'
45-
php_version: 8.1
38+
- mediawiki_version: '1.45'
39+
php_version: 8.3
4640
database_type: mysql
47-
database_image: "mariadb:11.2"
41+
database_image: "mariadb:11.8"
4842
coverage: false
4943
experimental: false
5044

‎extension.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"namemsg": "knowledge-graph-name",
88
"type":"semantic",
99
"requires":{
10-
"MediaWiki": ">= 1.39"
10+
"MediaWiki": ">= 1.43"
1111
},
1212
"MessagesDirs": {
1313
"KnowledgeGraph":[
@@ -17,9 +17,6 @@
1717
"ExtensionMessagesFiles": {
1818
"KnowledgeGraphMagic": "KnowledgeGraph.i18n.magic.php"
1919
},
20-
"AutoloadNamespaces": {
21-
"MediaWiki\\Extension\\KnowledgeGraph\\Aliases\\": "includes/aliases/"
22-
},
2320
"AutoloadClasses": {
2421
"KnowledgeGraph":"includes/KnowledgeGraph.php",
2522
"SpecialKnowledgeGraphDesigner":"includes/specials/SpecialKnowledgeGraphDesigner.php",
@@ -132,4 +129,4 @@
132129
}
133130
},
134131
"manifest_version": 2
135-
}
132+
}

‎includes/KnowledgeGraph.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* @author thomas-topway-it for KM-A
88
*/
99

10-
// use MediaWiki\Extension\KnowledgeGraph\Aliases\Category as CategoryClass;
11-
use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
10+
// use MediaWiki\Category\Category;
1211
use MediaWiki\MediaWikiServices;
1312
use MediaWiki\Revision\SlotRecord;
13+
use MediaWiki\Title\Title;
1414
use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions;
1515

1616
class KnowledgeGraph {
@@ -255,15 +255,15 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv )
255255
// property-related options
256256
foreach ( $values as $val ) {
257257
if ( preg_match( '/^property-options(\?(.+))?=(.+)/', $val, $match ) ) {
258-
$title_ = TitleClass::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] );
258+
$title_ = Title::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] );
259259
if ( $title_ ) {
260260
$propertyOptions[$title_->getText()] = $match[3];
261261
}
262262
}
263263
}
264264

265265
foreach ( $params['nodes'] as $titleText ) {
266-
$title_ = TitleClass::newFromText( $titleText );
266+
$title_ = Title::newFromText( $titleText );
267267
if ( $title_ && $title_->isKnown() ) {
268268
if ( !isset( self::$data[$title_->getFullText()] ) ) {
269269
self::setSemanticDataFromApi( $title_, $params['properties'], 0, $params['depth'] );
@@ -274,7 +274,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv )
274274
$graphOptions = [];
275275
if ( !empty( $params['graph-options'] ) ) {
276276
// , NS_KNOWLEDGEGRAPH
277-
$title_ = TitleClass::newFromText( $params['graph-options'], NS_MEDIAWIKI );
277+
$title_ = Title::newFromText( $params['graph-options'], NS_MEDIAWIKI );
278278

279279
if ( $title_ && $title_->isKnown() ) {
280280
// $graphOptions = json_decode( self::getWikipageContent( $title_ ), true );
@@ -283,7 +283,7 @@ public static function parserFunctionKnowledgeGraph( Parser $parser, ...$argv )
283283
}
284284

285285
foreach ( $propertyOptions as $property => $titleText ) {
286-
$title_ = TitleClass::newFromText( $titleText, NS_MEDIAWIKI );
286+
$title_ = Title::newFromText( $titleText, NS_MEDIAWIKI );
287287
if ( $title_ && $title_->isKnown() ) {
288288
// $propertyOptions[$property] = json_decode( self::getWikipageContent( $title_ ), true );
289289
$propertyOptions[$property] = self::getWikipageContent( $title_ );
@@ -449,7 +449,7 @@ public static function getAllPropertiesForNode( string $nodeTitleText ): array {
449449
}
450450

451451
/**
452-
* @param Title|MediaWiki\Title\Title $title $title
452+
* @param Title $title $title
453453
* @return string|null
454454
*/
455455
public static function getWikipageContent( $title ) {
@@ -466,7 +466,7 @@ public static function getWikipageContent( $title ) {
466466
}
467467

468468
/**
469-
* @param Title|MediaWiki\Title\Title $title
469+
* @param Title $title
470470
* @return WikiPage|null
471471
*/
472472
public static function getWikiPage( $title ) {
@@ -594,15 +594,15 @@ public static function articlesInCategories( $category, $limit, $offset ) {
594594
);
595595
$ret = [];
596596
foreach ( $res as $row ) {
597-
$title_ = TitleClass::newFromID( $row->pageid );
597+
$title_ = Title::newFromID( $row->pageid );
598598
if ( $title_ ) {
599599
$ret[] = $title_;
600600
}
601601
}
602602
return $ret;
603603

604604
// *** this does not work with numerical offset
605-
// $cat = CategoryClass::newFromName( str_replace( ' ', '_', $category ) );
605+
// $cat = Category::newFromName( str_replace( ' ', '_', $category ) );
606606
// $iterator_ = $cat->getMembers( $limit, $offset );
607607
// $ret = [];
608608
// while ( $iterator_->valid() ) {
@@ -614,7 +614,7 @@ public static function articlesInCategories( $category, $limit, $offset ) {
614614

615615
/**
616616
* @see https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/PageProperties/+/refs/heads/1.0.3/includes/PageProperties.php
617-
* @param Title|MediaWiki\Title\Title $title
617+
* @param Title $title
618618
* @param array $onlyProperties
619619
* @param int $depth
620620
* @param int $maxDepth

‎includes/aliases/Category.php‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎includes/aliases/Title.php‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎includes/api/KnowledgeGraphApiLoadCategories.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* @author thomas-topway-it for KM-A
88
*/
99

10-
use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
1110
use MediaWiki\MediaWikiServices;
11+
use MediaWiki\Title\Title;
1212

1313
class KnowledgeGraphApiLoadCategories extends ApiBase {
1414

@@ -139,7 +139,7 @@ public function execute() {
139139

140140
$titles = [];
141141
foreach ( $categories as $categoryText ) {
142-
$category_ = TitleClass::makeTitleSafe( NS_CATEGORY, $categoryText );
142+
$category_ = Title::makeTitleSafe( NS_CATEGORY, $categoryText );
143143
// && $category_->isKnown()
144144
if ( $category_ ) {
145145
$titles_ = \KnowledgeGraph::articlesInCategories(

‎includes/api/KnowledgeGraphApiLoadNodes.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author thomas-topway-it for KM-A
88
*/
99

10-
use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
10+
use MediaWiki\Title\Title;
1111

1212
class KnowledgeGraphApiLoadNodes extends ApiBase {
1313

@@ -107,7 +107,7 @@ public function execute() {
107107

108108
$titles = explode( '|', $params['titles'] );
109109
foreach ( $titles as $titleText ) {
110-
$title_ = TitleClass::newFromText( $titleText );
110+
$title_ = Title::newFromText( $titleText );
111111
if ( !$title_ || !$title_->isKnown() ) {
112112
continue;
113113
}

‎includes/api/KnowledgeGraphApiLoadProperties.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author thomas-topway-it for KM-A
88
*/
99

10-
use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
10+
use MediaWiki\Title\Title;
1111

1212
class KnowledgeGraphApiLoadProperties extends ApiBase {
1313

@@ -45,7 +45,7 @@ public function execute() {
4545

4646
$params['nodes'] = explode( '|', $params['nodes'] );
4747
foreach ( $params['nodes'] as $titleText ) {
48-
$title_ = TitleClass::newFromText( $titleText );
48+
$title_ = Title::newFromText( $titleText );
4949
if ( $title_ && $title_->isKnown() ) {
5050
if ( !isset( self::$data[$title_->getFullText()] ) ) {
5151
\KnowledgeGraph::setSemanticDataFromApi(

‎includes/specials/SpecialKnowledgeGraphDesigner.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
3+
use MediaWiki\Title\Title;
44

55
/**
66
* @ingroup SpecialPage
@@ -45,7 +45,7 @@ public function execute( $par ) {
4545
$params = \KnowledgeGraph::applyDefaultParams( $defaultParameters, $params );
4646

4747
\KnowledgeGraph::initSMW();
48-
$title_ = TitleClass::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
48+
$title_ = Title::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
4949

5050
$graphOptions = [];
5151
if ( $title_ && $title_->isKnown() ) {

0 commit comments

Comments
 (0)