| @@ -62,7 +62,7 @@ discard block | ||
| 62 | 62 | * @codeCoverageIgnore | 
| 63 | 63 | * @see ApiBase::getDescription | 
| 64 | 64 | * | 
| 65 | - * @return array | |
| 65 | + * @return string[] | |
| 66 | 66 | */ | 
| 67 | 67 |  	public function getDescription() { | 
| 68 | 68 | return array( | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | * @codeCoverageIgnore | 
| 75 | 75 | * @see ApiBase::getExamples | 
| 76 | 76 | * | 
| 77 | - * @return array | |
| 77 | + * @return string[] | |
| 78 | 78 | */ | 
| 79 | 79 |  	protected function getExamples() { | 
| 80 | 80 | return array( | 
| @@ -126,7 +126,7 @@ discard block | ||
| 126 | 126 | * | 
| 127 | 127 | * @param string $param | 
| 128 | 128 | * | 
| 129 | - * @return array | |
| 129 | + * @return string[] | |
| 130 | 130 | */ | 
| 131 | 131 |  	protected static function getSubParams( $param ) { | 
| 132 | 132 | $sub_params = array(); | 
| @@ -159,7 +159,7 @@ discard block | ||
| 159 | 159 | |
| 160 | 160 | /** | 
| 161 | 161 | * @param $rawparams | 
| 162 | - * @param $outputmode | |
| 162 | + * @param integer $outputmode | |
| 163 | 163 | * @param $context | 
| 164 | 164 | * @param $showmode | 
| 165 | 165 | * | 
| @@ -175,7 +175,7 @@ discard block | ||
| 175 | 175 | * Combine two arrays of SMWWikiPageValue objects into one | 
| 176 | 176 | * | 
| 177 | 177 | * @param array $result1 | 
| 178 | - * @param array $result2 | |
| 178 | + * @param SMWDIWikiPage[] $result2 | |
| 179 | 179 | * | 
| 180 | 180 | * @return array | 
| 181 | 181 | */ | 
| @@ -199,6 +199,9 @@ discard block | ||
| 199 | 199 | return $result1; | 
| 200 | 200 | } | 
| 201 | 201 | |
| 202 | + /** | |
| 203 | + * @param SMW\Query\PrintRequest[] $printRequests2 | |
| 204 | + */ | |
| 202 | 205 |  	protected static function mergeSMWPrintRequests( $printRequests1, $printRequests2 ) { | 
| 203 | 206 | $existingPrintoutLabels = array(); | 
| 204 | 207 |  		foreach ( $printRequests1 as $p1 ) { | 
| @@ -215,10 +218,10 @@ discard block | ||
| 215 | 218 | } | 
| 216 | 219 | |
| 217 | 220 | /** | 
| 218 | - * @param $querystring | |
| 221 | + * @param string $querystring | |
| 219 | 222 | * @param array $params | 
| 220 | 223 | * @param $extraPrintouts | 
| 221 | - * @param $outputMode | |
| 224 | + * @param integer $outputMode | |
| 222 | 225 | * @param $context | 
| 223 | 226 | * | 
| 224 | 227 | * @return SMWQueryResult | 
| @@ -260,7 +263,7 @@ discard block | ||
| 260 | 263 | * | 
| 261 | 264 | * @param SCQQueryResult $res | 
| 262 | 265 | * @param array $params These need to be the result of a list fed to getProcessedParams as of SMW 1.6.2 | 
| 263 | - * @param $outputmode | |
| 266 | + * @param integer $outputmode | |
| 264 | 267 | * @param $context | 
| 265 | 268 | * @param string $format | 
| 266 | 269 | * | 
| @@ -144,9 +144,7 @@ discard block | ||
| 144 | 144 | |
| 145 | 145 |  				if ( $c == '[' ) { | 
| 146 | 146 | $uncompleted_square_brackets++; | 
| 147 | - } | |
| 148 | - | |
| 149 | -				elseif ( $c == ']' ) { | |
| 147 | +				} elseif ( $c == ']' ) { | |
| 150 | 148 | $uncompleted_square_brackets--; | 
| 151 | 149 | } | 
| 152 | 150 | } | 
| @@ -240,8 +238,7 @@ discard block | ||
| 240 | 238 |  			foreach ( $params as $param ) { | 
| 241 | 239 | $parameters[$param->getName()] = $param->getValue(); | 
| 242 | 240 | } | 
| 243 | - } | |
| 244 | -		else { | |
| 241 | +		} else { | |
| 245 | 242 | $parameters = $params; | 
| 246 | 243 | } | 
| 247 | 244 | |
| @@ -15,7 +15,9 @@ | ||
| 15 | 15 | * @defgroup SemanticCompoundQueries SemanticCompoundQueries | 
| 16 | 16 | */ | 
| 17 | 17 | |
| 18 | -if ( !defined( 'MEDIAWIKI' ) ) die(); | |
| 18 | +if ( !defined( 'MEDIAWIKI' ) ) { | |
| 19 | + die(); | |
| 20 | +} | |
| 19 | 21 | |
| 20 | 22 | define( 'SCQ_VERSION', '0.4.1' ); | 
| 21 | 23 | |