add class aliases, fix categories limit-offset

.phpcs.xml

@@ -2,10 +2,11 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
 		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage" />
+		<exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
 	</rule>
 	<file>.</file>
     <exclude-pattern>/(vendor|conf)/</exclude-pattern>
 	<exclude-pattern type="relative">extensions/*</exclude-pattern>
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
-</ruleset>
+</ruleset>

extension.json

@@ -17,6 +17,9 @@
 	"ExtensionMessagesFiles": {
 		"KnowledgeGraphMagic": "KnowledgeGraph.i18n.magic.php"
 	},
+	"AutoloadNamespaces": {
+		"MediaWiki\\Extension\\KnowledgeGraph\\Aliases\\": "includes/aliases/"
+	},
 	"AutoloadClasses": {
 		"KnowledgeGraph":"includes/KnowledgeGraph.php",
 		"SpecialKnowledgeGraphDesigner":"includes/specials/SpecialKnowledgeGraphDesigner.php",

includes/KnowledgeGraph.php

@@ -7,6 +7,8 @@
  * @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\MediaWikiServices;
 use MediaWiki\Revision\SlotRecord;
 use SMW\MediaWiki\Specials\SearchByProperty\PageRequestOptions;
@@ -142,7 +144,7 @@
 	public static function onLoadExtensionSchemaUpdates( DatabaseUpdater $updater = null ) {
 		$text = file_get_contents( __DIR__ . '/../data/KnowledgeGraphOptions.js' );
 		$user = RequestContext::getMain()->getUser();
-		$title = Title::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
+		$title = TitleClass::makeTitleSafe( NS_MEDIAWIKI, 'KnowledgeGraphOptions' );
 
 		$wikiPage = self::getWikiPage( $title );
 		$pageUpdater = $wikiPage->newPageUpdater( $user );
@@ -226,15 +228,15 @@
 		// property-related options
 		foreach ( $values as $val ) {
 			if ( preg_match( '/^property-options(\?(.+))?=(.+)/', $val, $match ) ) {
-				$title_ = Title::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] );
+				$title_ = TitleClass::makeTitleSafe( \SMW_NS_PROPERTY, $match[2] );
 				if ( $title_ ) {
 					$propertyOptions[$title_->getText()] = $match[3];
 				}
 			}
 		}
 
 		foreach ( $params['nodes'] as $titleText ) {
-			$title_ = Title::newFromText( $titleText );
+			$title_ = TitleClass::newFromText( $titleText );
 			if ( $title_ && $title_->isKnown() ) {
 				if ( !isset( self::$data[$title_->getFullText()] ) ) {
 					self::setSemanticData( $title_, $params['properties'], 0, $params['depth'] );
@@ -245,7 +247,7 @@
 		$graphOptions = [];
 		if ( !empty( $params['graph-options'] ) ) {
 			// , NS_KNOWLEDGEGRAPH
-			$title_ = Title::newFromText( $params['graph-options'], NS_MEDIAWIKI );
+			$title_ = TitleClass::newFromText( $params['graph-options'], NS_MEDIAWIKI );
 
 			if ( $title_ && $title_->isKnown() ) {
 				// $graphOptions = json_decode( self::getWikipageContent( $title_ ), true );
@@ -254,7 +256,7 @@
 		}
 
 		foreach ( $propertyOptions as $property => $titleText ) {
-			$title_ = Title::newFromText( $titleText, NS_MEDIAWIKI );
+			$title_ = TitleClass::newFromText( $titleText, NS_MEDIAWIKI );
 			if ( $title_ && $title_->isKnown() ) {
 				// $propertyOptions[$property] = json_decode( self::getWikipageContent( $title_ ), true );
 				$propertyOptions[$property] = self::getWikipageContent( $title_ );
@@ -320,7 +322,7 @@
 	}
 
 	/**
-	 * @param Title $title
+	 * @param Title|MediaWiki\Title\Title $title $title
 	 * @return string|null
 	 */
 	public static function getWikipageContent( $title ) {
@@ -337,7 +339,7 @@
 	}
 
 	/**
-	 * @param Title $title
+	 * @param Title|MediaWiki\Title\Title $title
 	 * @return WikiPage|null
 	 */
 	public static function getWikiPage( $title ) {
@@ -443,30 +445,46 @@
 	}
 
 	/**
-	 *
 	 * @param string $category
+	 * @param int $limit
+	 * @param int $offset
 	 * @return array
 	 */
