SemanticMediaWiki / SemanticCompoundQueries

src/CompoundQueryResult.php

Spacing +9 added lines, -9 removed lines

@@ -23,29 +23,29 @@
 	 *
 	 * @param QueryResult $newResult
 	 */
-	public function addResult( QueryResult $newResult ) {
+	public function addResult(QueryResult $newResult) {
 		$existingPageNames = [];
 
-		while ( $row = $this->getNext() ) {
-			if ( $row[0] instanceof ResultArray ) {
+		while ($row = $this->getNext()) {
+			if ($row[0] instanceof ResultArray) {
 				$content = $row[0]->getContent();
-				$existingPageNames[] = $content[0]->getLongText( SMW_OUTPUT_WIKI );
+				$existingPageNames[] = $content[0]->getLongText(SMW_OUTPUT_WIKI);
 			}
 		}
 
-		while ( ( $row = $newResult->getNext() ) !== false ) {
-			if ( property_exists( $newResult, 'display_options' ) ) {
+		while (($row = $newResult->getNext()) !== false) {
+			if (property_exists($newResult, 'display_options')) {
 				$row[0]->display_options = $newResult->display_options;
 			}
 			$content = $row[0]->getContent();
-			$pageName = $content[0]->getLongText( SMW_OUTPUT_WIKI );
+			$pageName = $content[0]->getLongText(SMW_OUTPUT_WIKI);
 
-			if ( !in_array( $pageName, $existingPageNames ) ) {
+			if (!in_array($pageName, $existingPageNames)) {
 				$this->m_content[] = $row;
 			}
 		}
 
-		reset( $this->m_content );
+		reset($this->m_content);
 	}
 
 }

src/Api/CompoundQuery.php

Spacing +7 added lines, -7 removed lines

@@ -21,18 +21,18 @@ 
 	 * @see ApiBase::execute
 	 */
 	public function execute() {
-		$parameterFormatter = new ApiRequestParameterFormatter( $this->extractRequestParams() );
+		$parameterFormatter = new ApiRequestParameterFormatter($this->extractRequestParams());
 		$parameters = $parameterFormatter->getAskApiParameters();
 
-		list( $queryParams, $otherParams ) = CompoundQueryProcessor::separateParams( $parameters );
-		list( $queryResult ) = CompoundQueryProcessor::queryAndMergeResults( $queryParams, $otherParams );
+		list($queryParams, $otherParams) = CompoundQueryProcessor::separateParams($parameters);
+		list($queryResult) = CompoundQueryProcessor::queryAndMergeResults($queryParams, $otherParams);
 
 		$outputFormat = 'json';
-		if ( $this->getMain()->getPrinter() instanceof \ApiFormatXml ) {
+		if ($this->getMain()->getPrinter() instanceof \ApiFormatXml) {
 			$outputFormat = 'xml';
 		}
 
-		$this->addQueryResult( $queryResult, $outputFormat );
+		$this->addQueryResult($queryResult, $outputFormat);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 */
 	protected function getExamples() {
 		return [
-			'api.php?action=compoundquery&query=' . urlencode( '[[Has city::Vienna]]; ?Has coordinates|[[Has city::Graz]]; ?Has coordinates' ),
-			'api.php?action=compoundquery&query=' . urlencode( '|[[Has city::Vienna]]; ?Has coordinates|[[Has city::Graz]]; ?Has coordinates' ),
+			'api.php?action=compoundquery&query=' . urlencode('[[Has city::Vienna]]; ?Has coordinates|[[Has city::Graz]]; ?Has coordinates'),
+			'api.php?action=compoundquery&query=' . urlencode('|[[Has city::Vienna]]; ?Has coordinates|[[Has city::Graz]]; ?Has coordinates'),
 		];
 	}
 

tests/phpunit/Unit/CompoundQueryProcessorTest.php

Spacing +8 added lines, -8 removed lines

@@ -24,13 +24,13 @@ 
 	 *
 	 * @return mixed Method return.
 	 */
-	public function invokeMethod( &$object, $methodName, array $parameters = [] ) {
+	public function invokeMethod(&$object, $methodName, array $parameters = []) {
 
-		$reflection = new \ReflectionClass( get_class( $object ) );
-		$method = $reflection->getMethod( $methodName );
-		$method->setAccessible( true );
+		$reflection = new \ReflectionClass(get_class($object));
+		$method = $reflection->getMethod($methodName);
+		$method->setAccessible(true);
 
-		return $method->invokeArgs( $object, $parameters );
+		return $method->invokeArgs($object, $parameters);
 	}
 
 	public function testSeparateParams() {
@@ -57,7 +57,7 @@ 
 			]
 		];
 
-		$this->assertEquals( $expected, CompoundQueryProcessor::separateParams( $params ) );
+		$this->assertEquals($expected, CompoundQueryProcessor::separateParams($params));
 	}
 
 	public function testGetSubParams() {
@@ -74,8 +74,8 @@ 
 		];
 
 		$processor = new CompoundQueryProcessor();
-		$actual = $this->invokeMethod( $processor, 'getSubParams', [ $param ] );
-		$this->assertEquals( $expected, $actual );
+		$actual = $this->invokeMethod($processor, 'getSubParams', [$param]);
+		$this->assertEquals($expected, $actual);
 	}
 
 }

tests/phpunit/Unit/CompoundQueryResultTest.php

Spacing +3 added lines, -3 removed lines

@@ -21,11 +21,11 @@ 
 	protected function setUp() : void {
 		parent::setUp();
 
-		$this->store = $this->getMockBuilder( '\SMW\Store' )
+		$this->store = $this->getMockBuilder('\SMW\Store')
 			->disableOriginalConstructor()
 			->getMockForAbstractClass();
 
-		$this->query = $this->getMockBuilder( '\SMWQuery' )
+		$this->query = $this->getMockBuilder('\SMWQuery')
 			->disableOriginalConstructor()
 			->getMock();
 	}
@@ -34,7 +34,7 @@ 
 
 		$this->assertInstanceOf(
 			CompoundQueryResult::class,
-			new CompoundQueryResult( [], $this->query, [], $this->store )
+			new CompoundQueryResult([], $this->query, [], $this->store)
 		);
 	}
 

i18n/SemanticCompoundQueries.i18n.magic.php

Spacing +15 added lines, -15 removed lines

@@ -7,75 +7,75 @@
 
 /** English (English) */
 $magicWords['en'] = [
-	'compound_query' => [ 0, 'compound_query' ],
+	'compound_query' => [0, 'compound_query'],
 ];
 
 /** Arabic (العربية) */
 $magicWords['ar'] = [
-	'compound_query' => [ 0, 'استعلام_مركب' ],
+	'compound_query' => [0, 'استعلام_مركب'],
 ];
 
 /** Egyptian Arabic (مصرى) */
 $magicWords['arz'] = [
-	'compound_query' => [ 0, 'استعلام_مركب' ],
+	'compound_query' => [0, 'استعلام_مركب'],
 ];
 
 /** Chuvash (Чӑвашла) */
 $magicWords['cv'] = [
-	'compound_query' => [ 0, 'compound_query' ],
+	'compound_query' => [0, 'compound_query'],
 ];
 
 /** German (Deutsch) */
 $magicWords['de'] = [
-	'compound_query' => [ 0, 'abfrage_zusammen', 'frage_zusammen' ],
+	'compound_query' => [0, 'abfrage_zusammen', 'frage_zusammen'],
 ];
 
 /** Japanese (日本語) */
 $magicWords['ja'] = [
-	'compound_query' => [ 0, '複合クエリ', '複合クエリー' ],
+	'compound_query' => [0, '複合クエリ', '複合クエリー'],
 ];
 
 /** Korean (한국어) */
 $magicWords['ko'] = [
-	'compound_query' => [ 0, '복합_쿼리' ],
+	'compound_query' => [0, '복합_쿼리'],
 ];
 
 /** Macedonian (македонски) */
 $magicWords['mk'] = [
-	'compound_query' => [ 0, 'мешовито_барање' ],
+	'compound_query' => [0, 'мешовито_барање'],
 ];
 
 /** Low Saxon (Netherlands) (Nedersaksies) */
 $magicWords['nds-nl'] = [
-	'compound_query' => [ 0, 'samenestelden_zeukopdrachte', 'samengestelde_zoekopdracht' ],
+	'compound_query' => [0, 'samenestelden_zeukopdrachte', 'samengestelde_zoekopdracht'],
 ];
 
 /** Dutch (Nederlands) */
 $magicWords['nl'] = [
-	'compound_query' => [ 0, 'samengestelde_zoekopdracht' ],
+	'compound_query' => [0, 'samengestelde_zoekopdracht'],
 ];
 
 /** Brazilian Portuguese (português do Brasil) */
 $magicWords['pt-br'] = [
-	'compound_query' => [ 0, 'consulta_composta' ],
+	'compound_query' => [0, 'consulta_composta'],
 ];
 
 /** Serbian (Cyrillic script) (српски (ћирилица)‎) */
 $magicWords['sr-ec'] = [
-	'compound_query' => [ 0, 'састави_упит' ],
+	'compound_query' => [0, 'састави_упит'],
 ];
 
 /** Serbian (Latin script) (srpski (latinica)‎) */
 $magicWords['sr-el'] = [
-	'compound_query' => [ 0, 'sastavi_upit' ],
+	'compound_query' => [0, 'sastavi_upit'],
 ];
 
 /** Simplified Chinese (中文（简体）‎) */
 $magicWords['zh-hans'] = [
-	'compound_query' => [ 0, '组合查询' ],
+	'compound_query' => [0, '组合查询'],
 ];
 
 /** Traditional Chinese (中文（繁體）‎) */
 $magicWords['zh-hant'] = [
-	'compound_query' => [ 0, '組合搜尋' ],
+	'compound_query' => [0, '組合搜尋'],
 ];

tests/bootstrap.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg' ) {
-	die( 'Not an entry point' );
+if (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
+	die('Not an entry point');
 }
 
-if ( !is_readable( $autoloaderClassPath = __DIR__ . '/../../SemanticMediaWiki/tests/autoloader.php' ) ) {
-	die( 'The SemanticMediaWiki test autoloader is not available' );
+if (!is_readable($autoloaderClassPath = __DIR__ . '/../../SemanticMediaWiki/tests/autoloader.php')) {
+	die('The SemanticMediaWiki test autoloader is not available');
 }
 
-print sprintf( "\n%-20s%s\n", "Semantic Compound Queries: ", SCQ_VERSION );
+print sprintf("\n%-20s%s\n", "Semantic Compound Queries: ", SCQ_VERSION);

tests/phpunit/Integration/I18nJsonFileIntegrityTest.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
 	/**
 	 * @dataProvider i18nFileProvider
 	 */
-	public function testI18NJsonDecodeEncode( $file ) {
+	public function testI18NJsonDecodeEncode($file) {
 
-		$jsonFileReader = UtilityFactory::getInstance()->newJsonFileReader( $file );
+		$jsonFileReader = UtilityFactory::getInstance()->newJsonFileReader($file);
 
 		$this->assertIsInt(
 			$jsonFileReader->getModificationTime()
@@ -35,11 +35,11 @@ 
 		$provider = [];
 		$location = $GLOBALS['wgMessagesDirs']['SemanticCompoundQueries'];
 
-		$bulkFileProvider = UtilityFactory::getInstance()->newBulkFileProvider( $location );
-		$bulkFileProvider->searchByFileExtension( 'json' );
+		$bulkFileProvider = UtilityFactory::getInstance()->newBulkFileProvider($location);
+		$bulkFileProvider->searchByFileExtension('json');
 
-		foreach ( $bulkFileProvider->getFiles() as $file ) {
-			$provider[] = [ $file ];
+		foreach ($bulkFileProvider->getFiles() as $file) {
+			$provider[] = [$file];
 		}
 
 		return $provider;

tests/phpunit/Unit/Api/CompoundQueryTest.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	public function testCanConstruct() {
 
 		$instance = new CompoundQuery(
-			$this->apiFactory->newApiMain( [ 'query' => 'Foo' ] ),
+			$this->apiFactory->newApiMain(['query' => 'Foo']),
 			'compoundquery'
 		);
 
@@ -42,22 +42,22 @@ 
 	/**
 	 * @dataProvider sampleQueryProvider
 	 */
-	public function testExecute( array $query, array $expected ) {
+	public function testExecute(array $query, array $expected) {
 
-		$results = $this->apiFactory->doApiRequest( [
+		$results = $this->apiFactory->doApiRequest([
 			'action' => 'compoundquery',
-			'query' => implode( '|', $query )
-		] );
+			'query' => implode('|', $query)
+		]);
 
 		$this->assertIsArray(
 			$results
 		);
 
 		// If their is no printrequests array we expect an error array
-		if ( isset( $results['query']['printrequests'] ) ) {
-			$this->assertEquals( $expected, $results['query']['printrequests'] );
+		if (isset($results['query']['printrequests'])) {
+			$this->assertEquals($expected, $results['query']['printrequests']);
 		} else {
-			$this->assertArrayHasKey( 'error', $results );
+			$this->assertArrayHasKey('error', $results);
 		}
 	}
 

SemanticCompoundQueries.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 	 */
 	public static function load() {
 
-		if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
+		if (is_readable(__DIR__ . '/vendor/autoload.php')) {
 			include_once __DIR__ . '/vendor/autoload.php';
 		}
 	}
@@ -32,10 +32,10 @@ 
 	/**
 	 * @since 1.1
 	 */
-	public static function initExtension( $credits = [] ) {
+	public static function initExtension($credits = []) {
 
 		// See https://phabricator.wikimedia.org/T151136
-		define( 'SCQ_VERSION', isset( $credits['version'] ) ? $credits['version'] : 'UNKNOWN' );
+		define('SCQ_VERSION', isset($credits['version']) ? $credits['version'] : 'UNKNOWN');
 
 		// Register message files
 		$GLOBALS['wgMessagesDirs']['SemanticCompoundQueries'] = __DIR__ . '/i18n';
@@ -48,10 +48,10 @@ 
 	 */
 	public static function onExtensionFunction() {
 
-		if ( !defined( 'SMW_VERSION' ) ) {
+		if (!defined('SMW_VERSION')) {
 
-			if ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' ) {
-				die( "\nThe 'Semantic Compound Queries' extension requires 'Semantic MediaWiki' to be installed and enabled.\n" );
+			if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+				die("\nThe 'Semantic Compound Queries' extension requires 'Semantic MediaWiki' to be installed and enabled.\n");
 			} else {
 				die(
 					'<b>Error:</b> The <a href="https://www.semantic-mediawiki.org/wiki/Extension:Semantic_Compound_Queries">Semantic Compound Queries</a> ' .
@@ -66,8 +66,8 @@ 
 
 		// wgHooks
 		$hookContainer = MediaWikiServices::getInstance()->getHookContainer();
-		$hookContainer->register( 'ParserFirstCallInit', function( Parser &$parser  ) {
-			$parser->setFunctionHook( 'compound_query', [ '\SCQ\CompoundQueryProcessor', 'doCompoundQuery' ] );
+		$hookContainer->register('ParserFirstCallInit', function(Parser&$parser) {
+			$parser->setFunctionHook('compound_query', ['\SCQ\CompoundQueryProcessor', 'doCompoundQuery']);
 
 			// always return true, in order not to stop MW's hook processing!
 			return true;