@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use ApacheSolrForTypo3\Solr\NoSolrConnectionFoundException; |
| 28 | 28 | use ApacheSolrForTypo3\Solr\Site; |
| 29 | 29 | use ApacheSolrForTypo3\Solr\SolrService; |
| 30 | -use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
|
| 31 | 30 | use ApacheSolrForTypo3\Solr\System\Page\Rootline; |
| 32 | 31 | use TYPO3\CMS\Backend\Routing\UriBuilder; |
| 33 | 32 | use TYPO3\CMS\Backend\Toolbar\ClearCacheActionsHookInterface; |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | |
| 124 | 124 | if ($coresReloaded) { |
| 125 | 125 | $this->addFlashMessage( |
| 126 | - 'Core configuration reloaded ('.implode(', ', $reloadedCores).').', |
|
| 126 | + 'Core configuration reloaded (' . implode(', ', $reloadedCores) . ').', |
|
| 127 | 127 | '', |
| 128 | 128 | FlashMessage::OK |
| 129 | 129 | ); |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | 'auth', // service type |
| 174 | 174 | AuthorizationService::class, |
| 175 | 175 | // service key |
| 176 | - [ // service meta data |
|
| 176 | + [// service meta data |
|
| 177 | 177 | 'title' => 'Solr Indexer Authorization', |
| 178 | 178 | 'description' => 'Authorizes the Solr Index Queue indexer to access protected pages.', |
| 179 | 179 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public function __construct($TCA = null) |
| 50 | 50 | { |
| 51 | - $this->tca = (array) (is_null($TCA) ? $GLOBALS['TCA'] : $TCA); |
|
| 51 | + $this->tca = (array)(is_null($TCA) ? $GLOBALS['TCA'] : $TCA); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * |
| 195 | 195 | * @param string $msg |
| 196 | 196 | * @param int $severity |
| 197 | - * @param mixed $dataVar |
|
| 197 | + * @param string[] $dataVar |
|
| 198 | 198 | */ |
| 199 | 199 | protected function writeDevLog($msg, $severity = 0, $dataVar = false) |
| 200 | 200 | { |
@@ -1024,7 +1024,7 @@ discard block |
||
| 1024 | 1024 | /** |
| 1025 | 1025 | * Sets the fields to return by a query. |
| 1026 | 1026 | * |
| 1027 | - * @param array|string $fieldList an array or comma-separated list of field names |
|
| 1027 | + * @param string $fieldList an array or comma-separated list of field names |
|
| 1028 | 1028 | * @throws \UnexpectedValueException on parameters other than comma-separated lists and arrays |
| 1029 | 1029 | */ |
| 1030 | 1030 | public function setFieldList($fieldList = ['*', 'score']) |
@@ -1100,7 +1100,7 @@ discard block |
||
| 1100 | 1100 | * |
| 1101 | 1101 | * This query supports the complete Lucene Query Language. |
| 1102 | 1102 | * |
| 1103 | - * @param mixed $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter. |
|
| 1103 | + * @param string $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter. |
|
| 1104 | 1104 | * @see http://wiki.apache.org/solr/DisMaxQParserPlugin#q.alt |
| 1105 | 1105 | */ |
| 1106 | 1106 | public function setAlternativeQuery($alternativeQuery) |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | public function __construct($keywords, $solrConfiguration = null, SiteHashService $siteHashService = null) |
| 166 | 166 | { |
| 167 | - $keywords = (string) $keywords; |
|
| 167 | + $keywords = (string)$keywords; |
|
| 168 | 168 | |
| 169 | 169 | $this->solrConfiguration = is_null($solrConfiguration) ? Util::getSolrConfiguration() : $solrConfiguration; |
| 170 | 170 | $this->siteHashService = is_null($siteHashService) ? GeneralUtility::makeInstance(SiteHashService::class) : $siteHashService; |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | public function getGroupFields() |
| 685 | 685 | { |
| 686 | - return (array) $this->getQueryParameter('group.field', []); |
|
| 686 | + return (array)$this->getQueryParameter('group.field', []); |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | /** |
@@ -706,7 +706,7 @@ discard block |
||
| 706 | 706 | */ |
| 707 | 707 | public function getGroupSortings() |
| 708 | 708 | { |
| 709 | - return (array) $this->getQueryParameter('group.sort', []); |
|
| 709 | + return (array)$this->getQueryParameter('group.sort', []); |
|
| 710 | 710 | } |
| 711 | 711 | |
| 712 | 712 | // faceting |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | */ |
| 733 | 733 | public function getGroupQueries() |
| 734 | 734 | { |
| 735 | - return (array) $this->getQueryParameter('group.query', []); |
|
| 735 | + return (array)$this->getQueryParameter('group.query', []); |
|
| 736 | 736 | } |
| 737 | 737 | |
| 738 | 738 | /** |
@@ -51,14 +51,14 @@ |
||
| 51 | 51 | public function execute(array $arguments = []) |
| 52 | 52 | { |
| 53 | 53 | try { |
| 54 | - $iterator = unserialize($arguments[0]); |
|
| 54 | + $iterator = unserialize($arguments[0]); |
|
| 55 | 55 | } catch (\Exception $e) { |
| 56 | 56 | $iterator = []; |
| 57 | 57 | } |
| 58 | 58 | if ($iterator === false) { |
| 59 | 59 | $iterator = []; |
| 60 | 60 | } |
| 61 | - $variable = $arguments[1]; |
|
| 61 | + $variable = $arguments[1]; |
|
| 62 | 62 | |
| 63 | 63 | $data = ''; |
| 64 | 64 | foreach ($iterator as $value) { |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | { |
| 256 | 256 | /** @var $registry Registry */ |
| 257 | 257 | $registry = GeneralUtility::makeInstance(Registry::class); |
| 258 | - $servers = (array) $registry->get('tx_solr', 'servers', []); |
|
| 258 | + $servers = (array)$registry->get('tx_solr', 'servers', []); |
|
| 259 | 259 | return $servers; |
| 260 | 260 | } |
| 261 | 261 | |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | $recursionRootPageId = intval($rootPageId); |
| 340 | 340 | if ($rootPageId == 'SITE_ROOT') { |
| 341 | 341 | $recursionRootPageId = $this->rootPage['uid']; |
| 342 | - $pageIds[] = (int) $this->rootPage['uid']; |
|
| 342 | + $pageIds[] = (int)$this->rootPage['uid']; |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | if ($maxDepth <= 0) { |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid', 'pages', 'pid = ' . $recursionRootPageId . ' ' . BackendUtility::deleteClause('pages') . $initialPagesAdditionalWhereClause); |
| 382 | 382 | |
| 383 | 383 | while ($page = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) { |
| 384 | - $pageIds[] = (int) $page['uid']; |
|
| 384 | + $pageIds[] = (int)$page['uid']; |
|
| 385 | 385 | |
| 386 | 386 | if ($maxDepth > 1) { |
| 387 | 387 | $pageIds = array_merge($pageIds, $this->getPages($page['uid'], $maxDepth - 1)); |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * @param Query $query The query that has been searched for. |
| 283 | 283 | * @param \Apache_Solr_Response $response The search's response. |
| 284 | 284 | */ |
| 285 | - protected function processResponse($rawQuery, Query $query, \Apache_Solr_Response &$response) |
|
| 285 | + protected function processResponse($rawQuery, Query $query, \Apache_Solr_Response & $response) |
|
| 286 | 286 | { |
| 287 | 287 | if ($this->shouldHideResultsFromInitialSearch($rawQuery)) { |
| 288 | 288 | // explicitly set number of results to 0 as we just wanted |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @param \Apache_Solr_Response $response |
| 312 | 312 | */ |
| 313 | - protected function addExpandedDocumentsFromVariants(\Apache_Solr_Response &$response) |
|
| 313 | + protected function addExpandedDocumentsFromVariants(\Apache_Solr_Response & $response) |
|
| 314 | 314 | { |
| 315 | 315 | if (!is_array($response->response->docs)) { |
| 316 | 316 | return; |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | * @param \Apache_Solr_Response $response |
| 363 | 363 | * @throws \Apache_Solr_ParserException |
| 364 | 364 | */ |
| 365 | - protected function wrapResultDocumentInResultObject(\Apache_Solr_Response &$response) |
|
| 365 | + protected function wrapResultDocumentInResultObject(\Apache_Solr_Response & $response) |
|
| 366 | 366 | { |
| 367 | 367 | try { |
| 368 | 368 | $documents = $response->response->docs; |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | public function getSearchStatistics($rootPageId, $days = 30, $limit = 10) |
| 44 | 44 | { |
| 45 | 45 | $now = time(); |
| 46 | - $timeStart = (int) ($now - 86400 * intval($days)); // 86400 seconds/day |
|
| 47 | - $rootPageId = (int) $rootPageId; |
|
| 48 | - $limit = (int) $limit; |
|
| 46 | + $timeStart = (int)($now - 86400 * intval($days)); // 86400 seconds/day |
|
| 47 | + $rootPageId = (int)$rootPageId; |
|
| 48 | + $limit = (int)$limit; |
|
| 49 | 49 | |
| 50 | 50 | $statisticsRows = $this->getDatabase()->exec_SELECTgetRows( |
| 51 | 51 | 'keywords, count(keywords) as count, num_found as hits', |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $sumCount += $statisticsRow['count']; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - $statisticsRows = array_map(function ($row) use ($sumCount) { |
|
| 66 | + $statisticsRows = array_map(function($row) use ($sumCount) { |
|
| 67 | 67 | $row['percent'] = $row['count'] * 100 / $sumCount; |
| 68 | 68 | |
| 69 | 69 | return $row; |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | protected function getTopKeyWordsWithOrWithoutHits($rootPageId, $days = 30, $limit, $withoutHits) |
| 111 | 111 | { |
| 112 | - $rootPageId = (int) $rootPageId; |
|
| 113 | - $limit = (int) $limit; |
|
| 114 | - $withoutHits = (bool) $withoutHits; |
|
| 112 | + $rootPageId = (int)$rootPageId; |
|
| 113 | + $limit = (int)$limit; |
|
| 114 | + $withoutHits = (bool)$withoutHits; |
|
| 115 | 115 | |
| 116 | 116 | $now = time(); |
| 117 | 117 | $timeStart = $now - 86400 * intval($days); // 86400 seconds/day |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | // for the hits we need to take the average |
| 157 | 157 | $avgHits = $this->getAverageFromField($mergedRow, $statisticsRow, 'hits'); |
| 158 | - $mergedRow['hits'] = (int) $avgHits; |
|
| 158 | + $mergedRow['hits'] = (int)$avgHits; |
|
| 159 | 159 | |
| 160 | 160 | // for the count we need to take the sum, because it's the sum of searches |
| 161 | 161 | $mergedRow['count'] = $mergedRow['count'] + $statisticsRow['count']; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | * @param string $fieldName |
| 200 | 200 | * @return float|int |
| 201 | 201 | */ |
| 202 | - protected function getAverageFromField(array &$mergedRow, array $statisticsRow, $fieldName) |
|
| 202 | + protected function getAverageFromField(array &$mergedRow, array $statisticsRow, $fieldName) |
|
| 203 | 203 | { |
| 204 | 204 | // when this is the first row we can take it. |
| 205 | 205 | if ($mergedRow['mergedrows'] === 1) { |