-	public static function articlesInCategories( $category ) {
-		$dbr = wfGetDB( DB_REPLICA );
-		$res = $dbr->select( 'categorylinks',
+	public static function articlesInCategories( $category, $limit, $offset ) {
+		 $options = [
+			'LIMIT' => $limit,
+			'OFFSET' => $offset
+		 ];
+		 $dbr = wfGetDB( DB_REPLICA );
+		 $res = $dbr->select( 'categorylinks',
 			[ 'pageid' => 'cl_from' ],
 			[ 'cl_to' => str_replace( ' ', '_', $category ) ],
-			__METHOD__
-		);
-		$ret = [];
+			__METHOD__,
+			$options
+		 );
+		 $ret = [];
 		foreach ( $res as $row ) {
-			$title_ = Title::newFromID( $row->pageid );
+			$title_ = TitleClass::newFromID( $row->pageid );
 			if ( $title_ ) {
 				$ret[] = $title_;
 			}
 		}
 		return $ret;
+
+		// *** this does not work with numerical offset
+		// $cat = CategoryClass::newFromName( str_replace( ' ', '_', $category ) );
+		// $iterator_ = $cat->getMembers( $limit, $offset );
+		// $ret = [];
+		// while ( $iterator_->valid() ) {
+		// 	$ret[] = $iterator_->current();
+		// 	$iterator_->next();
+		// }
+		// return $ret;
 	}
 
 	/**
 	 * @see https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/PageProperties/+/refs/heads/1.0.3/includes/PageProperties.php
-	 * @param Title $title
+	 * @param Title|MediaWiki\Title\Title $title
 	 * @param array $onlyProperties
 	 * @param int $depth
 	 * @param int $maxDepth
@@ -532,7 +550,8 @@
 
 			if ( count( $onlyProperties )
 				&& !in_array( $canonicalLabel, $onlyProperties )
-				&& !in_array( $preferredLabel, $onlyProperties ) ) {
+				&& !in_array( $preferredLabel, $onlyProperties )
+			) {
 				continue;
 			}
 

includes/aliases/Category.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * KnowledgeGraph
+ *
+ * @license GPL-2.0-or-later
+ * @author thomas-topway-it for KM-A
+ */
+
+namespace MediaWiki\Extension\KnowledgeGraph\Aliases;
+
+if ( class_exists( 'Category' ) ) {
+	class Category extends \Category {
+	}
+} else {
+	// phpcs:ignore Generic.Classes.DuplicateClassName.Found
+	class Category extends \Mediawiki\Title\Category {
+	}
+}

includes/aliases/Title.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * KnowledgeGraph
+ *
+ * @license GPL-2.0-or-later
+ * @author thomas-topway-it for KM-A
+ */
+
+namespace MediaWiki\Extension\KnowledgeGraph\Aliases;
+
+if ( class_exists( 'Title' ) ) {
+	class Title extends \Title {
+	}
+} else {
+	// phpcs:ignore Generic.Classes.DuplicateClassName.Found
+	class Title extends \Mediawiki\Title\Title {
+	}
+}

includes/api/KnowledgeGraphApiLoadCategories.php

@@ -7,6 +7,8 @@
  * @author thomas-topway-it for KM-A
  */
 
+use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
+
 class KnowledgeGraphApiLoadCategories extends ApiBase {
 
 	/**
@@ -38,10 +40,14 @@
 
 		$titles = [];
 		foreach ( $categories as $categoryText ) {
-			$category_ = Title::makeTitleSafe( NS_CATEGORY, $categoryText );
+			$category_ = TitleClass::makeTitleSafe( NS_CATEGORY, $categoryText );
 			// && $category_->isKnown()
 			if ( $category_ ) {
-				$titles_ = \KnowledgeGraph::articlesInCategories( $categoryText );
+				$titles_ = \KnowledgeGraph::articlesInCategories(
+					$categoryText,
+					$params['limit'],
+					$params['offset']
+				);
 
 				foreach ( $titles_ as $title_ ) {
 					$titles[$title_->getFullText()] = $title_;

includes/api/KnowledgeGraphApiLoadNodes.php

@@ -7,6 +7,8 @@
  * @author thomas-topway-it for KM-A
  */
 
+use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
+
 class KnowledgeGraphApiLoadNodes extends ApiBase {
 
 	/**
@@ -39,7 +41,7 @@
 
 		$titles = explode( '|', $params['titles'] );
 		foreach ( $titles as $titleText ) {
-			$title_ = Title::newFromText( $titleText );
+			$title_ = TitleClass::newFromText( $titleText );
 			if ( $title_ && $title_->isKnown() ) {
 				if ( !isset( self::$data[$title_->getFullText()] ) ) {
 					\KnowledgeGraph::setSemanticData( $title_, $params['properties'], 0, $params['depth'] );

includes/api/KnowledgeGraphApiLoadProperties.php

@@ -7,6 +7,8 @@
  * @author thomas-topway-it for KM-A
  */
 
+use MediaWiki\Extension\KnowledgeGraph\Aliases\Title as TitleClass;
+
 class KnowledgeGraphApiLoadProperties extends ApiBase {
 
 	/**
@@ -37,12 +39,13 @@
 		$titles_ = explode( '|', $params['properties'] );
 		$titles = [];
 		foreach ( $titles_ as $titleText ) {
-			$title_ = Title::makeTitleSafe( SMW_NS_PROPERTY, $titleText );
+			$title_ = TitleClass::makeTitleSafe( SMW_NS_PROPERTY, $titleText );
 			if ( $title_ && $title_->isKnown() ) {
 				$subjects = \KnowledgeGraph::getSubjectsByProperty(
-												$title_->getText(),
-												$params['limit'],
-												$params['offset'] );
+					$title_->getText(),
+					$params['limit'],
+					$params['offset']
+				);
 				foreach ( $subjects as $title__ ) {
 					$titles[$title__->getFullText()] = $title__;
 				}

includes/specials/SpecialKnowledgeGraphDesigner.php

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