SemanticMediaWiki / SemanticFormsSelect

src/Output.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 *
 	 * @param array $data
 	 */
-	public static function addToHeadItem( Array $data = [] ) {
+	public static function addToHeadItem(Array $data = []) {
 		return self::$headItems[] = $data;
 	}
 
@@ -35,11 +35,11 @@ 
 	 *
 	 */
 	public static function commitToParserOutput() {
-		global $wgOut;	# is there a better way to get $output/$parser without using a global? (testability!)
+		global $wgOut; # is there a better way to get $output/$parser without using a global? (testability!)
 
 		// to be used in JS like:
 		// var SFSelect_fobjs = $.parseJSON( mw.config.get( 'sf_select' ) );
-		$wgOut->addJsConfigVars('sf_select', json_encode( self::$headItems ));
+		$wgOut->addJsConfigVars('sf_select', json_encode(self::$headItems));
 
 		//self::$resourceModules = array();
 		//self::$headItems = array();

SemanticFormsSelect.hooks.php

Spacing +7 added lines, -7 removed lines

@@ -16,20 +16,20 @@ 
 	 * @param $parser Parser

 	 * @return bool

 	 */

-	public static function onSemanticFormsSelectSetup ( & $parser ) {

-		if ( !defined( 'PF_VERSION' ) ) {

-			die( '<b>Error:</b><a href="https://github.com/SemanticMediaWiki/SemanticFormsSelect/">Semantic Forms Select</a> requires the <a href="https://www.mediawiki.org/wiki/Extension:PageForms">Page Forms</a> extension. Please install and activate this extension first.' );

+	public static function onSemanticFormsSelectSetup(& $parser) {

+		if (!defined('PF_VERSION')) {

+			die('<b>Error:</b><a href="https://github.com/SemanticMediaWiki/SemanticFormsSelect/">Semantic Forms Select</a> requires the <a href="https://www.mediawiki.org/wiki/Extension:PageForms">Page Forms</a> extension. Please install and activate this extension first.');

 		}

 

-		if ( isset( $GLOBALS['wgPageFormsFormPrinter'] ) ) {

-			$GLOBALS['wgPageFormsFormPrinter']->registerInputType( \SFS\SemanticFormsSelectInput::class );

+		if (isset($GLOBALS['wgPageFormsFormPrinter'])) {

+			$GLOBALS['wgPageFormsFormPrinter']->registerInputType(\SFS\SemanticFormsSelectInput::class);

 		}

 

 		return true;

 	}

 

 	public static function onRegistration() {

-		if ( isset( $GLOBALS['wgAPIModules'] ) ) {

+		if (isset($GLOBALS['wgAPIModules'])) {

 			$GLOBALS['wgAPIModules']['sformsselect'] = \SFS\ApiSemanticFormsSelect::class;

 		}

 	}

@@ -38,7 +38,7 @@ 
 	 * Hook: ResourceLoaderTestModules

 	 * @param array &$modules

 	 */

-	public static function onResourceLoaderTestModules( array &$modules ) {

+	public static function onResourceLoaderTestModules(array &$modules) {

 		$modules['qunit']['ext.sfs.unit'] = [

 			'scripts' => [

 				'res/sfs.js',

src/ApiSemanticFormsSelectRequestProcessor.php

Braces +3 added lines, -2 removed lines

@@ -109,8 +109,9 @@
 			$rawparams = array_filter($rawparams, function($param) use ($name) {
 				return substr_compare( $param, "$name=", 0, strlen( "$name=" ) ) !== 0;
 			});
-			if ($value !== null)
-				$rawparams[] = "$name=$value";
+			if ($value !== null) {
+							$rawparams[] = "$name=$value";
+			}
 		};
 
 		$rawparams = explode( ";", $querystr );

Spacing +49 added lines, -49 removed lines

@@ -36,7 +36,7 @@ 
 	 * @since 1.3
 	 *
 	 */
-	public function __construct( Parser $parser, $getSmwResultFromFunctionParams = null ) {
+	public function __construct(Parser $parser, $getSmwResultFromFunctionParams = null) {
 		$this->parser = $parser;
 		$this->getSmwResultFromFunctionParams = $getSmwResultFromFunctionParams
 			?? '\SFS\ApiSemanticFormsSelectRequestProcessor::defaultGetSmwResultFromFunctionParams';
@@ -47,7 +47,7 @@ 
 	 *
 	 * @param boolean $debugFlag
 	 */
-	public function setDebugFlag( $debugFlag ) {
+	public function setDebugFlag($debugFlag) {
 		$this->debugFlag = $debugFlag;
 	}
 
@@ -58,110 +58,110 @@ 
 	 *
 	 * @return string
 	 */
-	public function getJsonDecodedResultValuesForRequestParameters( array $parameters ) {
+	public function getJsonDecodedResultValuesForRequestParameters(array $parameters) {
 
-		if ( !isset( $parameters['query'] ) || !isset( $parameters['sep'] ) ) {
-			throw new InvalidArgumentException( 'Missing an query parameter' );
+		if (!isset($parameters['query']) || !isset($parameters['sep'])) {
+			throw new InvalidArgumentException('Missing an query parameter');
 		}
 
-		if ( !isset( $parameters['query'] ) || !isset( $parameters['sep'] ) ) {
-			throw new InvalidArgumentException( 'Missing an query parameter' );
+		if (!isset($parameters['query']) || !isset($parameters['sep'])) {
+			throw new InvalidArgumentException('Missing an query parameter');
 		}
 
 		$this->parser->firstCallInit();
 		$json = [];
 
-		if ( isset( $parameters['approach'] ) && $parameters['approach'] == 'smw' ) {
-			$json = $this->doProcessQueryFor( $parameters['query'], $parameters['sep'] );
+		if (isset($parameters['approach']) && $parameters['approach'] == 'smw') {
+			$json = $this->doProcessQueryFor($parameters['query'], $parameters['sep']);
 		} else {
-			$json = $this->doProcessFunctionFor( $parameters['query'], $parameters['sep'] );
+			$json = $this->doProcessFunctionFor($parameters['query'], $parameters['sep']);
 		}
 
 		// I have no idea why we first encode and and then decode here??
 
-		return json_decode( $json );
+		return json_decode($json);
 	}
 
-	private function doProcessQueryFor( $querystr, $sep = "," ) {
+	private function doProcessQueryFor($querystr, $sep = ",") {
 
 		$querystr = str_replace(
-			[ "<", ">", "sep=;" ],
-			[ "<", ">", "sep={$sep};" ],
+			["&lt;", "&gt;", "sep=;"],
+			["<", ">", "sep={$sep};"],
 			$querystr
 		);
 
-		$rawparams = $this->extractRawParameters( $querystr );
-		$f = str_replace( ";", "|", $rawparams[0] );
-		$rawparams[0] = $this->parser->replaceVariables( $f );
+		$rawparams = $this->extractRawParameters($querystr);
+		$f = str_replace(";", "|", $rawparams[0]);
+		$rawparams[0] = $this->parser->replaceVariables($f);
 
-		if ( $this->debugFlag ) {
-			error_log( implode( "|", $rawparams ) );
+		if ($this->debugFlag) {
+			error_log(implode("|", $rawparams));
 		}
 
 		$result = ($this->getSmwResultFromFunctionParams)($rawparams);
 
-		$values = $this->getFormattedValuesFrom( $sep, $result );
+		$values = $this->getFormattedValuesFrom($sep, $result);
 
-		return json_encode( [
+		return json_encode([
 			"values" => $values,
-			"count"  => count( $values )
-		] );
+			"count"  => count($values)
+		]);
 	}
 
-	private function extractRawParameters( $querystr ) {
+	private function extractRawParameters($querystr) {
 		$ensureParameter = function($name, $value) use (&$rawparams) {
 			$rawparams = array_filter($rawparams, function($param) use ($name) {
-				return substr_compare( $param, "$name=", 0, strlen( "$name=" ) ) !== 0;
+				return substr_compare($param, "$name=", 0, strlen("$name=")) !== 0;
 			});
 			if ($value !== null)
 				$rawparams[] = "$name=$value";
 		};
 
-		$rawparams = explode( ";", $querystr );
+		$rawparams = explode(";", $querystr);
 		// The JavaScript part expects plainlist format for parsing
 		$ensureParameter('format', 'plainlist');
 
 		return $rawparams;
 	}
 
-	private function doProcessFunctionFor( $query, $sep = "," ) {
+	private function doProcessFunctionFor($query, $sep = ",") {
 
 		$query = str_replace(
-			[ "&lt;", "&gt;", "sep=;" ],
-			[ "<", ">", "sep={$sep};" ],
+			["&lt;", "&gt;", "sep=;"],
+			["<", ">", "sep={$sep};"],
 			$query
 		);
 
-		$f = str_replace( ";", "|", $query );
+		$f = str_replace(";", "|", $query);
 
-		if ( $this->debugFlag ) {
-			error_log( $f );
+		if ($this->debugFlag) {
+			error_log($f);
 		}
 
 		$values = $this->getFormattedValuesFrom(
 			$sep,
-			$this->parser->replaceVariables( $f )
+			$this->parser->replaceVariables($f)
 		);
 
-		return json_encode( [
+		return json_encode([
 			"values" => $values,
-			"count"  => count( $values )
-		] );
+			"count"  => count($values)
+		]);
 	}
 
-	private function getFormattedValuesFrom( $sep, $values ) {
+	private function getFormattedValuesFrom($sep, $values) {
 
-		if ( strpos( $values ?? '', $sep ) === false ) {
-			return [ $values ];
+		if (strpos($values ?? '', $sep) === false) {
+			return [$values];
 		}
 
-		$values = explode( $sep, $values );
-		$values = array_map( "trim", $values );
-		$values = array_unique( $values );
+		$values = explode($sep, $values);
+		$values = array_map("trim", $values);
+		$values = array_unique($values);
 
 		// TODO: sorting here will destroy any sort defined in the query, e.g. in case sorting for labels (instead of mainlable)
 		//sort( $values );
-		array_unshift( $values, "" );
+		array_unshift($values, "");
 
 		return $values;
 	}
@@ -170,14 +170,14 @@ 
 	 * @param $rawparams
 	 * @return string
 	 */
-	private static function defaultGetSmwResultFromFunctionParams( $rawparams ): string {
-		list( $query, $params ) =
-			SMWQueryProcessor::getQueryAndParamsFromFunctionParams( $rawparams, SMW_OUTPUT_WIKI,
-				SMWQueryProcessor::INLINE_QUERY, false );
+	private static function defaultGetSmwResultFromFunctionParams($rawparams): string {
+		list($query, $params) =
+			SMWQueryProcessor::getQueryAndParamsFromFunctionParams($rawparams, SMW_OUTPUT_WIKI,
+				SMWQueryProcessor::INLINE_QUERY, false);
 
 		$result =
-			SMWQueryProcessor::getResultFromQuery( $query, $params, SMW_OUTPUT_WIKI,
-				SMWQueryProcessor::INLINE_QUERY );
+			SMWQueryProcessor::getResultFromQuery($query, $params, SMW_OUTPUT_WIKI,
+				SMWQueryProcessor::INLINE_QUERY);
 
 		return $result;
 	}

src/ApiSemanticFormsSelect.php

Spacing +8 added lines, -8 removed lines

@@ -27,17 +27,17 @@ 
 	public function execute() {
 		$parser = $this->getParser();
 
-		$apiRequestProcessor = new \SFS\ApiSemanticFormsSelectRequestProcessor( $parser );
-		$apiRequestProcessor->setDebugFlag( $GLOBALS['wgSF_Select_debug'] );
+		$apiRequestProcessor = new \SFS\ApiSemanticFormsSelectRequestProcessor($parser);
+		$apiRequestProcessor->setDebugFlag($GLOBALS['wgSF_Select_debug']);
 
 		$resultValues = $apiRequestProcessor->getJsonDecodedResultValuesForRequestParameters(
 			$this->extractRequestParams()
 		);
 
 		$result = $this->getResult();
-		$result->setIndexedTagName( $resultValues->values, 'value' );
-		$result->addValue( $this->getModuleName(), 'values', $resultValues->values );
-		$result->addValue( $this->getModuleName(), 'count', $resultValues->count );
+		$result->setIndexedTagName($resultValues->values, 'value');
+		$result->addValue($this->getModuleName(), 'values', $resultValues->values);
+		$result->addValue($this->getModuleName(), 'count', $resultValues->count);
 
 		return true;
 	}
@@ -85,7 +85,7 @@ 
 	 * @see ApiBase::getVersion
 	 */
 	public function getVersion() {
-		return __CLASS__ . ': 1.1';
+		return __CLASS__.': 1.1';
 	}
 
 	/**
@@ -93,8 +93,8 @@ 
 	 */
 	protected function getParser(): Parser {
 		$parser = MediaWikiServices::getInstance()->getParserFactory()->create();
-		$parser->setTitle( Title::newFromText( 'NO TITLE' ) );
-		$parser->setOptions( new ParserOptions( $this->getUser() ) );
+		$parser->setTitle(Title::newFromText('NO TITLE'));
+		$parser->setOptions(new ParserOptions($this->getUser()));
 		$parser->resetOutput();
 
 		return $parser;

src/SemanticFormsSelectInput.php

Spacing +70 added lines, -70 removed lines

@@ -28,12 +28,12 @@ 
 
 	private $mSelectField;
 
-	public function __construct( $inputNumber, $curValue, $inputName, $disabled, $otherArgs ) {
-		parent::__construct( $inputNumber, $curValue, $inputName, $disabled, $otherArgs );
+	public function __construct($inputNumber, $curValue, $inputName, $disabled, $otherArgs) {
+		parent::__construct($inputNumber, $curValue, $inputName, $disabled, $otherArgs);
 
 		// SelectField is a simple value object - we accept creating it in the constructor
 		$parser = MediaWikiServices::getInstance()->getParser();
-		$this->mSelectField = new SelectField( $parser );
+		$this->mSelectField = new SelectField($parser);
 	}
 
 	public static function getName() {
@@ -46,7 +46,7 @@ 
 	}
 
 	public function getResourceModuleNames() {
-		return [ 'ext.sfs' ];
+		return ['ext.sfs'];
 	}
 
 	/**
@@ -54,8 +54,8 @@ 
 	 * This is currently just a wrapper for getHTML().
 	 */
 	public function getHtmlText() {
-		return self::getHTML( $this->mIsMandatory, $this->mIsDisabled,
-			$this->mOtherArgs, $this->mCurrentValue, $this->mInputName );
+		return self::getHTML($this->mIsMandatory, $this->mIsDisabled,
+			$this->mOtherArgs, $this->mCurrentValue, $this->mInputName);
 	}
 
 	/**
@@ -69,35 +69,35 @@ 
 	 * @param    string[] $other_args Array of other field parameters
 	 * @return string
 	 */
-	public function getHTML( $is_mandatory, $is_disabled, Array $other_args, $cur_value = "", $input_name = "" ) {
+	public function getHTML($is_mandatory, $is_disabled, Array $other_args, $cur_value = "", $input_name = "") {
 		global $wgPageFormsFieldNum, $wgUser;
 
 		// shortcut to the SelectField object
 		$selectField = $this->mSelectField;
 
 		// get 'delimiter' before 'query' or 'function'
-		$selectField->setDelimiter( $other_args );
+		$selectField->setDelimiter($other_args);
 
-		if ( array_key_exists( "query", $other_args ) ) {
-			$selectField->setQuery( $other_args );
-		} elseif ( array_key_exists( "function", $other_args ) ) {
-			$selectField->setFunction( $other_args );
+		if (array_key_exists("query", $other_args)) {
+			$selectField->setQuery($other_args);
+		} elseif (array_key_exists("function", $other_args)) {
+			$selectField->setFunction($other_args);
 		}
 
-		if ( array_key_exists( "label", $other_args ) ) {
-			$selectField->setLabel( $other_args );
+		if (array_key_exists("label", $other_args)) {
+			$selectField->setLabel($other_args);
 		}
 
 		// parameters are only required if values needs to be retrieved dynamically
-		if ( !$selectField->hasStaticValues() ) {
-			$selectField->setSelectIsMultiple( $other_args );
-			$selectField->setSelectTemplate( $input_name );
-			$selectField->setSelectField( $input_name );
-			$selectField->setValueTemplate( $other_args );
-			$selectField->setValueField( $other_args );
-			$selectField->setSelectRemove( $other_args );
-
-			$item = Output::addToHeadItem( $selectField->getData() );
+		if (!$selectField->hasStaticValues()) {
+			$selectField->setSelectIsMultiple($other_args);
+			$selectField->setSelectTemplate($input_name);
+			$selectField->setSelectField($input_name);
+			$selectField->setValueTemplate($other_args);
+			$selectField->setValueField($other_args);
+			$selectField->setSelectRemove($other_args);
+
+			$item = Output::addToHeadItem($selectField->getData());
 		}
 
 		Output::commitToParserOutput();
@@ -107,51 +107,51 @@ 
 		$extraatt = "";
 		$is_list = false;
 
-		if ( array_key_exists( 'is_list', $other_args ) && $other_args['is_list'] == true ) {
+		if (array_key_exists('is_list', $other_args) && $other_args['is_list'] == true) {
 			$is_list = true;
 		}
 
-		if ( $is_list ) {
+		if ($is_list) {
 			$extraatt = ' multiple="multiple" ';
 		}
 
-		if ( array_key_exists( "size", $other_args ) ) {
+		if (array_key_exists("size", $other_args)) {
 			$extraatt .= " size=\"{$other_args['size']}\"";
 		}
 
 		$classes = [];
-		if ( $is_mandatory ) {
+		if ($is_mandatory) {
 			$classes[] = "mandatoryField";
 		}
-		if ( array_key_exists( "class", $other_args ) ) {
+		if (array_key_exists("class", $other_args)) {
 			$classes[] = $other_args['class'];
 		}
-		if ( $classes ) {
-			$cstr = implode( " ", $classes );
+		if ($classes) {
+			$cstr = implode(" ", $classes);
 			$extraatt .= " class=\"$cstr\"";
 		}
 
 		$inname = $input_name;
-		if ( $is_list ) {
+		if ($is_list) {
 			$inname .= '[]';
 		}
 
 		// TODO Use Html::
 
 		$spanextra = $is_mandatory ? 'mandatoryFieldSpan' : '';
-		$is_single_select = (!$is_list) ? 'select-sfs-single' : '' ;
+		$is_single_select = (!$is_list) ? 'select-sfs-single' : '';
 		$ret = "<span class=\"inputSpan select-sfs $is_single_select $spanextra\"><select name='$inname' id='input_$wgPageFormsFieldNum' $extraatt>";
 
 		$curvalues = null;
-		if ( $cur_value ) {
-			if ( $cur_value === 'current user' ) {
+		if ($cur_value) {
+			if ($cur_value === 'current user') {
 				$cur_value = $wgUser->getName();
 			}
-			if ( is_array( $cur_value ) ) {
+			if (is_array($cur_value)) {
 				$curvalues = $cur_value;
 			} else {
 				// delimiter for $cur_value is always ',' - PF seems to ignore $wgPageFormsListSeparator
-				$curvalues = array_map( "trim", explode( $selectField->getDelimiter(), $cur_value ) );
+				$curvalues = array_map("trim", explode($selectField->getDelimiter(), $cur_value));
 			}
 
 		} else {
@@ -160,38 +160,38 @@ 
 
 
 		$labelArray = [];
-		if ( array_key_exists( "label", $other_args ) && $curvalues ) {
+		if (array_key_exists("label", $other_args) && $curvalues) {
 			// $labelArray = $this->getLabels( $curvalues );
 		}
 
 		// TODO handle empty value case.
 		$ret .= "<option></option>";
 
-		if ( $selectField->hasStaticValues() ) {
+		if ($selectField->hasStaticValues()) {
 
 			$values = $selectField->getValues();
 
-			if ( array_key_exists( "label", $other_args ) && $values ) {
-				$labelArray = $this->getLabels( $values );
+			if (array_key_exists("label", $other_args) && $values) {
+				$labelArray = $this->getLabels($values);
 			}
 
-			if ( is_array( $values ) ) {
+			if (is_array($values)) {
 
-				foreach ( $values as $val ) {
+				foreach ($values as $val) {
 
 					$selected = "";
 
-					if ( array_key_exists( $val, $labelArray ) ) {
+					if (array_key_exists($val, $labelArray)) {
 
-						if ( in_array( $labelArray[ $val ][0], $curvalues ) ) {
+						if (in_array($labelArray[$val][0], $curvalues)) {
 							$selected = " selected='selected'";
 						}
 
-						$ret.="<option".$selected." value='".$labelArray[ $val ][0]."'>".$labelArray[ $val ][1]."</option>";
+						$ret .= "<option".$selected." value='".$labelArray[$val][0]."'>".$labelArray[$val][1]."</option>";
 
 					} else {
 
-						if ( in_array( $val, $curvalues ) ) {
+						if (in_array($val, $curvalues)) {
 							$selected = " selected='selected'";
 						}
 
@@ -201,22 +201,22 @@ 
 			}
 		} else {
 
-			foreach ( $curvalues as $cur ) {
+			foreach ($curvalues as $cur) {
 				$selected = "";
 
-				if ( array_key_exists( $cur, $labelArray ) ) {
+				if (array_key_exists($cur, $labelArray)) {
 
-					if ( in_array( $labelArray[ $cur ][0], $curvalues ) ) {
+					if (in_array($labelArray[$cur][0], $curvalues)) {
 						$selected = " selected='selected'";
 					}
 
-					$ret.="<option".$selected." value='".$labelArray[ $cur ][0]."'>".$labelArray[ $cur ][1]."</option>";
+					$ret .= "<option".$selected." value='".$labelArray[$cur][0]."'>".$labelArray[$cur][1]."</option>";
 
 				} else {
-					if ( in_array( $cur, $curvalues ) ) {
+					if (in_array($cur, $curvalues)) {
 						$selected = " selected='selected'";
 					}
-					$ret.="<option".$selected.">$cur</option>";
+					$ret .= "<option".$selected.">$cur</option>";
 				}
 			}
 
@@ -225,8 +225,8 @@ 
 		$ret .= "</select></span>";
 		$ret .= "<span id=\"info_$wgPageFormsFieldNum\" class=\"errorMessage\"></span>";
 
-		if ( $other_args["is_list"] ) {
-			$hiddenname = $input_name . '[is_list]';
+		if ($other_args["is_list"]) {
+			$hiddenname = $input_name.'[is_list]';
 			$ret .= "<input type='hidden' name='$hiddenname' value='1' />";
 		}
 
@@ -234,49 +234,49 @@ 
 	}
 
 
-	private function getLabels( $labels ) {
+	private function getLabels($labels) {
 
-		$labelArray = [ ];
+		$labelArray = [];
 
-		if ( is_array( $labels ) ) {
-			foreach ( $labels as $label ) {
+		if (is_array($labels)) {
+			foreach ($labels as $label) {
 
 				$labelKey = $label;
 				$labelValue = $label;
 
 				// Tricky thing if ( ) already in name
-				if ( strpos( $label, ")" ) && strpos( $label, "(" ) ) {
+				if (strpos($label, ")") && strpos($label, "(")) {
 
 					// Check Break
 					$openBr = 0;
 					$doneBr = 0;
 					$num = 0;
 
-					$labelArr = str_split ( $label );
+					$labelArr = str_split($label);
 
-					$end = count( $labelArr ) - 1;
+					$end = count($labelArr) - 1;
 					$iter = $end;
 
 					$endBr = $end;
 					$startBr = 0;
 
-					while ( $doneBr == 0 && $iter >= 0 ) {
+					while ($doneBr == 0 && $iter >= 0) {
 
-						$char = $labelArr[ $iter ];
+						$char = $labelArr[$iter];
 
-						if ( $char == ")" ) {
+						if ($char == ")") {
 							$openBr = $openBr - 1;
 
-							if ( $num == 0 ) {
+							if ($num == 0) {
 								$endBr = $iter;
 								$num = $num + 1;
 							}
 						}
 
-						if ( $char == "(" ) {
+						if ($char == "(") {
 							$openBr = $openBr + 1;
 
-							if ( $num > 0 && $openBr == 0 ) {
+							if ($num > 0 && $openBr == 0) {
 								$startBr = $iter;
 								$doneBr = 1;
 							}
@@ -286,12 +286,12 @@ 
 
 					}
 
-					$labelValue = implode( "", array_slice( $labelArr, $startBr+1, $endBr-$startBr-1 ) );
-					$labelKey = implode( "", array_slice( $labelArr, 0, $startBr-1 ) );
+					$labelValue = implode("", array_slice($labelArr, $startBr + 1, $endBr - $startBr - 1));
+					$labelKey = implode("", array_slice($labelArr, 0, $startBr - 1));
 
 				}
 
-				$labelArray[ $label ] = [ $labelKey, $labelValue ] ;
+				$labelArray[$label] = [$labelKey, $labelValue];
 			}
 
 		}

src/SelectField.php

Spacing +51 added lines, -51 removed lines

@@ -21,7 +21,7 @@ 
 	private $mValues = null;

 	private $mHasStaticValues = false;

 

-	private $mData = [];    # array with all parameters

+	private $mData = []; # array with all parameters

 	private $mQuery = "";

 	private $mFunction = "";

 	private $mSelectIsMultiple = false;

@@ -33,18 +33,18 @@ 
 	private $mLabel = false;

 	private $mDelimiter = ",";

 

-	public function __construct( & $parser ) {

+	public function __construct(& $parser) {

 		$this->mParser = $parser;

 	}

 

 	/**

 	 * Convenience function to process all parameters at once

 	 */

-	public function processParameters( $other_args, $input_name = "" ) {

-		if ( array_key_exists( "query", $other_args ) ) {

-			$this->setQuery( $other_args );

-		} elseif ( array_key_exists( "function", $other_args ) ) {

-			$this->setFunction( $other_args );

+	public function processParameters($other_args, $input_name = "") {

+		if (array_key_exists("query", $other_args)) {

+			$this->setQuery($other_args);

+		} elseif (array_key_exists("function", $other_args)) {

+			$this->setFunction($other_args);

 		}

 	}

 

@@ -57,88 +57,88 @@ 
 		return $this->mData;

 	}

 

-	public function setQuery( $other_args ) {

+	public function setQuery($other_args) {

 		$querystr = $other_args["query"];

-		$querystr = str_replace( [ "~", "(", ")" ], [ "=", "[", "]" ], $querystr );

+		$querystr = str_replace(["~", "(", ")"], ["=", "[", "]"], $querystr);

 

 		//$this->mSelectField["query"] = $query;

 		$this->mQuery = $querystr;

 		$this->mData['selectquery'] = $querystr;

 

 		// unparametrized query

-		if ( strpos( $querystr, '@@@@' ) === false ) {

-			$rawparams = explode( ";", $querystr );

+		if (strpos($querystr, '@@@@') === false) {

+			$rawparams = explode(";", $querystr);

 

 			// there is no need to run the parser, $query has been parsed already

 			//$params[0] = $wgParser->replaceVariables( $params[0] );

 

-			list( $query, $params ) = QueryProcessor::getQueryAndParamsFromFunctionParams( $rawparams, SMW_OUTPUT_WIKI, QueryProcessor::INLINE_QUERY, false );

+			list($query, $params) = QueryProcessor::getQueryAndParamsFromFunctionParams($rawparams, SMW_OUTPUT_WIKI, QueryProcessor::INLINE_QUERY, false);

 			

-			$result = QueryProcessor::getResultFromQuery( $query, $params, SMW_OUTPUT_WIKI, QueryProcessor::INLINE_QUERY );

+			$result = QueryProcessor::getResultFromQuery($query, $params, SMW_OUTPUT_WIKI, QueryProcessor::INLINE_QUERY);

 		

-			$this->mValues = $this->getFormattedValuesFrom( $this->mDelimiter, $result );

+			$this->mValues = $this->getFormattedValuesFrom($this->mDelimiter, $result);

 		

-			$this->setHasStaticValues( true );

+			$this->setHasStaticValues(true);

 		}

 	}

 

-	public function setFunction( $other_args ) {

+	public function setFunction($other_args) {

 		#global $wgParser;

 

 		$function = $other_args["function"];

-		$function = '{{#' . $function . '}}';

-		$function = str_replace( [ "~", "(", ")" ], [ "=", "[", "]" ], $function );

+		$function = '{{#'.$function.'}}';

+		$function = str_replace(["~", "(", ")"], ["=", "[", "]"], $function);

 

 		//$this->mSelectField["function"] = $function;

 		$this->mFunction = $function;

 		$this->mData['selectfunction'] = $function;

 

 		// unparametrized function

-		if ( strpos( $function, '@@@@' ) === false ) {

-			$f = str_replace( ";", "|", $function );

+		if (strpos($function, '@@@@') === false) {

+			$f = str_replace(";", "|", $function);

 

-			$this->setValues( $this->mParser->replaceVariables( $f ) );

+			$this->setValues($this->mParser->replaceVariables($f));

 

-			$this->setHasStaticValues( true );

+			$this->setHasStaticValues(true);

 		}

 	}

 

-	public function setSelectIsMultiple( Array $other_args ) {

-		$this->mSelectIsMultiple = array_key_exists( "part_of_multiple", $other_args );

+	public function setSelectIsMultiple(Array $other_args) {

+		$this->mSelectIsMultiple = array_key_exists("part_of_multiple", $other_args);

 		$this->mData["selectismultiple"] = $this->mSelectIsMultiple;

 	}

 

-	public function setSelectTemplate( $input_name = "" ) {

-		$index = strpos( $input_name, "[" );

-		$this->mSelectTemplate = substr( $input_name, 0, $index );

+	public function setSelectTemplate($input_name = "") {

+		$index = strpos($input_name, "[");

+		$this->mSelectTemplate = substr($input_name, 0, $index);

 		$this->mData['selecttemplate'] = $this->mSelectTemplate;

 	}

 

-	public function setSelectField( $input_name = "" ) {

-		$index = strrpos( $input_name, "[" );

-		$this->mSelectField = substr( $input_name, $index + 1, strlen( $input_name ) - $index - 2 );

+	public function setSelectField($input_name = "") {

+		$index = strrpos($input_name, "[");

+		$this->mSelectField = substr($input_name, $index + 1, strlen($input_name) - $index - 2);

 		$this->mData['selectfield'] = $this->mSelectField;

 	}

 

-	public function setValueTemplate( Array $other_args ) {

+	public function setValueTemplate(Array $other_args) {

 		$this->mValueTemplate =

-			array_key_exists( "sametemplate", $other_args ) ? $this->mSelectTemplate : $other_args["template"];

+			array_key_exists("sametemplate", $other_args) ? $this->mSelectTemplate : $other_args["template"];

 		$this->mData["valuetemplate"] = $this->mValueTemplate;

 	}

 

-	public function setValueField( Array $other_args ) {

+	public function setValueField(Array $other_args) {

 		$this->mValueField = $other_args["field"];

 		$this->mData["valuefield"] = $this->mValueField;

 

 	}

 

-	public function setSelectRemove( Array $other_args ) {

-		$this->mSelectRemove = array_key_exists( 'rmdiv', $other_args );

+	public function setSelectRemove(Array $other_args) {

+		$this->mSelectRemove = array_key_exists('rmdiv', $other_args);

 		$this->mData['selectrm'] = $this->mSelectRemove;

 	}

 

-	public function setLabel( Array $other_args ) {

-		$this->mLabel = array_key_exists( 'label', $other_args );

+	public function setLabel(Array $other_args) {

+		$this->mLabel = array_key_exists('label', $other_args);

 		$this->mData['label'] = $this->mLabel;

 	}

 

@@ -146,15 +146,15 @@ 
 	 * setDelimiter

 	 * @param array $other_args

 	 */

-	public function setDelimiter( Array $other_args ) {

+	public function setDelimiter(Array $other_args) {

 		

 		$this->mDelimiter = $GLOBALS['wgPageFormsListSeparator'];

 		

-		if ( array_key_exists( 'sep', $other_args ) ) {

+		if (array_key_exists('sep', $other_args)) {

 			$this->mDelimiter = $other_args['sep'];

 		} else {

 			// Adding Backcompatibility

-			if ( array_key_exists( 'delimiter', $other_args ) ) {

+			if (array_key_exists('delimiter', $other_args)) {

 				$this->mDelimiter = $other_args['delimiter'];

 			}

 		}

@@ -174,10 +174,10 @@ 
 	 * setValues

 	 * @param string $values (comma separated, fully parsed list of values)

 	 */

-	private function setValues( $values ) {

-		$values = explode( $this->mDelimiter, $values );

-		$values = array_map( "trim", $values );

-		$values = array_unique( $values );

+	private function setValues($values) {

+		$values = explode($this->mDelimiter, $values);

+		$values = array_map("trim", $values);

+		$values = array_unique($values);

 		$this->mValues = $values;

 	}

 

@@ -185,21 +185,21 @@ 
 		return $this->mHasStaticValues;

 	}

 

-	private function setHasStaticValues( $StaticValues ) {

+	private function setHasStaticValues($StaticValues) {

 		$this->mHasStaticValues = $StaticValues;

 	}

 	

 	/** Copied from ApiSemanticFormsSelectRequestProcessor */

 	

-	private function getFormattedValuesFrom( $sep, $values ) {

+	private function getFormattedValuesFrom($sep, $values) {

 

-		if ( strpos( $values, $sep ) === false ) {

-			return [ $values ];

+		if (strpos($values, $sep) === false) {

+			return [$values];

 		}

 

-		$values = explode( $sep, $values );

-		$values = array_map( "trim", $values );

-		$values = array_unique( $values );

+		$values = explode($sep, $values);

+		$values = array_map("trim", $values);

+		$values = array_unique($values);

 

 		// TODO: sorting here will destroy any sort defined in the query, e.g. in case sorting for labels (instead of mainlable)

 		//sort( $values );