@@ -197,7 +197,7 @@ |
||
197 | 197 | * ValueDescription objects, create and return a plain WHERE condition |
198 | 198 | * string for it. |
199 | 199 | * |
200 | - * @param $query |
|
200 | + * @param QuerySegment $query |
|
201 | 201 | * @param Description $description |
202 | 202 | * @param SMWSQLStore3Table $proptable |
203 | 203 | * @param DataItemHandler $diHandler for that table |
@@ -277,6 +277,9 @@ discard block |
||
277 | 277 | return DebugOutputFormatter::formatOutputFor( 'SQLStore', $entries, $query ); |
278 | 278 | } |
279 | 279 | |
280 | + /** |
|
281 | + * @param QuerySegment $qobj |
|
282 | + */ |
|
280 | 283 | private function doPrepareDebugQueryResult( $qobj, $sqlOptions, &$entries ) { |
281 | 284 | |
282 | 285 | $db = $this->store->getConnection(); |
@@ -501,6 +504,9 @@ discard block |
||
501 | 504 | } |
502 | 505 | } |
503 | 506 | |
507 | + /** |
|
508 | + * @param QuerySegment $qobj |
|
509 | + */ |
|
504 | 510 | private function collectedRequiredExtraPropertyDescriptions( $qobj ) { |
505 | 511 | $extraProperties = array(); |
506 | 512 | |
@@ -526,6 +532,10 @@ discard block |
||
526 | 532 | return $extraProperties; |
527 | 533 | } |
528 | 534 | |
535 | + /** |
|
536 | + * @param QuerySegment $qobj |
|
537 | + * @param integer $qid |
|
538 | + */ |
|
529 | 539 | private function compileAccordingConditionsAndHackThemIntoQobj( array $extraProperties, $qobj, $qid ) { |
530 | 540 | $this->querySegmentListBuilder->setSortKeys( $this->sortKeys ); |
531 | 541 | $this->querySegmentListBuilder->buildQuerySegmentFor( new Conjunction( $extraProperties ) ); |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use SMW\Query\Language\SomeProperty; |
7 | 7 | use SMW\Query\Language\ThingDescription; |
8 | 8 | use SMW\Query\DebugOutputFormatter; |
9 | -use SMW\SQLStore\TemporaryIdTableCreator; |
|
10 | 9 | use SMW\DIWikiPage; |
11 | 10 | use SMWSQLStore3 as SQLStore; |
12 | 11 | use SMWQuery as Query; |
@@ -177,7 +177,7 @@ |
||
177 | 177 | /** |
178 | 178 | * @since 2.2 |
179 | 179 | * |
180 | - * @return array |
|
180 | + * @return string[] |
|
181 | 181 | */ |
182 | 182 | public function getErrors() { |
183 | 183 | return $this->errors; |
@@ -85,6 +85,7 @@ |
||
85 | 85 | * @since 2.2 |
86 | 86 | * |
87 | 87 | * @param &$querySegmentList |
88 | + * @param QuerySegment[] $querySegmentList |
|
88 | 89 | */ |
89 | 90 | public function setQuerySegmentList( &$querySegmentList ) { |
90 | 91 | $this->querySegmentList =& $querySegmentList; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * |
133 | 133 | * @since 1.8 |
134 | 134 | * @param array $data array of SMWDataItem objects |
135 | - * @param SMWRequestOptions|null $requestoptions |
|
135 | + * @param null|RequestOptions $requestOptions |
|
136 | 136 | * |
137 | 137 | * @return SMWDataItem[] |
138 | 138 | */ |
@@ -170,6 +170,9 @@ discard block |
||
170 | 170 | return $result; |
171 | 171 | } |
172 | 172 | |
173 | + /** |
|
174 | + * @param boolean $keepDataValue |
|
175 | + */ |
|
173 | 176 | private function applyStringConditions( $requestOptions, $label, $keepDataValue ) { |
174 | 177 | |
175 | 178 | foreach ( $requestOptions->getStringConditions() as $strcond ) { // apply string conditions |
@@ -189,6 +192,9 @@ discard block |
||
189 | 192 | return $keepDataValue; |
190 | 193 | } |
191 | 194 | |
195 | + /** |
|
196 | + * @param boolean $isNumeric |
|
197 | + */ |
|
192 | 198 | private function applyBoundaryConditions( $requestOptions, $value, $isNumeric ) { |
193 | 199 | $keepDataValue = true; // keep datavalue only if this remains true |
194 | 200 | |
@@ -229,6 +235,9 @@ discard block |
||
229 | 235 | return array( $label, $value ); |
230 | 236 | } |
231 | 237 | |
238 | + /** |
|
239 | + * @param boolean $isNumeric |
|
240 | + */ |
|
232 | 241 | private function applySortRestriction( $requestOptions, &$result, $sortres, $isNumeric ) { |
233 | 242 | |
234 | 243 | if ( !$requestOptions->sort ) { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SMW\SQLStore; |
4 | 4 | |
5 | -use SMW\MediaWiki\Database; |
|
6 | 5 | use SMWStringCondition as StringCondition; |
7 | 6 | use SMWRequestOptions as RequestOptions; |
8 | 7 | use SMW\DIWikiPage; |
@@ -15,8 +15,6 @@ |
||
15 | 15 | use SMW\SQLStore\QueryEngine\ConceptQueryResolver; |
16 | 16 | use SMW\SQLStore\QueryEngine\QueryEngine; |
17 | 17 | use SMW\SQLStore\QueryEngine\EngineOptions; |
18 | -use Onoi\Cache\Cache; |
|
19 | -use SMW\EventHandler; |
|
20 | 18 | use Onoi\BlobStore\BlobStore; |
21 | 19 | use SMW\SQLStore\ConceptCache; |
22 | 20 | use SMW\ApplicationFactory; |
@@ -20,7 +20,6 @@ discard block |
||
20 | 20 | * @since 2.3 |
21 | 21 | * |
22 | 22 | * @param DIWikiPage $subject |
23 | - * @param RequestOptions $requestOptions = null |
|
24 | 23 | * |
25 | 24 | * @return array |
26 | 25 | */ |
@@ -56,7 +55,6 @@ discard block |
||
56 | 55 | * |
57 | 56 | * @since 2.3 |
58 | 57 | * |
59 | - * @param DIWikiPage|null $subject |
|
60 | 58 | * @param DIProperty $property |
61 | 59 | * @param RequestOptions $requestOptions = null |
62 | 60 | * |
@@ -45,7 +45,7 @@ |
||
45 | 45 | /** |
46 | 46 | * @since 1.0 |
47 | 47 | * |
48 | - * @param srting $string |
|
48 | + * @param string $string |
|
49 | 49 | * @param integer $condition |
50 | 50 | * @param boolean $asDisjunctiveCondition |
51 | 51 | */ |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * @since 2.1 |
85 | 85 | * |
86 | - * @return integer |
|
86 | + * @return double |
|
87 | 87 | */ |
88 | 88 | public function getSum() { |
89 | 89 | return $this->round( array_sum( $this->container ) ); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | /** |
93 | 93 | * @since 2.1 |
94 | 94 | * |
95 | - * @return integer |
|
95 | + * @return double |
|
96 | 96 | */ |
97 | 97 | public function getMean() { |
98 | 98 | return $this->round( $this->getSum() / count( $this->container ) ); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * @since 2.1 |
122 | 122 | * |
123 | - * @return integer |
|
123 | + * @return double |
|
124 | 124 | */ |
125 | 125 | public function getStandardDeviation() { |
126 | 126 | return $this->round( (float)sqrt( $this->getVariance() ) ); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @param integer $basis |
133 | 133 | * |
134 | - * @return integer |
|
134 | + * @return double |
|
135 | 135 | */ |
136 | 136 | public function getStandardScoreBy( $basis = 0 ) { |
137 | 137 | return $this->round( ( $basis - $this->getMean() ) / $this->getStandardDeviation() ); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * |
143 | 143 | * @param integer $basis |
144 | 144 | * |
145 | - * @return integer |
|
145 | + * @return double |
|
146 | 146 | */ |
147 | 147 | public function getNormalizedValueBy( $basis = 1 ) { |
148 | 148 | return $this->round( $this->getMean() / $basis ); |