Completed
Pull Request — master (#744)
by Georg
28:12 queued 04:03
created
Classes/SolrService.php 1 patch
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
     /**
129 129
      * Returns the current time in milliseconds.
130 130
      *
131
-     * @return int
131
+     * @return double
132 132
      */
133 133
     protected function getMilliseconds()
134 134
     {
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
      *
175 175
      * Also does not report the time, see https://forge.typo3.org/issues/64551
176 176
      *
177
-     * @param float|int $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
177
+     * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
178 178
      * @return bool TRUE if Solr can be reached, FALSE if not
179 179
      */
180 180
     public function ping($timeout = 2)
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
     /**
187 187
      * Call the /admin/ping servlet, can be used to get the runtime of a ping request.
188 188
      *
189
-     * @param float|int $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
190
-     * @return int runtime in milliseconds
189
+     * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
190
+     * @return double runtime in milliseconds
191 191
      * @throws \ApacheSolrForTypo3\Solr\PingFailedException
192 192
      */
193 193
     public function getPingRoundTripRuntime($timeout = 2)
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
      * a complete and well formed "delete" xml document
582 582
      *
583 583
      * @param string $rawPost Expected to be utf-8 encoded xml document
584
-     * @param float|int $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
584
+     * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
585 585
      * @return \Apache_Solr_Response
586 586
      */
587 587
     public function delete($rawPost, $timeout = 3600)
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
     /**
679 679
      * Add list of synonyms for base word to managed synonyms map
680 680
      *
681
-     * @param $baseWord
681
+     * @param string $baseWord
682 682
      * @param array $synonyms
683 683
      *
684 684
      * @return \Apache_Solr_Response
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
     /**
700 700
      * Remove a synonym from the synonyms map
701 701
      *
702
-     * @param $baseWord
702
+     * @param string $baseWord
703 703
      * @return \Apache_Solr_Response
704 704
      * @throws \Apache_Solr_InvalidArgumentException
705 705
      */
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
     /**
716 716
      * Central method for making a HTTP DELETE operation against the Solr server
717 717
      *
718
-     * @param $url
718
+     * @param string $url
719 719
      * @param bool|float $timeout Read timeout in seconds
720 720
      * @return \Apache_Solr_Response
721 721
      */
Please login to merge, or discard this patch.
Classes/Util.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
      * @param int $pageId Id of the (root) page to get the Solr configuration from.
237 237
      * @param string $path The TypoScript configuration path to retrieve.
238 238
      * @param bool $initializeTsfe Optionally initializes a full TSFE to get the configuration, defaults to FALSE
239
-     * @param int|bool $language System language uid or FALSE to disable language usage, optional, defaults to 0
239
+     * @param integer $language System language uid or FALSE to disable language usage, optional, defaults to 0
240 240
      * @return TypoScriptConfiguration The Solr configuration for the requested tree.
241 241
      */
242 242
     public static function getConfigurationFromPageId(
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
 
312 312
     /**
313 313
      * This function is used to retrieve the configuration from an existing TSFE instance
314
-     * @param $pageId
315
-     * @param $path
316
-     * @param $language
314
+     * @param integer $pageId
315
+     * @param string $path
316
+     * @param integer $language
317 317
      * @return mixed
318 318
      */
319 319
     private static function getConfigurationFromExistingTSFE($pageId, $path, $language)
Please login to merge, or discard this patch.
Classes/Search.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -526,7 +526,7 @@
 block discarded – undo
526 526
             $spellcheckingSuggestions = $suggestions;
527 527
 
528 528
             if (isset($this->response->spellcheck->collations)) {
529
-                $collections = (array) $this->response->spellcheck->collations;
529
+                $collections = (array)$this->response->spellcheck->collations;
530 530
                 $spellcheckingSuggestions['collation'] = $collections['collation'];
531 531
             }
532 532
         }
Please login to merge, or discard this patch.
Classes/Domain/Search/ResultSet/SearchResultSetService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
      * @param Query $query The query that has been searched for.
287 287
      * @param \Apache_Solr_Response $response The search's response.
288 288
      */
289
-    protected function processResponse($rawQuery, Query $query, \Apache_Solr_Response &$response)
289
+    protected function processResponse($rawQuery, Query $query, \Apache_Solr_Response & $response)
290 290
     {
291 291
         if ($this->shouldHideResultsFromInitialSearch($rawQuery)) {
292 292
             // explicitly set number of results to 0 as we just wanted
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
      *
315 315
      * @param \Apache_Solr_Response $response
316 316
      */
317
-    protected function addExpandedDocumentsFromVariants(\Apache_Solr_Response &$response)
317
+    protected function addExpandedDocumentsFromVariants(\Apache_Solr_Response & $response)
318 318
     {
319 319
         if (!is_array($response->response->docs)) {
320 320
             return;
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
      * @param \Apache_Solr_Response $response
367 367
      * @throws \InvalidArgumentException
368 368
      */
369
-    protected function wrapResultDocumentInResultObject(\Apache_Solr_Response &$response)
369
+    protected function wrapResultDocumentInResultObject(\Apache_Solr_Response & $response)
370 370
     {
371 371
         if (!is_array($response->response->docs)) {
372 372
             return;
Please login to merge, or discard this patch.
Classes/Domain/Search/SearchRequest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         $activeFacets = $this->getActiveFacets();
155 155
         $facetNames = [];
156 156
 
157
-        array_map(function ($activeFacet) use (&$facetNames) {
157
+        array_map(function($activeFacet) use (&$facetNames) {
158 158
             $facetNames[] = substr($activeFacet, 0, strpos($activeFacet, ':'));
159 159
         }, $activeFacets);
160 160
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         $values = [];
172 172
         $activeFacets = $this->getActiveFacets();
173 173
 
174
-        array_map(function ($activeFacet) use (&$values, $facetName) {
174
+        array_map(function($activeFacet) use (&$values, $facetName) {
175 175
             $parts = explode(':', $activeFacet, 2);
176 176
             if ($parts[0] === $facetName) {
177 177
                 $values[] = $parts[1];
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
     public function removeAllFacetValuesByName($facetName)
274 274
     {
275 275
         $facetValues = $this->getActiveFacets();
276
-        $facetValues = array_filter($facetValues, function ($facetValue) use ($facetName) {
276
+        $facetValues = array_filter($facetValues, function($facetValue) use ($facetName) {
277 277
             $parts = explode(':', $facetValue, 2);
278 278
             return $parts[0] !== $facetName;
279 279
         });
Please login to merge, or discard this patch.
Classes/ContentObject/Relation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -370,7 +370,7 @@
 block discarded – undo
370 370
             ));
371 371
 
372 372
             // restore
373
-            $this->configuration= $backupConfiguration;
373
+            $this->configuration = $backupConfiguration;
374 374
             $parentContentObject->data = $backupRecord;
375 375
         }
376 376
 
Please login to merge, or discard this patch.
Classes/Query.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
      */
156 156
     public function __construct($keywords, $solrConfiguration = null)
157 157
     {
158
-        $keywords = (string) $keywords;
158
+        $keywords = (string)$keywords;
159 159
         if ($solrConfiguration == null) {
160 160
             $this->solrConfiguration = Util::getSolrConfiguration();
161 161
         } else {
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
      */
677 677
     public function getGroupFields()
678 678
     {
679
-        return (array) $this->getQueryParameter('group.field', []);
679
+        return (array)$this->getQueryParameter('group.field', []);
680 680
     }
681 681
 
682 682
     /**
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
      */
700 700
     public function getGroupSortings()
701 701
     {
702
-        return (array) $this->getQueryParameter('group.sort', []);
702
+        return (array)$this->getQueryParameter('group.sort', []);
703 703
     }
704 704
 
705 705
     // faceting
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
      */
726 726
     public function getGroupQueries()
727 727
     {
728
-        return (array) $this->getQueryParameter('group.query', []);
728
+        return (array)$this->getQueryParameter('group.query', []);
729 729
     }
730 730
 
731 731
     /**
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
      *
194 194
      * @param string $msg
195 195
      * @param int $severity
196
-     * @param mixed $dataVar
196
+     * @param string[] $dataVar
197 197
      */
198 198
     protected function writeDevLog($msg, $severity = 0, $dataVar = false)
199 199
     {
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
     /**
1004 1004
      * Sets the fields to return by a query.
1005 1005
      *
1006
-     * @param array|string $fieldList an array or comma-separated list of field names
1006
+     * @param string $fieldList an array or comma-separated list of field names
1007 1007
      * @throws \UnexpectedValueException on parameters other than comma-separated lists and arrays
1008 1008
      */
1009 1009
     public function setFieldList($fieldList = array('*', 'score'))
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
1079 1079
      *
1080 1080
      * This query supports the complete Lucene Query Language.
1081 1081
      *
1082
-     * @param mixed $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.
1082
+     * @param string $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.
1083 1083
      * @see http://wiki.apache.org/solr/DisMaxQParserPlugin#q.alt
1084 1084
      */
1085 1085
     public function setAlternativeQuery($alternativeQuery)
Please login to merge, or discard this patch.