@@ -14,7 +14,6 @@ |
||
| 14 | 14 | * The TYPO3 project - inspiring people to share! |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -use ApacheSolrForTypo3\Solr\Domain\Search\LastSearches\LastSearchesService; |
|
| 18 | 17 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Facets\FacetRegistry; |
| 19 | 18 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Sorting\Sorting; |
| 20 | 19 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Spellchecking\Suggestion; |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSet; |
| 29 | 29 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSetProcessor; |
| 30 | 30 | use ApacheSolrForTypo3\Solr\Query; |
| 31 | -use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
|
| 32 | 31 | use ApacheSolrForTypo3\Solr\HtmlContentExtractor; |
| 33 | 32 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 34 | 33 | |
@@ -24,9 +24,7 @@ |
||
| 24 | 24 | * This copyright notice MUST APPEAR in all copies of the script! |
| 25 | 25 | ***************************************************************/ |
| 26 | 26 | |
| 27 | -use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Facets\FacetQueryBuilderRegistry; |
|
| 28 | 27 | use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Facets\FacetRegistry; |
| 29 | -use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\Facets\FacetUrlDecoderRegistry; |
|
| 30 | 28 | use ApacheSolrForTypo3\Solr\Domain\Search\SearchRequest; |
| 31 | 29 | use ApacheSolrForTypo3\Solr\Domain\Search\SearchRequestAware; |
| 32 | 30 | use ApacheSolrForTypo3\Solr\Query; |
@@ -25,7 +25,6 @@ |
||
| 25 | 25 | ***************************************************************/ |
| 26 | 26 | |
| 27 | 27 | use ApacheSolrForTypo3\Solr\Search\FacetsModifier; |
| 28 | -use ApacheSolrForTypo3\Solr\Search\SearchAware; |
|
| 29 | 28 | use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
| 30 | 29 | use ApacheSolrForTypo3\Solr\System\Logging\SolrLogManager; |
| 31 | 30 | use TYPO3\CMS\Core\SingletonInterface; |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | public function initializeSearchComponent() |
| 42 | 42 | { |
| 43 | 43 | if ($this->searchConfiguration['lastSearches']) { |
| 44 | - $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['afterSearch']['lastSearches'] = LastSearchesWriterProcessor::class; |
|
| 44 | + $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['afterSearch']['lastSearches'] = LastSearchesWriterProcessor::class; |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | |
| 61 | 61 | /** @var $resultSet SearchResultSet */ |
| 62 | 62 | $resultSet = self::getUsedSearchResultSetFromRenderingContext($renderingContext); |
| 63 | - if(!$resultSet->getUsedSearchRequest()->getContextTypoScriptConfiguration()->getSearchResultsSiteHighlighting()) { |
|
| 63 | + if (!$resultSet->getUsedSearchRequest()->getContextTypoScriptConfiguration()->getSearchResultsSiteHighlighting()) { |
|
| 64 | 64 | return $url; |
| 65 | 65 | } |
| 66 | 66 | |
@@ -112,11 +112,11 @@ |
||
| 112 | 112 | $this->id = spl_object_hash($this); |
| 113 | 113 | |
| 114 | 114 | // overwrite the plugin namespace and the persistentArgumentsPaths |
| 115 | - if(!is_null($typoScriptConfiguration)) { |
|
| 115 | + if (!is_null($typoScriptConfiguration)) { |
|
| 116 | 116 | $this->argumentNameSpace = $typoScriptConfiguration->getSearchPluginNamespace(); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - $this->persistentArgumentsPaths = [$this->argumentNameSpace . ':q', $this->argumentNameSpace . ':filter', $this->argumentNameSpace . ':sort',]; |
|
| 119 | + $this->persistentArgumentsPaths = [$this->argumentNameSpace . ':q', $this->argumentNameSpace . ':filter', $this->argumentNameSpace . ':sort', ]; |
|
| 120 | 120 | $this->reset(); |
| 121 | 121 | } |
| 122 | 122 | |
@@ -48,11 +48,11 @@ |
||
| 48 | 48 | $urlHelper = GeneralUtility::makeInstance(UrlHelper::class, $url); |
| 49 | 49 | $urlHelper->addQueryParameter('sword_list', $searchWords); |
| 50 | 50 | |
| 51 | - if($addNoCache) { |
|
| 51 | + if ($addNoCache) { |
|
| 52 | 52 | $urlHelper->addQueryParameter('no_cache', '1'); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if(!$keepCHash) { |
|
| 55 | + if (!$keepCHash) { |
|
| 56 | 56 | $urlHelper->removeQueryParameter('cHash'); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @return void |
| 50 | 50 | */ |
| 51 | 51 | protected function parseInitialUrl() { |
| 52 | - if($this->wasParsed) { |
|
| 52 | + if ($this->wasParsed) { |
|
| 53 | 53 | return; |
| 54 | 54 | } |
| 55 | 55 | $this->parts = parse_url($this->initialUrl); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
| 105 | 105 | $port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; |
| 106 | 106 | $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; |
| 107 | - $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; |
|
| 107 | + $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; |
|
| 108 | 108 | $pass = ($user || $pass) ? "$pass@" : ''; |
| 109 | 109 | $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; |
| 110 | 110 | $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; |