| @@ -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( | 
| @@ -132,7 +132,7 @@ discard block | ||
| 132 | 132 | * | 
| 133 | 133 | * @param string $param | 
| 134 | 134 | * | 
| 135 | - * @return array | |
| 135 | + * @return string[] | |
| 136 | 136 | */ | 
| 137 | 137 |  	protected static function getSubParams( $param ) { | 
| 138 | 138 | $sub_params = array(); | 
| @@ -168,7 +168,7 @@ discard block | ||
| 168 | 168 | * @param $context | 
| 169 | 169 | * @param $showmode | 
| 170 | 170 | * | 
| 171 | - * @return SMWQueryResult | |
| 171 | + * @return \SMWQueryResult | |
| 172 | 172 | */ | 
| 173 | 173 |  	protected static function getQueryResultFromFunctionParams( $rawparams, $context = QueryProcessor::INLINE_QUERY, $showmode = false ) { | 
| 174 | 174 | $printouts = array(); | 
| @@ -180,7 +180,7 @@ discard block | ||
| 180 | 180 | * Combine two arrays of SMWWikiPageValue objects into one | 
| 181 | 181 | * | 
| 182 | 182 | * @param array $result1 | 
| 183 | - * @param array $result2 | |
| 183 | + * @param \SMWDIWikiPage[] $result2 | |
| 184 | 184 | * | 
| 185 | 185 | * @return array | 
| 186 | 186 | */ | 
| @@ -204,6 +204,9 @@ discard block | ||
| 204 | 204 | return $result1; | 
| 205 | 205 | } | 
| 206 | 206 | |
| 207 | + /** | |
| 208 | + * @param \SMW\Query\PrintRequest[] $printRequests2 | |
| 209 | + */ | |
| 207 | 210 |  	protected static function mergeSMWPrintRequests( $printRequests1, $printRequests2 ) { | 
| 208 | 211 | $existingPrintoutLabels = array(); | 
| 209 | 212 |  		foreach ( $printRequests1 as $p1 ) { | 
| @@ -220,13 +223,13 @@ discard block | ||
| 220 | 223 | } | 
| 221 | 224 | |
| 222 | 225 | /** | 
| 223 | - * @param $querystring | |
| 226 | + * @param string $querystring | |
| 224 | 227 | * @param array $params | 
| 225 | 228 | * @param $extraPrintouts | 
| 226 | 229 | * @param $outputMode | 
| 227 | 230 | * @param $context | 
| 228 | 231 | * | 
| 229 | - * @return SMWQueryResult | |
| 232 | + * @return \SMWQueryResult | |
| 230 | 233 | */ | 
| 231 | 234 |  	protected static function getQueryResultFromQueryString( $querystring, array $params, $extraPrintouts, $context = QueryProcessor::INLINE_QUERY ) { | 
| 232 | 235 | |
| @@ -262,7 +265,7 @@ discard block | ||
| 262 | 265 | * | 
| 263 | 266 | * @param CompoundQueryResult $res | 
| 264 | 267 | * @param array $params These need to be the result of a list fed to getProcessedParams as of SMW 1.6.2 | 
| 265 | - * @param $outputmode | |
| 268 | + * @param integer $outputmode | |
| 266 | 269 | * @param $context | 
| 267 | 270 | * @param string $format | 
| 268 | 271 | * | 
| @@ -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 | |