@@ -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; |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * number counting from zero of the total number of results. |
| 63 | 63 | * |
| 64 | 64 | * @param array $arguments |
| 65 | - * @return string |
|
| 65 | + * @return integer |
|
| 66 | 66 | */ |
| 67 | 67 | public function execute(array $arguments = array()) |
| 68 | 68 | { |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | /** |
| 78 | 78 | * Returns an URL that switches sorting to the given sort option |
| 79 | 79 | * |
| 80 | - * @param array $arguments |
|
| 80 | + * @param string[] $arguments |
|
| 81 | 81 | * @return string |
| 82 | 82 | */ |
| 83 | 83 | public function execute(array $arguments = array()) |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | /** |
| 103 | 103 | * Get current document boost |
| 104 | 104 | * |
| 105 | - * @return mixed will be false for default, or else a float |
|
| 105 | + * @return double will be false for default, or else a float |
|
| 106 | 106 | */ |
| 107 | 107 | public function getBoost() |
| 108 | 108 | { |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * if not specified. |
| 188 | 188 | * |
| 189 | 189 | * @param string $host |
| 190 | - * @param string $port |
|
| 190 | + * @param integer $port |
|
| 191 | 191 | * @param string $path |
| 192 | 192 | * @param Apache_Solr_HttpTransport_Interface $httpTransport |
| 193 | 193 | */ |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | /** |
| 376 | 376 | * Get the set port |
| 377 | 377 | * |
| 378 | - * @return integer |
|
| 378 | + * @return string |
|
| 379 | 379 | */ |
| 380 | 380 | public function getPort() |
| 381 | 381 | { |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | * Call the /admin/ping servlet, can be used to quickly tell if a connection to the |
| 558 | 558 | * server is able to be made. |
| 559 | 559 | * |
| 560 | - * @param float $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 560 | + * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2) |
|
| 561 | 561 | * @return float Actual time taken to ping the server, FALSE if timeout or HTTP error status occurs |
| 562 | 562 | */ |
| 563 | 563 | public function ping($timeout = 2) |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | * @param boolean $expungeDeletes Defaults to false, merge segments with deletes away |
| 818 | 818 | * @param boolean $waitFlush Not used, will be removed with EXT:solr version 4.0 |
| 819 | 819 | * @param boolean $waitSearcher Defaults to true, block until a new searcher is opened and registered as the main query searcher, making the changes visible |
| 820 | - * @param float $timeout Maximum expected duration (in seconds) of the commit operation on the server (otherwise, will throw a communication exception). Defaults to 1 hour |
|
| 820 | + * @param integer $timeout Maximum expected duration (in seconds) of the commit operation on the server (otherwise, will throw a communication exception). Defaults to 1 hour |
|
| 821 | 821 | * @return Apache_Solr_Response |
| 822 | 822 | * |
| 823 | 823 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |
@@ -842,7 +842,7 @@ discard block |
||
| 842 | 842 | * @param string $id Expected to be utf-8 encoded |
| 843 | 843 | * @param boolean $fromPending |
| 844 | 844 | * @param boolean $fromCommitted |
| 845 | - * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 845 | + * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 846 | 846 | * @return Apache_Solr_Response |
| 847 | 847 | * |
| 848 | 848 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * a complete and well formed "delete" xml document |
| 870 | 870 | * |
| 871 | 871 | * @param string $rawPost Expected to be utf-8 encoded xml document |
| 872 | - * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 872 | + * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 873 | 873 | * @return Apache_Solr_Response |
| 874 | 874 | * |
| 875 | 875 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | * @param array $ids Expected to be utf-8 encoded strings |
| 886 | 886 | * @param boolean $fromPending |
| 887 | 887 | * @param boolean $fromCommitted |
| 888 | - * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 888 | + * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 889 | 889 | * @return Apache_Solr_Response |
| 890 | 890 | * |
| 891 | 891 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | * @param string $rawQuery Expected to be utf-8 encoded |
| 920 | 920 | * @param boolean $fromPending |
| 921 | 921 | * @param boolean $fromCommitted |
| 922 | - * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 922 | + * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception) |
|
| 923 | 923 | * @return Apache_Solr_Response |
| 924 | 924 | * |
| 925 | 925 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | * |
| 1146 | 1146 | * @param boolean $waitFlush Not used, will be removed with EXT:solr version 4.0 |
| 1147 | 1147 | * @param boolean $waitSearcher |
| 1148 | - * @param float $timeout Maximum expected duration of the commit operation on the server (otherwise, will throw a communication exception) |
|
| 1148 | + * @param integer $timeout Maximum expected duration of the commit operation on the server (otherwise, will throw a communication exception) |
|
| 1149 | 1149 | * @return Apache_Solr_Response |
| 1150 | 1150 | * |
| 1151 | 1151 | * @throws Apache_Solr_HttpTransportException If an error occurs during the service call |