@@ -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 | } |
@@ -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 |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | * |
545 | 545 | * @param string $configurationName |
546 | 546 | * @param string $defaultIfEmpty |
547 | - * @return mixed |
|
547 | + * @return string |
|
548 | 548 | */ |
549 | 549 | public function getIndexQueueInitializerClassByConfigurationName($configurationName, $defaultIfEmpty = 'ApacheSolrForTypo3\\Solr\\IndexQueue\\Initializer\\Record') |
550 | 550 | { |
@@ -1237,7 +1237,7 @@ discard block |
||
1237 | 1237 | * plugin.tx_solr.search.query.allowEmptyQuery |
1238 | 1238 | * |
1239 | 1239 | * @param string $defaultIfEmpty |
1240 | - * @return string |
|
1240 | + * @return boolean |
|
1241 | 1241 | */ |
1242 | 1242 | public function getSearchQueryAllowEmptyQuery($defaultIfEmpty = '') |
1243 | 1243 | { |
@@ -1299,7 +1299,7 @@ discard block |
||
1299 | 1299 | * |
1300 | 1300 | * plugin.tx_solr.search.query.returnFields |
1301 | 1301 | * |
1302 | - * @param array $defaultIfEmpty |
|
1302 | + * @param string[] $defaultIfEmpty |
|
1303 | 1303 | * @return array |
1304 | 1304 | */ |
1305 | 1305 | public function getSearchQueryReturnFieldsAsArray($defaultIfEmpty = array()) |
@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use ApacheSolrForTypo3\Solr\System\Util\ArrayAccessor; |
6 | 6 | use InvalidArgumentException; |
7 | -use TYPO3\CMS\Core\SingletonInterface; |
|
8 | 7 | use TYPO3\CMS\Core\Utility\ArrayUtility; |
9 | 8 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
10 | -use TYPO3\CMS\Fluid\Exception; |
|
11 | 9 | |
12 | 10 | /** |
13 | 11 | * TypoScript configuration object, used to read all TypoScript configuration. |
@@ -767,7 +767,6 @@ discard block |
||
767 | 767 | * Returns if a log message should be written when a page was indexed. |
768 | 768 | * |
769 | 769 | * plugin.tx_solr.logging.indexing.pageIndexed |
770 | - |
|
771 | 770 | * @param bool $defaultIfEmpty |
772 | 771 | * @return bool |
773 | 772 | */ |
@@ -781,7 +780,6 @@ discard block |
||
781 | 780 | * Returns if a log message should be written when the TYPO3 search markers are missing in the page. |
782 | 781 | * |
783 | 782 | * plugin.tx_solr.logging.indexing.missingTypo3SearchMarkers |
784 | - |
|
785 | 783 | * @param bool $defaultIfEmpty |
786 | 784 | * @return bool |
787 | 785 | */ |
@@ -809,7 +807,6 @@ discard block |
||
809 | 807 | * Indicates if the debug mode is enabled or not. |
810 | 808 | * |
811 | 809 | * plugin.tx_solr.enableDebugMode |
812 | - |
|
813 | 810 | * @param bool $defaultIfEmpty |
814 | 811 | * @return bool |
815 | 812 | */ |
@@ -255,8 +255,8 @@ discard block |
||
255 | 255 | */ |
256 | 256 | public function getCssFileByFileKey($fileKey, $defaultIfEmpty = '') |
257 | 257 | { |
258 | - $cssFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.cssFiles.' . $fileKey, $defaultIfEmpty); |
|
259 | - return (string) $cssFileName; |
|
258 | + $cssFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.cssFiles.' . $fileKey, $defaultIfEmpty); |
|
259 | + return (string)$cssFileName; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | /** |
@@ -565,8 +565,8 @@ discard block |
||
565 | 565 | */ |
566 | 566 | public function getJavaScriptFileByFileKey($fileKey, $defaultIfEmpty = '') |
567 | 567 | { |
568 | - $javaScriptFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.javascriptFiles.' . $fileKey, $defaultIfEmpty); |
|
569 | - return (string) $javaScriptFileName; |
|
568 | + $javaScriptFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.javascriptFiles.' . $fileKey, $defaultIfEmpty); |
|
569 | + return (string)$javaScriptFileName; |
|
570 | 570 | } |
571 | 571 | |
572 | 572 | /** |
@@ -579,8 +579,8 @@ discard block |
||
579 | 579 | */ |
580 | 580 | public function getJavaScriptLoadIn($defaultIfEmpty = 'footer') |
581 | 581 | { |
582 | - $loadIn = $this->getValueByPathOrDefaultValue('plugin.tx_solr.javascriptFiles.loadIn', $defaultIfEmpty); |
|
583 | - return (string) $loadIn; |
|
582 | + $loadIn = $this->getValueByPathOrDefaultValue('plugin.tx_solr.javascriptFiles.loadIn', $defaultIfEmpty); |
|
583 | + return (string)$loadIn; |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | /** |
@@ -927,7 +927,7 @@ discard block |
||
927 | 927 | public function getSearchVariantsLimit($defaultIfEmpty = 10) |
928 | 928 | { |
929 | 929 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.variants.limit', $defaultIfEmpty); |
930 | - return (int) $result; |
|
930 | + return (int)$result; |
|
931 | 931 | } |
932 | 932 | |
933 | 933 | /** |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | public function getSearchFrequentSearchesMinSize($defaultIfEmpty = 14) |
970 | 970 | { |
971 | 971 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.frequentSearches.minSize', $defaultIfEmpty); |
972 | - return (int) $result; |
|
972 | + return (int)$result; |
|
973 | 973 | } |
974 | 974 | |
975 | 975 | /** |
@@ -983,7 +983,7 @@ discard block |
||
983 | 983 | public function getSearchFrequentSearchesMaxSize($defaultIfEmpty = 32) |
984 | 984 | { |
985 | 985 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.frequentSearches.maxSize', $defaultIfEmpty); |
986 | - return (int) $result; |
|
986 | + return (int)$result; |
|
987 | 987 | } |
988 | 988 | |
989 | 989 | /** |
@@ -1025,7 +1025,7 @@ discard block |
||
1025 | 1025 | public function getSearchInitializeWithQuery($defaultIfEmpty = '') |
1026 | 1026 | { |
1027 | 1027 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.initializeWithQuery', $defaultIfEmpty); |
1028 | - return (string) $result; |
|
1028 | + return (string)$result; |
|
1029 | 1029 | } |
1030 | 1030 | |
1031 | 1031 | /** |
@@ -1053,7 +1053,7 @@ discard block |
||
1053 | 1053 | public function getSearchLastSearchesMode($defaultIfEmpty = 'user') |
1054 | 1054 | { |
1055 | 1055 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.lastSearches.mode', $defaultIfEmpty); |
1056 | - return (string) $result; |
|
1056 | + return (string)$result; |
|
1057 | 1057 | } |
1058 | 1058 | |
1059 | 1059 | /** |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | public function getSearchLastSearchesLimit($defaultIfEmpty = 10) |
1068 | 1068 | { |
1069 | 1069 | $result = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.lastSearches.limit', $defaultIfEmpty); |
1070 | - return (int) $result; |
|
1070 | + return (int)$result; |
|
1071 | 1071 | } |
1072 | 1072 | |
1073 | 1073 | /** |
@@ -1321,7 +1321,7 @@ discard block |
||
1321 | 1321 | */ |
1322 | 1322 | public function getSearchTargetPage() |
1323 | 1323 | { |
1324 | - $targetPage = (int) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.targetPage', 0); |
|
1324 | + $targetPage = (int)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.targetPage', 0); |
|
1325 | 1325 | if ($targetPage === 0) { |
1326 | 1326 | // when no specific page was configured we use the contextPageId (which is usual $GLOBALS['TSFE']->id) |
1327 | 1327 | $targetPage = $this->contextPageId; |
@@ -1414,7 +1414,7 @@ discard block |
||
1414 | 1414 | */ |
1415 | 1415 | public function getSearchResultsPerPage($defaultIfEmpty = 10) |
1416 | 1416 | { |
1417 | - return (int) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.results.resultsPerPage', $defaultIfEmpty); |
|
1417 | + return (int)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.results.resultsPerPage', $defaultIfEmpty); |
|
1418 | 1418 | } |
1419 | 1419 | |
1420 | 1420 | /** |
@@ -1459,7 +1459,7 @@ discard block |
||
1459 | 1459 | */ |
1460 | 1460 | public function getSearchSpellchecking($defaultIfEmpty = false) |
1461 | 1461 | { |
1462 | - $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking', $defaultIfEmpty); |
|
1462 | + $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking', $defaultIfEmpty); |
|
1463 | 1463 | return $this->getBool($isFacetingEnabled); |
1464 | 1464 | } |
1465 | 1465 | |
@@ -1473,7 +1473,7 @@ discard block |
||
1473 | 1473 | */ |
1474 | 1474 | public function getSearchSpellcheckingWrap($defaultIfEmpty = '') |
1475 | 1475 | { |
1476 | - return (string) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking.wrap', $defaultIfEmpty); |
|
1476 | + return (string)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking.wrap', $defaultIfEmpty); |
|
1477 | 1477 | } |
1478 | 1478 | |
1479 | 1479 | /** |
@@ -1486,7 +1486,7 @@ discard block |
||
1486 | 1486 | */ |
1487 | 1487 | public function getSearchSpellcheckingNumberOfSuggestionsToTry($defaultIfEmpty = 0) |
1488 | 1488 | { |
1489 | - return (int) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking.numberOfSuggestionsToTry', $defaultIfEmpty); |
|
1489 | + return (int)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.spellchecking.numberOfSuggestionsToTry', $defaultIfEmpty); |
|
1490 | 1490 | } |
1491 | 1491 | |
1492 | 1492 | /** |
@@ -1513,7 +1513,7 @@ discard block |
||
1513 | 1513 | */ |
1514 | 1514 | public function getSearchFaceting($defaultIfEmpty = false) |
1515 | 1515 | { |
1516 | - $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting', $defaultIfEmpty); |
|
1516 | + $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting', $defaultIfEmpty); |
|
1517 | 1517 | return $this->getBool($isFacetingEnabled); |
1518 | 1518 | } |
1519 | 1519 | |
@@ -1559,7 +1559,7 @@ discard block |
||
1559 | 1559 | */ |
1560 | 1560 | public function getSearchFacetingRemoveFacetLinkText($defaultIfEmpty = '@facetLabel: @facetText') |
1561 | 1561 | { |
1562 | - return (string) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.removeFacetLinkText', $defaultIfEmpty); |
|
1562 | + return (string)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.removeFacetLinkText', $defaultIfEmpty); |
|
1563 | 1563 | } |
1564 | 1564 | |
1565 | 1565 | /** |
@@ -1603,7 +1603,7 @@ discard block |
||
1603 | 1603 | */ |
1604 | 1604 | public function getSearchFacetingShowAllLinkWrap($defaultIfEmpty = '') |
1605 | 1605 | { |
1606 | - return (string) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.showAllLink.wrap', $defaultIfEmpty); |
|
1606 | + return (string)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.showAllLink.wrap', $defaultIfEmpty); |
|
1607 | 1607 | } |
1608 | 1608 | |
1609 | 1609 | /** |
@@ -1631,7 +1631,7 @@ discard block |
||
1631 | 1631 | */ |
1632 | 1632 | public function getSearchFacetingFacetLinkUrlParametersUseForFacetResetLinkUrl($defaultIfEmpty = true) |
1633 | 1633 | { |
1634 | - $useForFacetResetLinkUrl = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.facetLinkUrlParameters.useForFacetResetLinkUrl', $defaultIfEmpty); |
|
1634 | + $useForFacetResetLinkUrl = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.facetLinkUrlParameters.useForFacetResetLinkUrl', $defaultIfEmpty); |
|
1635 | 1635 | return $this->getBool($useForFacetResetLinkUrl); |
1636 | 1636 | } |
1637 | 1637 | |
@@ -1663,7 +1663,7 @@ discard block |
||
1663 | 1663 | */ |
1664 | 1664 | public function getSearchFacetingMinimumCount($defaultIfEmpty = 1) |
1665 | 1665 | { |
1666 | - return (int) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.minimumCount', $defaultIfEmpty); |
|
1666 | + return (int)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.minimumCount', $defaultIfEmpty); |
|
1667 | 1667 | } |
1668 | 1668 | |
1669 | 1669 | /** |
@@ -1676,7 +1676,7 @@ discard block |
||
1676 | 1676 | */ |
1677 | 1677 | public function getSearchFacetingLimit($defaultIfEmpty = 10) |
1678 | 1678 | { |
1679 | - return (int) $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.limit', $defaultIfEmpty); |
|
1679 | + return (int)$this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.limit', $defaultIfEmpty); |
|
1680 | 1680 | } |
1681 | 1681 | |
1682 | 1682 | /** |
@@ -1689,7 +1689,7 @@ discard block |
||
1689 | 1689 | */ |
1690 | 1690 | public function getSearchFacetingSingleFacetMode($defaultIfEmpty = false) |
1691 | 1691 | { |
1692 | - $singleFacetMode = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.singleFacetMode', $defaultIfEmpty); |
|
1692 | + $singleFacetMode = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.singleFacetMode', $defaultIfEmpty); |
|
1693 | 1693 | return $this->getBool($singleFacetMode); |
1694 | 1694 | } |
1695 | 1695 | |
@@ -1719,7 +1719,7 @@ discard block |
||
1719 | 1719 | */ |
1720 | 1720 | public function getSearchFacetingKeepAllFacetsOnSelection($defaultIfEmpty = false) |
1721 | 1721 | { |
1722 | - $keepAllOptionsOnSelection = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.keepAllFacetsOnSelection', $defaultIfEmpty); |
|
1722 | + $keepAllOptionsOnSelection = $this->getValueByPathOrDefaultValue('plugin.tx_solr.search.faceting.keepAllFacetsOnSelection', $defaultIfEmpty); |
|
1723 | 1723 | return $this->getBool($keepAllOptionsOnSelection); |
1724 | 1724 | } |
1725 | 1725 | |
@@ -1761,7 +1761,7 @@ discard block |
||
1761 | 1761 | */ |
1762 | 1762 | public function getStatistics($defaultIfEmpty = false) |
1763 | 1763 | { |
1764 | - $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.statistics', $defaultIfEmpty); |
|
1764 | + $isFacetingEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.statistics', $defaultIfEmpty); |
|
1765 | 1765 | return $this->getBool($isFacetingEnabled); |
1766 | 1766 | } |
1767 | 1767 | |
@@ -1777,8 +1777,8 @@ discard block |
||
1777 | 1777 | */ |
1778 | 1778 | public function getStatisticsAnonymizeIP($defaultIfEmpty = 0) |
1779 | 1779 | { |
1780 | - $anomizeToLength = $this->getValueByPathOrDefaultValue('plugin.tx_solr.statistics.anonymizeIP', $defaultIfEmpty); |
|
1781 | - return (int) $anomizeToLength; |
|
1780 | + $anomizeToLength = $this->getValueByPathOrDefaultValue('plugin.tx_solr.statistics.anonymizeIP', $defaultIfEmpty); |
|
1781 | + return (int)$anomizeToLength; |
|
1782 | 1782 | } |
1783 | 1783 | |
1784 | 1784 | /** |
@@ -1791,7 +1791,7 @@ discard block |
||
1791 | 1791 | */ |
1792 | 1792 | public function getSuggest($defaultIfEmpty = false) |
1793 | 1793 | { |
1794 | - $isSuggestionEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.suggest', $defaultIfEmpty); |
|
1794 | + $isSuggestionEnabled = $this->getValueByPathOrDefaultValue('plugin.tx_solr.suggest', $defaultIfEmpty); |
|
1795 | 1795 | return $this->getBool($isSuggestionEnabled); |
1796 | 1796 | } |
1797 | 1797 | |
@@ -1805,7 +1805,7 @@ discard block |
||
1805 | 1805 | */ |
1806 | 1806 | public function getSuggestForceHttps($defaultIfEmpty = false) |
1807 | 1807 | { |
1808 | - $isHttpsForced = $this->getValueByPathOrDefaultValue('plugin.tx_solr.suggest.forceHttps', $defaultIfEmpty); |
|
1808 | + $isHttpsForced = $this->getValueByPathOrDefaultValue('plugin.tx_solr.suggest.forceHttps', $defaultIfEmpty); |
|
1809 | 1809 | return $this->getBool($isHttpsForced); |
1810 | 1810 | } |
1811 | 1811 | |
@@ -1821,8 +1821,8 @@ discard block |
||
1821 | 1821 | */ |
1822 | 1822 | public function getTemplateByFileKey($fileKey, $defaultIfEmpty = '') |
1823 | 1823 | { |
1824 | - $templateFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.templateFiles.' . $fileKey, $defaultIfEmpty); |
|
1825 | - return (string) $templateFileName; |
|
1824 | + $templateFileName = $this->getValueByPathOrDefaultValue('plugin.tx_solr.templateFiles.' . $fileKey, $defaultIfEmpty); |
|
1825 | + return (string)$templateFileName; |
|
1826 | 1826 | } |
1827 | 1827 | |
1828 | 1828 | /** |
@@ -1835,7 +1835,7 @@ discard block |
||
1835 | 1835 | */ |
1836 | 1836 | public function getViewHelpersCropConfiguration(array $defaultIfEmpty = array()) |
1837 | 1837 | { |
1838 | - $cropViewHelperConfiguration = $this->getObjectByPathOrDefault('plugin.tx_solr.viewHelpers.crop.', $defaultIfEmpty); |
|
1838 | + $cropViewHelperConfiguration = $this->getObjectByPathOrDefault('plugin.tx_solr.viewHelpers.crop.', $defaultIfEmpty); |
|
1839 | 1839 | return $cropViewHelperConfiguration; |
1840 | 1840 | } |
1841 | 1841 | |
@@ -1849,7 +1849,7 @@ discard block |
||
1849 | 1849 | */ |
1850 | 1850 | public function getViewHelpersSortIndicatorConfiguration(array $defaultIfEmpty = array()) |
1851 | 1851 | { |
1852 | - $sortingViewHelperConfiguration = $this->getObjectByPathOrDefault('plugin.tx_solr.viewHelpers.sortIndicator.', $defaultIfEmpty); |
|
1852 | + $sortingViewHelperConfiguration = $this->getObjectByPathOrDefault('plugin.tx_solr.viewHelpers.sortIndicator.', $defaultIfEmpty); |
|
1853 | 1853 | return $sortingViewHelperConfiguration; |
1854 | 1854 | } |
1855 | 1855 | } |
@@ -186,7 +186,7 @@ |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
189 | - * @return mixed |
|
189 | + * @return integer |
|
190 | 190 | */ |
191 | 191 | public function getDocumentsToIndexLimit() |
192 | 192 | { |
@@ -25,13 +25,8 @@ |
||
25 | 25 | ***************************************************************/ |
26 | 26 | |
27 | 27 | use ApacheSolrForTypo3\Solr\Domain\Index\IndexService; |
28 | -use ApacheSolrForTypo3\Solr\IndexQueue\Indexer; |
|
29 | -use ApacheSolrForTypo3\Solr\IndexQueue\Item; |
|
30 | 28 | use ApacheSolrForTypo3\Solr\Site; |
31 | 29 | use ApacheSolrForTypo3\Solr\System\Environment\CliEnvironment; |
32 | -use ApacheSolrForTypo3\Solr\Util; |
|
33 | -use TYPO3\CMS\Backend\Utility\BackendUtility; |
|
34 | -use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; |
|
35 | 30 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
36 | 31 | use TYPO3\CMS\Scheduler\ProgressProviderInterface; |
37 | 32 | use TYPO3\CMS\Scheduler\Task\AbstractTask; |
@@ -145,7 +145,7 @@ |
||
145 | 145 | $message .= ' Failures: ' . $failedItemsCount; |
146 | 146 | } |
147 | 147 | |
148 | - $message .= ' / Using webroot: ' . htmlspecialchars($this->getWebRoot()); |
|
148 | + $message .= ' / Using webroot: ' . htmlspecialchars($this->getWebRoot()); |
|
149 | 149 | |
150 | 150 | return $message; |
151 | 151 | } |
@@ -130,6 +130,7 @@ discard block |
||
130 | 130 | /** |
131 | 131 | * Finds the view helpers in the template and loads them. |
132 | 132 | * |
133 | + * @param string $content |
|
133 | 134 | * @return void |
134 | 135 | */ |
135 | 136 | protected function initializeViewHelpers($content) |
@@ -1158,7 +1159,7 @@ discard block |
||
1158 | 1159 | } |
1159 | 1160 | |
1160 | 1161 | /** |
1161 | - * @param $templateContent |
|
1162 | + * @param string $templateContent |
|
1162 | 1163 | * @return mixed |
1163 | 1164 | */ |
1164 | 1165 | public function setTemplateContent($templateContent) |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use ApacheSolrForTypo3\Solr\ViewHelper\SubpartViewHelper; |
28 | 28 | use ApacheSolrForTypo3\Solr\ViewHelper\ViewHelper; |
29 | -use TYPO3\CMS\Core\Html\HtmlParser; |
|
30 | 29 | use TYPO3\CMS\Core\Service\MarkerBasedTemplateService; |
31 | 30 | use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; |
32 | 31 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
@@ -218,7 +218,7 @@ |
||
218 | 218 | $ucHelperKey = Util::underscoredToUpperCamelCase($helperKey); |
219 | 219 | $vendorNameSpace = 'ApacheSolrForTypo3\\Solr\\'; |
220 | 220 | $possibleFilename = $ucHelperKey . '.php'; |
221 | - $possibleClassName = $vendorNameSpace . str_replace('/', '\\', |
|
221 | + $possibleClassName = $vendorNameSpace . str_replace('/', '\\', |
|
222 | 222 | $viewHelperRealPath) . '\\' . $ucHelperKey; |
223 | 223 | |
224 | 224 | $viewHelperIncludePath = ExtensionManagementUtility::extPath($extensionKey) |
@@ -24,7 +24,6 @@ |
||
24 | 24 | * This copyright notice MUST APPEAR in all copies of the script! |
25 | 25 | ***************************************************************/ |
26 | 26 | |
27 | -use TYPO3\CMS\Core\Utility\ArrayUtility; |
|
28 | 27 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
29 | 28 | |
30 | 29 | /** |
@@ -96,7 +96,7 @@ |
||
96 | 96 | $doc->loadHTML('<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL . $indexableContent); |
97 | 97 | $xpath = new \DOMXPath($doc); |
98 | 98 | foreach ($excludeClasses as $excludePart) { |
99 | - $elements = $xpath->query("//*[contains(@class,'".$excludePart."')]"); |
|
99 | + $elements = $xpath->query("//*[contains(@class,'" . $excludePart . "')]"); |
|
100 | 100 | if (count($elements) == 0) { |
101 | 101 | continue; |
102 | 102 | } |
@@ -441,7 +441,7 @@ |
||
441 | 441 | * should be indexed for the current page. |
442 | 442 | * |
443 | 443 | * @param \Apache_Solr_Document $pageDocument The main document representing this page. |
444 | - * @param array $existingDocuments An array of documents already created for this page. |
|
444 | + * @param \Apache_Solr_Document[] $existingDocuments An array of documents already created for this page. |
|
445 | 445 | * @return array An array of additional \Apache_Solr_Document objects to index |
446 | 446 | */ |
447 | 447 | protected function getAdditionalDocuments( |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | * @param integer $pageId Id of the (root) page to get the Solr configuration from. |
240 | 240 | * @param string $path The TypoScript configuration path to retrieve. |
241 | 241 | * @param boolean $initializeTsfe Optionally initializes a full TSFE to get the configuration, defaults to FALSE |
242 | - * @param integer|boolean $language System language uid or FALSE to disable language usage, optional, defaults to 0 |
|
242 | + * @param integer $language System language uid or FALSE to disable language usage, optional, defaults to 0 |
|
243 | 243 | * @return TypoScriptConfiguration The Solr configuration for the requested tree. |
244 | 244 | */ |
245 | 245 | public static function getConfigurationFromPageId( |
@@ -314,9 +314,9 @@ discard block |
||
314 | 314 | |
315 | 315 | /** |
316 | 316 | * This function is used to retrieve the configuration from an existing TSFE instance |
317 | - * @param $pageId |
|
318 | - * @param $path |
|
319 | - * @param $language |
|
317 | + * @param integer $pageId |
|
318 | + * @param string $path |
|
319 | + * @param integer $language |
|
320 | 320 | * @return mixed |
321 | 321 | */ |
322 | 322 | private static function getConfigurationFromExistingTSFE($pageId, $path, $language) |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use ApacheSolrForTypo3\Solr\System\Configuration\ConfigurationManager; |
28 | 28 | use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
29 | -use InvalidArgumentException; |
|
30 | 29 | use TYPO3\CMS\Backend\Utility\BackendUtility; |
31 | 30 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
32 | 31 | use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController; |