SemanticMediaWiki / SemanticFormsSelect

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);

tests/phpunit_inactive/Unit/ApiRequestProcessorTest.php

Spacing +10 added lines, -10 removed lines

@@ -21,43 +21,43 @@
 
 	public function testCanConstruct() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
 		$this->assertInstanceOf(
 			'\SFS\ApiRequestProcessor',
-			new ApiRequestProcessor( $parser )
+			new ApiRequestProcessor($parser)
 		);
 	}
 
 	public function testMissingParametersThrowsException() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$instance = new ApiRequestProcessor( $parser );
+		$instance = new ApiRequestProcessor($parser);
 
 		$parameters = array();
 
-		$this->setExpectedException( 'InvalidArgumentException' );
-		$instance->getJsonDecodedResultValuesForRequestParameters( $parameters );
+		$this->setExpectedException('InvalidArgumentException');
+		$instance->getJsonDecodedResultValuesForRequestParameters($parameters);
 	}
 
 	public function testJsonResultValuesFromRequestParameters() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$instance = new ApiRequestProcessor( $parser );
+		$instance = new ApiRequestProcessor($parser);
 
-		$parameters = array( 'query' => 'foo', 'sep' => ',' );
+		$parameters = array('query' => 'foo', 'sep' => ',');
 
 		$this->assertInternalType(
 			'object',
-			$instance->getJsonDecodedResultValuesForRequestParameters( $parameters )
+			$instance->getJsonDecodedResultValuesForRequestParameters($parameters)
 		);
 	}
 

tests/phpunit_inactive/Unit/ApiSemanticFormsSelectTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function testCanConstruct() {
 
-		$apiMain = new ApiMain( $this->newRequestContext( array() ), true );
+		$apiMain = new ApiMain($this->newRequestContext(array()), true);
 
 		$instance = new ApiSemanticFormsSelect(
 			$apiMain,
@@ -43,7 +43,7 @@ 
 			'sep'      => ','
 		);
 
-		$apiMain = new ApiMain( $this->newRequestContext( $parameters ), true );
+		$apiMain = new ApiMain($this->newRequestContext($parameters), true);
 
 		$instance = new ApiSemanticFormsSelect(
 			$apiMain,
@@ -55,14 +55,14 @@ 
 		);
 	}
 
-	private function newRequestContext( $request = array() ) {
+	private function newRequestContext($request = array()) {
 
 		$context = new RequestContext();
 
-		if ( $request instanceof WebRequest ) {
-			$context->setRequest( $request );
+		if ($request instanceof WebRequest) {
+			$context->setRequest($request);
 		} else {
-			$context->setRequest( new FauxRequest( $request, true ) );
+			$context->setRequest(new FauxRequest($request, true));
 		}
 
 		return $context;

tests/phpunit_inactive/Unit/SemanticFormsSelectTest.php

Spacing +9 added lines, -9 removed lines

@@ -17,13 +17,13 @@ 
 
 	public function testCanConstruct() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
 		$this->assertInstanceOf(
 			'\SFS\SemanticFormsSelect',
-			new SemanticFormsSelect( $parser )
+			new SemanticFormsSelect($parser)
 		);
 	}
 
@@ -41,23 +41,23 @@ 
 			'is_list' => true
 		);
 
-		$parserOutput = $this->getMockBuilder( '\ParserOutput' )
+		$parserOutput = $this->getMockBuilder('\ParserOutput')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$parser->expects( $this->any() )
-			->method( 'getOutput' )
-			->will( $this->returnValue( $parserOutput ) );
+		$parser->expects($this->any())
+			->method('getOutput')
+			->will($this->returnValue($parserOutput));
 
-		$instance = new SemanticFormsSelect( $parser );
+		$instance = new SemanticFormsSelect($parser);
 
 		$this->assertInternalType(
 			'string',
-			$instance->select( $value, $inputName, $isMandatory, $isDisabled, $otherArgs )
+			$instance->select($value, $inputName, $isMandatory, $isDisabled, $otherArgs)
 		);
 	}
 

SemanticFormsSelect.hooks.php

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/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/ApiSemanticFormsSelectRequestProcessor.php

Spacing +39 added lines, -39 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param Parser $parser
 	 */
-	public function __construct( Parser $parser ) {
+	public function __construct(Parser $parser) {
 		$this->parser = $parser;
 	}
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param boolean $debugFlag
 	 */
-	public function setDebugFlag( $debugFlag ) {
+	public function setDebugFlag($debugFlag) {
 		$this->debugFlag = $debugFlag;
 	}
 
@@ -52,91 +52,91 @@ 
 	 *
 	 * @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');
 		}
 
 		$this->parser->firstCallInit();
 		$json = array();
 
-		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( $query, $sep = "," ) {
+	private function doProcessQueryFor($query, $sep = ",") {
 
 		$query = str_replace(
-			array( "<", ">", "sep=;" ),
-			array( "<", ">", "sep={$sep};" ),
+			array("&lt;", "&gt;", "sep=;"),
+			array("<", ">", "sep={$sep};"),
 			$query
 		);
 
-		$params = explode( ";", $query );
-		$f = str_replace( ";", "|", $params[0] );
+		$params = explode(";", $query);
+		$f = str_replace(";", "|", $params[0]);
 
-		$params[0] = $this->parser->replaceVariables( $f );
+		$params[0] = $this->parser->replaceVariables($f);
 
-		if ( $this->debugFlag ) {
-			error_log( implode( "|", $params ) );
+		if ($this->debugFlag) {
+			error_log(implode("|", $params));
 		}
 
 		$values = $this->getFormattedValuesFrom(
 			$sep,
-			QueryProcessor::getResultFromFunctionParams( $params, SMW_OUTPUT_WIKI )
+			QueryProcessor::getResultFromFunctionParams($params, SMW_OUTPUT_WIKI)
 		);
 
-		return json_encode( array(
+		return json_encode(array(
 			"values" => $values,
-			"count"  => count( $values )
-		) );
+			"count"  => count($values)
+		));
 	}
 
-	private function doProcessFunctionFor( $query, $sep = "," ) {
+	private function doProcessFunctionFor($query, $sep = ",") {
 
 		$query = str_replace(
-			array( "&lt;", "&gt;", "sep=;" ),
-			array( "<", ">", "sep={$sep};" ),
+			array("&lt;", "&gt;", "sep=;"),
+			array("<", ">", "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( array(
+		return json_encode(array(
 			"values" => $values,
-			"count"  => count( $values )
-		) );
+			"count"  => count($values)
+		));
 	}
 
-	private function getFormattedValuesFrom( $sep, $values ) {
+	private function getFormattedValuesFrom($sep, $values) {
 
-		if ( strpos( $values, $sep ) === false ) {
-			return array( $values );
+		if (strpos($values, $sep) === false) {
+			return array($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);
 
-		sort( $values );
-		array_unshift( $values, "" );
+		sort($values);
+		array_unshift($values, "");
 
 		return $values;
 	}

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';
 	}
 
 }