SemanticMediaWiki / SemanticFormsSelect

SemanticFormsSelect.hooks.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 * This is attached to the MediaWiki 'ParserFirstCallInit' hook.

 	 *

 	 * @param $parser Parser

-	 * @return bool

+	 * @return null|boolean

 	 */

 	public static function onSemanticFormsSelectSetup ( & $parser ) {

 

Spacing +5 added lines, -5 removed lines

@@ -14,14 +14,14 @@
 	 * @param $parser Parser

 	 * @return bool

 	 */

-	public static function onSemanticFormsSelectSetup ( & $parser ) {

+	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 (!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' );

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

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

 		}

 

 		return true;

src/SemanticFormsSelectInput.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,9 +65,9 @@
 	 * Returns the HTML code to be included in the output page for this input.
 	 * @deprecated use getHtmlText() instead
 	 *
-	 * @param $cur_value
-	 * @param $input_name
-	 * @param $is_mandatory
+	 * @param string $cur_value
+	 * @param string $input_name
+	 * @param boolean $is_mandatory
 	 * @param $is_disabled
 	 * @param $other_args
 	 * @return string

Spacing +49 added lines, -49 removed lines

@@ -24,8 +24,8 @@ 
 	 */
 	private static $data = array();
 
-	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);
 	}
 
 	public static function getName() {
@@ -72,7 +72,7 @@ 
 	 * @param $other_args
 	 * @return string
 	 */
-	public function getHTML( $cur_value, $input_name, $is_mandatory, $is_disabled, $other_args ) {
+	public function getHTML($cur_value, $input_name, $is_mandatory, $is_disabled, $other_args) {
 		global # $wgScriptSelectCount,
 		$wgScriptSelectCount, $sfgFieldNum, $wgUser, $wgParser;
 
@@ -81,72 +81,72 @@ 
 		$staticvalue = false;
 		$data = array();
 
-		if ( array_key_exists( "query", $other_args ) ) {
+		if (array_key_exists("query", $other_args)) {
 			$query = $other_args["query"];
-			$query = str_replace( array( "~", "(", ")" ), array( "=", "[", "]" ), $query );
+			$query = str_replace(array("~", "(", ")"), array("=", "[", "]"), $query);
 
 			$selectField["query"] = $query;
 
 			// unparametrized query
-			if ( strpos( $query, '@@@@' ) === false ) {
-				$params = explode( ";", $query );
+			if (strpos($query, '@@@@') === false) {
+				$params = explode(";", $query);
 
 				// there is no need to run the parser, $query has been parsed already
 				//$params[0] = $wgParser->replaceVariables( $params[0] );
 
-				$values = QueryProcessor::getResultFromFunctionParams( $params, SMW_OUTPUT_WIKI );
+				$values = QueryProcessor::getResultFromFunctionParams($params, SMW_OUTPUT_WIKI);
 
 				$staticvalue = true;
 			}
 
-		} elseif ( array_key_exists( "function", $other_args ) ) {
+		} elseif (array_key_exists("function", $other_args)) {
 			$query = $other_args["function"];
-			$query = '{{#' . $query . '}}';
-			$query = str_replace( array( "~", "(", ")" ), array( "=", "[", "]" ), $query );
+			$query = '{{#'.$query.'}}';
+			$query = str_replace(array("~", "(", ")"), array("=", "[", "]"), $query);
 
 			$selectField["function"] = $query;
 
 			// unparametrized function
-			if ( strpos( $query, '@@@@' ) === false ) {
-				$f = str_replace( ";", "|", $query );
+			if (strpos($query, '@@@@') === false) {
+				$f = str_replace(";", "|", $query);
 
-				$values = $wgParser->replaceVariables( $f );
+				$values = $wgParser->replaceVariables($f);
 
 				$staticvalue = true;
 			}
 		}
 
-		if ( $staticvalue ) {
-			$values = explode( ",", $values );
-			$values = array_map( "trim", $values );
-			$values = array_unique( $values );
+		if ($staticvalue) {
+			$values = explode(",", $values);
+			$values = array_map("trim", $values);
+			$values = array_unique($values);
 		} else {
 
-			if ( $wgScriptSelectCount == 0 ) {
+			if ($wgScriptSelectCount == 0) {
 				// this has been moved to getResourceModuleNames()
 				//Output::addModule( 'ext.sf_select.scriptselect' );
 			}
 			// $wgScriptSelectCount ++;
 
-			$data["selectismultiple"] = array_key_exists( "part_of_multiple", $other_args );
+			$data["selectismultiple"] = array_key_exists("part_of_multiple", $other_args);
 
-			$index = strpos( $input_name, "[" );
-			$data['selecttemplate'] = substr( $input_name, 0, $index );
+			$index = strpos($input_name, "[");
+			$data['selecttemplate'] = substr($input_name, 0, $index);
 
 			// Does hit work for multiple template?
-			$index = strrpos( $input_name, "[" );
-			$data['selectfield'] = substr( $input_name, $index + 1, strlen( $input_name ) - $index - 2 );
+			$index = strrpos($input_name, "[");
+			$data['selectfield'] = substr($input_name, $index + 1, strlen($input_name) - $index - 2);
 
 			$valueField = array();
 			$data["valuetemplate"] =
-				array_key_exists( "sametemplate", $other_args ) ? $data['selecttemplate'] : $other_args["template"];
+				array_key_exists("sametemplate", $other_args) ? $data['selecttemplate'] : $other_args["template"];
 			$data["valuefield"] = $other_args["field"];
 
-			$data['selectrm'] = array_key_exists( 'rmdiv', $other_args );
-			$data['label'] = array_key_exists( 'label', $other_args );
-			$data['sep'] = array_key_exists( 'sep', $other_args ) ? $other_args["sep"] : ',';
+			$data['selectrm'] = array_key_exists('rmdiv', $other_args);
+			$data['label'] = array_key_exists('label', $other_args);
+			$data['sep'] = array_key_exists('sep', $other_args) ? $other_args["sep"] : ',';
 
-			if ( array_key_exists( "query", $selectField ) ) {
+			if (array_key_exists("query", $selectField)) {
 				$data['selectquery'] = $selectField['query'];
 			} else {
 				$data['selectfunction'] = $selectField['function'];
@@ -160,32 +160,32 @@ 
 
 		// TODO This needs clean-up
 
-		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 = array();
-		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 .= '[]';
 		}
 
@@ -194,14 +194,14 @@ 
 		$spanextra = $is_mandatory ? 'mandatoryFieldSpan' : '';
 		$ret = "<span class=\"inputSpan $spanextra\"><select name='$inname' id='input_$sfgFieldNum' $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 {
-				$curvalues = array_map( "trim", explode( ",", $cur_value ) );
+				$curvalues = array_map("trim", explode(",", $cur_value));
 			}
 
 		} else {
@@ -211,13 +211,13 @@ 
 		// TODO handle empty value case.
 		$ret .= "<option></option>";
 
-		foreach ( $curvalues as $cur ) {
+		foreach ($curvalues as $cur) {
 			$ret .= "<option selected='selected'>$cur</option>";
 		}
 
-		if ( $staticvalue ) {
-			foreach ( $values as $val ) {
-				if ( !in_array( $val, $curvalues ) ) {
+		if ($staticvalue) {
+			foreach ($values as $val) {
+				if (!in_array($val, $curvalues)) {
 					$ret .= "<option>$val</option>";
 				}
 			}
@@ -226,13 +226,13 @@ 
 		$ret .= "</select></span>";
 		$ret .= "<span id=\"info_$sfgFieldNum\" 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' />";
 		}
 
-		if ( !$staticvalue ) {
-			$item = Output::addToHeadItem( $data );
+		if (!$staticvalue) {
+			$item = Output::addToHeadItem($data);
 			//$wgOut->addJsConfigVars('sf_select', array(json_encode( $data )));
 		}
 

tests/phpunit/Unit/OutputTest.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 class OutputTest extends \PHPUnit_Framework_TestCase {
 
 	public function testCanConstruct() {
-		$this->assertInstanceOf( '\SFS\Output', new Output() );
+		$this->assertInstanceOf('\SFS\Output', new Output());
 	}
 
 	public function testAddToHeadItem() {
@@ -24,9 +24,9 @@ 
 		$data['Foo'] = 'Bar';
 		$data['Spam'] = 'Eggs';
 
-		$ret = Output::addToHeadItem( $data );
+		$ret = Output::addToHeadItem($data);
 
-		$this->assertArrayHasKey( 'Foo', $ret );
-		$this->assertArrayHasKey( 'Spam', $ret );
+		$this->assertArrayHasKey('Foo', $ret);
+		$this->assertArrayHasKey('Spam', $ret);
 	}
 }

tests/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
-	die( 'Not an entry point' );
+if (PHP_SAPI !== 'cli') {
+	die('Not an entry point');
 }
 
-error_reporting( E_ALL | E_STRICT );
-date_default_timezone_set( 'UTC' );
-ini_set( 'display_errors', 1 );
+error_reporting(E_ALL | E_STRICT);
+date_default_timezone_set('UTC');
+ini_set('display_errors', 1);
 
 global $IP;
 
 //if ( !is_readable( $autoloaderClassPath = __DIR__ . '/../../SemanticMediaWiki/tests/autoloader.php' ) ) {
-if ( !is_readable( $autoloaderClassPath = $IP . '/extensions/SemanticMediaWiki/tests/autoloader.php' ) ) {
-	die( "\nThe Semantic MediaWiki test autoloader is not available\n" );
+if (!is_readable($autoloaderClassPath = $IP.'/extensions/SemanticMediaWiki/tests/autoloader.php')) {
+	die("\nThe Semantic MediaWiki test autoloader is not available\n");
 }
 
 // if ( !class_exists( 'SemanticFormsSelect' ) || ( $version = SemanticFormsSelect::getVersion() ) === null ) {
-if ( ExtensionRegistry::getInstance()->isLoaded( 'SemanticFormsSelect' ) ) {
-	die( "\nSemantic Forms Select is not available, please check your Composer or LocalSettings.\n" );
+if (ExtensionRegistry::getInstance()->isLoaded('SemanticFormsSelect')) {
+	die("\nSemantic Forms Select is not available, please check your Composer or LocalSettings.\n");
 }
 
 //print sprintf( "\n%-20s%s\n", "Semantic Forms Select: ", ExtensionRegistry::getInstance()->isLoaded( 'SemanticFormsSelect' ) );
@@ -26,4 +26,4 @@ 
 $autoloader = require $autoloaderClassPath;
 //$autoloader->addPsr4( 'SFS\\Tests\\', __DIR__ . '/phpunit/Unit' );
 //$autoloader->addPsr4( 'SFS\\Tests\\Integration\\', __DIR__ . '/phpunit/Integration' );
-unset( $autoloader );
+unset($autoloader);

src/Output.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 *
 	 * @param array $data
 	 */
-	public static function addToHeadItem( Array $data = [] ) {
+	public static function addToHeadItem(Array $data = []) {
 		return self::$headItems[] = $data;
 	}
 
@@ -38,7 +38,7 @@ 
 
 		// 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();

src/ApiSemanticFormsSelect.php

Spacing +8 added lines, -8 removed lines

@@ -24,22 +24,22 @@ 
 	 */
 	public function execute() {
 
-		$parser = new Parser( $GLOBALS['wgParserConf'] );
-		$parser->setTitle( Title::newFromText( 'NO TITLE' ) );
+		$parser = new Parser($GLOBALS['wgParserConf']);
+		$parser->setTitle(Title::newFromText('NO TITLE'));
 		$parser->mOptions = new ParserOptions();
 		$parser->mOutput = new ParserOutput();
 
-		$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;
 	}
@@ -87,7 +87,7 @@ 
 	 * @see ApiBase::getVersion
 	 */
 	public function getVersion() {
-		return __CLASS__ . ': 1.1';
+		return __CLASS__.': 1.1';
 	}
 
 }