Add missing use statement and deprecate old methods (#908)

* Add missing use statement and deprecate old methods * Update SRF_Boilerplate.php
SemanticMediaWiki · Feb 26, 2025 · 96062b3 · 96062b3
1 parent d316ba9
commit 96062b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/formats/boilerplate/SRF_Boilerplate.php b/formats/boilerplate/SRF_Boilerplate.php
@@ -1,6 +1,7 @@
 <?php
 
 use SMW\Query\QueryResult;
+use SMW\Query\Result\ResultArray;
 use SMW\Query\ResultPrinters\ResultPrinter;
 
 /**
@@ -101,12 +102,12 @@ protected function getResultData( QueryResult $result, $outputMode ) {
 		/**
 		 * Get all values for all rows that belong to the result set
 		 *
-		 * @var \SMW\Query\Result\ResultArray $rows
+		 * @var ResultArray $rows
 		 */
 		while ( $rows = $result->getNext() ) {
 
 			/**
-			 * @var \SMW\Query\Result\ResultArray $field
+			 * @var ResultArray $field
 			 * @var SMWDataValue $dataValue
 			 */
 			foreach ( $rows as $field ) {

diff --git a/formats/datatables/Api.php b/formats/datatables/Api.php
@@ -12,13 +12,14 @@
 namespace SRF\DataTables;
 
 use ApiBase;
-use ParamProcessor\ParamDefinition;
+use ParamProcessor\ParamDefinitionFactory;
 use SMW\DataValueFactory;
 use SMW\DataValues\PropertyChainValue;
 use SMW\Query\PrintRequest;
 use SMW\Services\ServicesFactory;
 use SMWQuery;
 use SMWQueryProcessor;
+use SpecialVersion;
 use SRF\DataTables;
 
 class Api extends ApiBase {
@@ -53,7 +54,7 @@ public function execute() {
 		$printer = new Datatables( 'datatables', true );
 
 		// get defaults of parameters for the 'datatable' result format as array of ParamDefinition
-		$paramDefinitions = ParamDefinition::getCleanDefinitions( $printer->getParamDefinitions( [] ) );
+		$paramDefinitions = ParamDefinitionFactory::newDefault()->newDefinitionsFromArrays( $printer->getParamDefinitions( [] ) );
 
 		// transform into normal key-value array
 		$parameters = [];

diff --git a/formats/datatables/DataTables.php b/formats/datatables/DataTables.php
@@ -17,10 +17,12 @@
 use SMW\DataValues\PropertyValue;
 use SMW\DIWikiPage;
 use SMW\Localizer\Message;
+use SMW\Parser\RecursiveTextProcessor;
 use SMW\Query\PrintRequest;
 use SMW\Query\QueryResult;
 use SMW\Query\ResultPrinters\ResultPrinter;
 use SMW\Utils\HtmlTable;
+use SMWDIBlob as DIBlob;
 use SRF\DataTables\SearchPanes;
 
 class DataTables extends ResultPrinter {

diff --git a/formats/datatables/SearchPanes.php b/formats/datatables/SearchPanes.php
@@ -142,7 +142,7 @@ private function getPanesOptions( $printRequest, $canonicalLabel, $searchPanesOp
 		$qobj = $querySegmentList[$rootid];
 
 		$property = new DIProperty( DIProperty::newFromUserLabel( $printRequest->getCanonicalLabel() ) );
-		$propTypeid = $property->findPropertyTypeID();
+		$propTypeid = $property->findPropertyValueType();
 
 		if ( $isCategory ) {
 
@@ -305,7 +305,7 @@ private function getPanesOptions( $printRequest, $canonicalLabel, $searchPanesOp
 		}
 
 		// @see ByGroupPropertyValuesLookup
-		$diType = DataTypeRegistry::getInstance()->getDataItemId(
+		$diType = DataTypeRegistry::getInstance()->getDataItemByType(
 			$propTypeid
 		);
 

diff --git a/src/Graph/GraphPrinter.php b/src/Graph/GraphPrinter.php
@@ -6,7 +6,6 @@
 use MediaWiki\MediaWikiServices;
 use SMW\Query\PrintRequest;
 use SMW\Query\QueryResult;
-use SMW\Query\Result\ResultArray;
 use SMW\Query\ResultPrinters\ResultPrinter;
 
 /**