Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56769
Change subject: Updating ParameterProcessor code [DO NOT MERGE]
......................................................................
Updating ParameterProcessor code [DO NOT MERGE]
Change-Id: I7161f51b6d1f905f95e781c563af11234cd518a9
---
M includes/SMW_QueryProcessor.php
1 file changed, 12 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/69/56769/1
diff --git a/includes/SMW_QueryProcessor.php b/includes/SMW_QueryProcessor.php
index 7e05a8e..e8614a6 100644
--- a/includes/SMW_QueryProcessor.php
+++ b/includes/SMW_QueryProcessor.php
@@ -1,4 +1,8 @@
<?php
+
+use ParamProcessor\Processor;
+use ParamProcessor\Options;
+
/**
* This file contains a static class for accessing functions to generate and
execute
* semantic queries and to serialise their results.
@@ -52,11 +56,11 @@
* @param array $printRequests
* @param boolean $unknownInvalid
*
- * @return array of IParam
+ * @return IParam[]
*/
public static function getProcessedParams( array $params, array
$printRequests = array(), $unknownInvalid = true ) {
$validator = self::getValidatorForParams( $params,
$printRequests, $unknownInvalid );
- $validator->validateParameters();
+ $validator->processParameters();
return $validator->getParameters();
}
@@ -71,14 +75,17 @@
* @param array $printRequests
* @param boolean $unknownInvalid
*
- * @return Validator
+ * @return Processor
*/
public static function getValidatorForParams( array $params, array
$printRequests = array(), $unknownInvalid = true ) {
$paramDefinitions = self::getParameters();
$paramDefinitions['format']->setPrintRequests( $printRequests );
- $validator = new Validator( 'SMW query', $unknownInvalid );
+ $processorOptions = new Options();
+ $processorOptions->setUnknownInvalid( $unknownInvalid );
+
+ $validator = Processor::newFromOptions( $processorOptions );
$validator->setParameters( $params, $paramDefinitions, false );
return $validator;
@@ -568,7 +575,7 @@
*
* @since 1.6.2, return element type changed in 1.8
*
- * @return array of IParamDefinition
+ * @return IParamDefinition[]
*/
public static function getParameters() {
$params = array();
--
To view, visit https://gerrit.wikimedia.org/r/56769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7161f51b6d1f905f95e781c563af11234cd518a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
