@@ -6,7 +6,6 @@ |
||
6 | 6 | use ImportReporter; |
7 | 7 | use WikiImporter; |
8 | 8 | use RequestContext; |
9 | - |
|
10 | 9 | use RuntimeException; |
11 | 10 | |
12 | 11 | /** |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use SMW\DIWikiPage; |
6 | 6 | use SMW\SemanticData; |
7 | - |
|
8 | 7 | use Title; |
9 | - |
|
10 | 8 | use RuntimeException; |
11 | 9 | |
12 | 10 | /** |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use ImportReporter; |
7 | 7 | use WikiImporter; |
8 | 8 | use RequestContext; |
9 | - |
|
10 | 9 | use RuntimeException; |
11 | 10 | |
12 | 11 | /** |
@@ -134,6 +134,7 @@ discard block |
||
134 | 134 | * but just controls query generation. For general effect, the default namespaces |
135 | 135 | * should be set to NULL. |
136 | 136 | * |
137 | + * @param boolean $setNS |
|
137 | 138 | * @return Description|null |
138 | 139 | */ |
139 | 140 | private function getSubqueryDescription( &$setNS ) { |
@@ -242,6 +243,7 @@ discard block |
||
242 | 243 | * be the content of "[[ ... ]]". Returns NULL upon error. |
243 | 244 | * |
244 | 245 | * Parameters $setNS has the same use as in getSubqueryDescription(). |
246 | + * @param boolean $setNS |
|
245 | 247 | */ |
246 | 248 | private function getLinkDescription( &$setNS ) { |
247 | 249 | // This method is called when we encountered an opening '[['. The following |
@@ -424,6 +426,7 @@ discard block |
||
424 | 426 | * a category or property) and create a suitable description. |
425 | 427 | * The first chunk behind the "[[" has already been read and is |
426 | 428 | * passed as a parameter. |
429 | + * @param string $firstChunk |
|
427 | 430 | */ |
428 | 431 | private function getArticleDescription( $firstChunk, &$setNS ) { |
429 | 432 | $chunk = $firstChunk; |
@@ -469,6 +472,10 @@ discard block |
||
469 | 472 | return $this->finishLinkDescription( $chunk, true, $result, $setNS ); |
470 | 473 | } |
471 | 474 | |
475 | + /** |
|
476 | + * @param boolean $hasNamespaces |
|
477 | + * @param Description|null $result |
|
478 | + */ |
|
472 | 479 | private function finishLinkDescription( $chunk, $hasNamespaces, $result, &$setNS ) { |
473 | 480 | if ( is_null( $result ) ) { // no useful information or concrete error found |
474 | 481 | $this->descriptionProcessor->addErrorForMsgCode( 'smw_unexpectedpart', $chunk ); // was smw_badqueryatom |
@@ -565,6 +572,7 @@ discard block |
||
565 | 572 | /** |
566 | 573 | * Enter a new subblock in the query, which must at some time be terminated by the |
567 | 574 | * given $endstring delimiter calling popDelimiter(); |
575 | + * @param string $endstring |
|
568 | 576 | */ |
569 | 577 | private function pushDelimiter( $endstring ) { |
570 | 578 | array_push( $this->separatorStack, $endstring ); |
@@ -574,6 +582,7 @@ discard block |
||
574 | 582 | * Exit a subblock in the query ending with the given delimiter. |
575 | 583 | * If the delimiter does not match the top-most open block, false |
576 | 584 | * will be returned. Otherwise return true. |
585 | + * @param string $endstring |
|
577 | 586 | */ |
578 | 587 | private function popDelimiter( $endstring ) { |
579 | 588 | $topdelim = array_pop( $this->separatorStack ); |
@@ -2,13 +2,10 @@ |
||
2 | 2 | |
3 | 3 | use SMW\Query\Language\ClassDescription; |
4 | 4 | use SMW\Query\Language\ConceptDescription; |
5 | -use SMW\Query\Language\Conjunction; |
|
6 | 5 | use SMW\Query\Language\Description; |
7 | -use SMW\Query\Language\Disjunction; |
|
8 | 6 | use SMW\Query\Language\NamespaceDescription; |
9 | 7 | use SMW\Query\Language\SomeProperty; |
10 | 8 | use SMW\Query\Language\ThingDescription; |
11 | -use SMW\Query\Language\ValueDescription; |
|
12 | 9 | use SMW\Query\Parser\DescriptionProcessor; |
13 | 10 | |
14 | 11 | /** |
@@ -3,7 +3,6 @@ discard block |
||
3 | 3 | namespace SMW\Tests; |
4 | 4 | |
5 | 5 | use SMW\Tests\Utils\UtilityFactory; |
6 | - |
|
7 | 6 | use SMW\SubobjectParserFunction; |
8 | 7 | use SMW\Subobject; |
9 | 8 | use SMW\ParserParameterFormatter; |
@@ -11,8 +10,6 @@ discard block |
||
11 | 10 | use SMW\ParserData; |
12 | 11 | use SMW\DIProperty; |
13 | 12 | use SMW\Localizer; |
14 | - |
|
15 | -use SMWDataItem; |
|
16 | 13 | use Title; |
17 | 14 | use ParserOutput; |
18 | 15 |
@@ -166,6 +166,7 @@ discard block |
||
166 | 166 | * |
167 | 167 | * The return value is the expected combined description. The object $currentDescription will |
168 | 168 | * also be changed (if it was non-NULL). |
169 | + * @param integer $compoundType |
|
169 | 170 | */ |
170 | 171 | private function getCompoundDescription( Description $currentDescription = null, Description $newDescription = null, $compoundType = SMW_CONJUNCTION_QUERY ) { |
171 | 172 | |
@@ -201,6 +202,10 @@ discard block |
||
201 | 202 | } |
202 | 203 | } |
203 | 204 | |
205 | + /** |
|
206 | + * @param Description $currentDescription |
|
207 | + * @param Description $newDescription |
|
208 | + */ |
|
204 | 209 | private function newCompoundDescriptionFor( $compoundType, $currentDescription, $newDescription ) { |
205 | 210 | |
206 | 211 | if ( ( ( $compoundType & SMW_CONJUNCTION_QUERY ) != 0 && ( $currentDescription instanceof Conjunction ) ) || |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * |
146 | 146 | * @param string $text |
147 | 147 | * |
148 | - * @return text |
|
148 | + * @return string |
|
149 | 149 | */ |
150 | 150 | public static function decodeSquareBracket( $text ) { |
151 | 151 | return str_replace( array( '%5B', '%5D' ), array( '[', ']' ), $text ); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | * |
157 | 157 | * @param string $text |
158 | 158 | * |
159 | - * @return text |
|
159 | + * @return string |
|
160 | 160 | */ |
161 | 161 | public static function obscureAnnotation( $text ) { |
162 | 162 | return preg_replace_callback( |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * |
174 | 174 | * @param string $text |
175 | 175 | * |
176 | - * @return text |
|
176 | + * @return string |
|
177 | 177 | */ |
178 | 178 | public static function removeAnnotation( $text ) { |
179 | 179 | return preg_replace_callback( |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * |
231 | 231 | * @since 1.9 |
232 | 232 | * |
233 | - * @return array |
|
233 | + * @return string[] |
|
234 | 234 | */ |
235 | 235 | protected function getModules() { |
236 | 236 | return array( |
@@ -66,7 +66,7 @@ |
||
66 | 66 | /** |
67 | 67 | * @since 1.9 |
68 | 68 | * |
69 | - * @return true |
|
69 | + * @return boolean |
|
70 | 70 | */ |
71 | 71 | public function process() { |
72 | 72 |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use SMW\SPARQLStore\QueryEngine\QueryEngine; |
6 | 6 | use SMW\SPARQLStore\QueryEngine\EngineOptions; |
7 | 7 | use SMW\SPARQLStore\QueryEngine\QueryResultFactory; |
8 | -use SMW\DIProperty; |
|
9 | 8 | use SMWQuery as Query; |
10 | 9 | |
11 | 10 | /** |
@@ -91,6 +91,9 @@ |
||
91 | 91 | return new Conjunction( $subdescriptions ); |
92 | 92 | } |
93 | 93 | |
94 | + /** |
|
95 | + * @param \SMWDataValue $dataValue |
|
96 | + */ |
|
94 | 97 | private function newSubdescription( $dataValue, $comparator ) { |
95 | 98 | |
96 | 99 | $description = new ValueDescription( |