@@ -80,7 +80,7 @@ |
||
| 80 | 80 | /** |
| 81 | 81 | * Constructs label markers. |
| 82 | 82 | * |
| 83 | - * @return array Array of label markers. |
|
| 83 | + * @return string Array of label markers. |
|
| 84 | 84 | */ |
| 85 | 85 | protected function getLabelMarkers() |
| 86 | 86 | { |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | $markers = $this->getLabelMarkers(); |
| 65 | 65 | |
| 66 | 66 | if ($this->parentPlugin->typoScriptConfiguration->getSearchSpellcheckingSearchUsingSpellCheckerSuggestion()) { |
| 67 | - $suggestionResults = $this->getSuggestionResults(); |
|
| 67 | + $suggestionResults = $this->getSuggestionResults(); |
|
| 68 | 68 | $markers['suggestion_results'] = $suggestionResults; |
| 69 | 69 | $markers['has_suggestion_results'] = trim($suggestionResults) !== ''; |
| 70 | 70 | } |
@@ -26,17 +26,11 @@ |
||
| 26 | 26 | |
| 27 | 27 | use ApacheSolrForTypo3\Solr\CommandResolver; |
| 28 | 28 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSet; |
| 29 | -use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSetService; |
|
| 30 | 29 | use ApacheSolrForTypo3\Solr\Domain\Search\SearchRequest; |
| 31 | 30 | use ApacheSolrForTypo3\Solr\Plugin\CommandPluginBase; |
| 32 | -use ApacheSolrForTypo3\Solr\Plugin\PluginAware; |
|
| 33 | 31 | use ApacheSolrForTypo3\Solr\Plugin\PluginCommand; |
| 34 | -use ApacheSolrForTypo3\Solr\Query; |
|
| 35 | -use ApacheSolrForTypo3\Solr\Response\Processor\ResponseProcessor; |
|
| 36 | -use ApacheSolrForTypo3\Solr\Search\QueryAware; |
|
| 37 | 32 | use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
| 38 | 33 | use ApacheSolrForTypo3\Solr\Template; |
| 39 | -use ApacheSolrForTypo3\Solr\Util; |
|
| 40 | 34 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 41 | 35 | |
| 42 | 36 | /** |
@@ -941,7 +941,7 @@ |
||
| 941 | 941 | /** |
| 942 | 942 | * Sets the fields to return by a query. |
| 943 | 943 | * |
| 944 | - * @param array|string $fieldList an array or comma-separated list of field names |
|
| 944 | + * @param string $fieldList an array or comma-separated list of field names |
|
| 945 | 945 | * @throws \UnexpectedValueException on parameters other than comma-separated lists and arrays |
| 946 | 946 | */ |
| 947 | 947 | public function setFieldList($fieldList = array('*', 'score')) |
@@ -48,7 +48,6 @@ |
||
| 48 | 48 | * Parses the given date range from a GET parameter and returns a Solr |
| 49 | 49 | * date range filter. |
| 50 | 50 | * |
| 51 | - * @param string $rangeFilter The range filter query string from the query URL |
|
| 52 | 51 | * @param array $configuration Facet configuration |
| 53 | 52 | * @return string Lucene query language filter to be used for querying Solr |
| 54 | 53 | */ |
@@ -445,6 +445,9 @@ discard block |
||
| 445 | 445 | return $facetCounts; |
| 446 | 446 | } |
| 447 | 447 | |
| 448 | + /** |
|
| 449 | + * @param string $facetField |
|
| 450 | + */ |
|
| 448 | 451 | public function getFacetFieldOptions($facetField) |
| 449 | 452 | { |
| 450 | 453 | $facetOptions = null; |
@@ -457,6 +460,9 @@ discard block |
||
| 457 | 460 | return $facetOptions; |
| 458 | 461 | } |
| 459 | 462 | |
| 463 | + /** |
|
| 464 | + * @param string $facetField |
|
| 465 | + */ |
|
| 460 | 466 | public function getFacetQueryOptions($facetField) |
| 461 | 467 | { |
| 462 | 468 | $options = array(); |
@@ -479,6 +485,9 @@ discard block |
||
| 479 | 485 | return $options; |
| 480 | 486 | } |
| 481 | 487 | |
| 488 | + /** |
|
| 489 | + * @param string $rangeFacetField |
|
| 490 | + */ |
|
| 482 | 491 | public function getFacetRangeOptions($rangeFacetField) |
| 483 | 492 | { |
| 484 | 493 | return get_object_vars($this->getFacetCounts()->facet_ranges->$rangeFacetField); |
@@ -276,7 +276,7 @@ |
||
| 276 | 276 | * Generates a list of page IDs in this site. Attention, this includes |
| 277 | 277 | * all page types! Deleted pages are not included. |
| 278 | 278 | * |
| 279 | - * @param integer|string $rootPageId Page ID from where to start collection sub pages |
|
| 279 | + * @param integer $rootPageId Page ID from where to start collection sub pages |
|
| 280 | 280 | * @param integer $maxDepth Maximum depth to decend into the site tree |
| 281 | 281 | * @return array Array of pages (IDs) in this site |
| 282 | 282 | */ |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | /** |
| 135 | 135 | * Returns the current time in milliseconds. |
| 136 | 136 | * |
| 137 | - * @return integer |
|
| 137 | + * @return double |
|
| 138 | 138 | */ |
| 139 | 139 | protected function getMilliseconds() |
| 140 | 140 | { |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * |
| 181 | 181 | * Also does not report the time, see https://forge.typo3.org/issues/64551 |
| 182 | 182 | * |
| 183 | - * @param float|integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 183 | + * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 184 | 184 | * @return bool TRUE if Solr can be reached, FALSE if not |
| 185 | 185 | */ |
| 186 | 186 | public function ping($timeout = 2) |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | /** |
| 193 | 193 | * Call the /admin/ping servlet, can be used to get the runtime of a ping request. |
| 194 | 194 | * |
| 195 | - * @param float|integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 196 | - * @return int runtime in milliseconds |
|
| 195 | + * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 196 | + * @return double runtime in milliseconds |
|
| 197 | 197 | * @throws \ApacheSolrForTypo3\Solr\PingFailedException |
| 198 | 198 | */ |
| 199 | 199 | public function getPingRoundTripRuntime($timeout = 2) |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | * a complete and well formed "delete" xml document |
| 588 | 588 | * |
| 589 | 589 | * @param string $rawPost Expected to be utf-8 encoded xml document |
| 590 | - * @param float|integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 590 | + * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 591 | 591 | * @return \Apache_Solr_Response |
| 592 | 592 | */ |
| 593 | 593 | public function delete($rawPost, $timeout = 3600) |
@@ -684,7 +684,7 @@ discard block |
||
| 684 | 684 | /** |
| 685 | 685 | * Add list of synonyms for base word to managed synonyms map |
| 686 | 686 | * |
| 687 | - * @param $baseWord |
|
| 687 | + * @param string $baseWord |
|
| 688 | 688 | * @param array $synonyms |
| 689 | 689 | * |
| 690 | 690 | * @return \Apache_Solr_Response |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | /** |
| 706 | 706 | * Remove a synonym from the synonyms map |
| 707 | 707 | * |
| 708 | - * @param $baseWord |
|
| 708 | + * @param string $baseWord |
|
| 709 | 709 | * @return \Apache_Solr_Response |
| 710 | 710 | * @throws \Apache_Solr_InvalidArgumentException |
| 711 | 711 | */ |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | /** |
| 722 | 722 | * Central method for making a HTTP DELETE operation against the Solr server |
| 723 | 723 | * |
| 724 | - * @param $url |
|
| 724 | + * @param string $url |
|
| 725 | 725 | * @param bool|float $timeout Read timeout in seconds |
| 726 | 726 | * @return \Apache_Solr_Response |
| 727 | 727 | */ |
@@ -544,7 +544,7 @@ |
||
| 544 | 544 | |
| 545 | 545 | $solrconfigXml = simplexml_load_file($solrconfigXmlUrl); |
| 546 | 546 | if ($solrconfigXml === false) { |
| 547 | - throw new \InvalidArgumentException('No valid xml response from schema file: '.$solrconfigXmlUrl); |
|
| 547 | + throw new \InvalidArgumentException('No valid xml response from schema file: ' . $solrconfigXmlUrl); |
|
| 548 | 548 | } |
| 549 | 549 | $this->solrconfigName = (string)$solrconfigXml->attributes()->name; |
| 550 | 550 | } |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | * Write a value to the first and second level cache. |
| 114 | 114 | * |
| 115 | 115 | * @param string $cacheId |
| 116 | - * @param mixed $value |
|
| 116 | + * @param string $value |
|
| 117 | 117 | */ |
| 118 | 118 | public function set($cacheId, $value) |
| 119 | 119 | { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | * path that is used in in the current context. |
| 59 | 59 | * |
| 60 | 60 | * @param array $configurationArray |
| 61 | - * @param null $contextPageId |
|
| 61 | + * @param integer $contextPageId |
|
| 62 | 62 | * @param int $contextLanguageId |
| 63 | 63 | * @param string $contextTypoScriptPath |
| 64 | 64 | * @return TypoScriptConfiguration |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if (! is_array($configurationArray)) { |
|
| 74 | + if (!is_array($configurationArray)) { |
|
| 75 | 75 | $configurationArray = array(); |
| 76 | 76 | } |
| 77 | 77 | |