@@ -139,7 +139,7 @@  | 
                                                    ||
| 139 | 139 | }  | 
                                                        
| 140 | 140 | |
| 141 | 141 | /**  | 
                                                        
| 142 | - * @param null $variantParent  | 
                                                        |
| 142 | + * @param SearchResult $variantParent  | 
                                                        |
| 143 | 143 | */  | 
                                                        
| 144 | 144 | public function setVariantParent($variantParent)  | 
                                                        
| 145 | 145 |      { | 
                                                        
@@ -165,10 +165,10 @@  | 
                                                    ||
| 165 | 165 | // direct access for small paths  | 
                                                        
| 166 | 166 | case 1:  | 
                                                        
| 167 | 167 | $this->data[$pathArray[0]] = $value;  | 
                                                        
| 168 | - return;  | 
                                                        |
| 168 | + return;  | 
                                                        |
| 169 | 169 | case 2:  | 
                                                        
| 170 | 170 | $this->data[$pathArray[0]][$pathArray[1]] = $value;  | 
                                                        
| 171 | - return;  | 
                                                        |
| 171 | + return;  | 
                                                        |
| 172 | 172 | default:  | 
                                                        
| 173 | 173 | $this->setDeepElementWithLoop($pathArray, $value);  | 
                                                        
| 174 | 174 | }  | 
                                                        
@@ -247,12 +247,12 @@  | 
                                                    ||
| 247 | 247 | protected function getPathAsArray($path)  | 
                                                        
| 248 | 248 |      { | 
                                                        
| 249 | 249 |          if (!$this->includePathSeparatorInKeys) { | 
                                                        
| 250 | - $pathArray = explode($this->pathSeparator, $path);  | 
                                                        |
| 250 | + $pathArray = explode($this->pathSeparator, $path);  | 
                                                        |
| 251 | 251 | return $pathArray;  | 
                                                        
| 252 | 252 | }  | 
                                                        
| 253 | 253 | |
| 254 | 254 | $substitutedPath = str_replace($this->pathSeparator, $this->pathSeparator . '@@@', trim($path));  | 
                                                        
| 255 | -        $pathArray =  array_filter(explode('@@@', $substitutedPath)); | 
                                                        |
| 255 | +        $pathArray = array_filter(explode('@@@', $substitutedPath)); | 
                                                        |
| 256 | 256 | return $pathArray;  | 
                                                        
| 257 | 257 | }  | 
                                                        
| 258 | 258 | }  | 
                                                        
@@ -324,7 +324,7 @@  | 
                                                    ||
| 324 | 324 | * Sets a request's parameter and its value.  | 
                                                        
| 325 | 325 | *  | 
                                                        
| 326 | 326 | * @param string $parameter Parameter name  | 
                                                        
| 327 | - * @param mixed $value Parameter value.  | 
                                                        |
| 327 | + * @param string $value Parameter value.  | 
                                                        |
| 328 | 328 | */  | 
                                                        
| 329 | 329 | public function setParameter($parameter, $value)  | 
                                                        
| 330 | 330 |      { | 
                                                        
@@ -353,7 +353,7 @@  | 
                                                    ||
| 353 | 353 | $value = array_pop($relatedItemsFromForeignTable);  | 
                                                        
| 354 | 354 | |
| 355 | 355 | // restore  | 
                                                        
| 356 | - $this->configuration= $backupConfiguration;  | 
                                                        |
| 356 | + $this->configuration = $backupConfiguration;  | 
                                                        |
| 357 | 357 | $parentContentObject->data = $backupRecord;  | 
                                                        
| 358 | 358 | }  | 
                                                        
| 359 | 359 | |
@@ -1041,7 +1041,7 @@ discard block  | 
                                                    ||
| 1041 | 1041 | /**  | 
                                                        
| 1042 | 1042 | * Sets the fields to return by a query.  | 
                                                        
| 1043 | 1043 | *  | 
                                                        
| 1044 | - * @param array|string $fieldList an array or comma-separated list of field names  | 
                                                        |
| 1044 | + * @param string $fieldList an array or comma-separated list of field names  | 
                                                        |
| 1045 | 1045 | * @throws \UnexpectedValueException on parameters other than comma-separated lists and arrays  | 
                                                        
| 1046 | 1046 | */  | 
                                                        
| 1047 | 1047 | public function setFieldList($fieldList = ['*', 'score'])  | 
                                                        
@@ -1117,7 +1117,7 @@ discard block  | 
                                                    ||
| 1117 | 1117 | *  | 
                                                        
| 1118 | 1118 | * This query supports the complete Lucene Query Language.  | 
                                                        
| 1119 | 1119 | *  | 
                                                        
| 1120 | - * @param mixed $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.  | 
                                                        |
| 1120 | + * @param string $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.  | 
                                                        |
| 1121 | 1121 | * @see http://wiki.apache.org/solr/DisMaxQParserPlugin#q.alt  | 
                                                        
| 1122 | 1122 | */  | 
                                                        
| 1123 | 1123 | public function setAlternativeQuery($alternativeQuery)  | 
                                                        
@@ -46,7 +46,7 @@  | 
                                                    ||
| 46 | 46 | public function __construct($configurationToUse = [])  | 
                                                        
| 47 | 47 |      { | 
                                                        
| 48 | 48 |          if (empty($configurationToUse)) { | 
                                                        
| 49 | - $this->configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['solr']);  | 
                                                        |
| 49 | + $this->configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['solr']);  | 
                                                        |
| 50 | 50 |          } else { | 
                                                        
| 51 | 51 | $this->configuration = $configurationToUse;  | 
                                                        
| 52 | 52 | }  | 
                                                        
@@ -169,7 +169,7 @@  | 
                                                    ||
| 169 | 169 | *  | 
                                                        
| 170 | 170 | * @param ContentObjectRenderer $parentObject parent content object  | 
                                                        
| 171 | 171 | */  | 
                                                        
| 172 | - public function postProcessContentObjectInitialization(ContentObjectRenderer &$parentObject)  | 
                                                        |
| 172 | + public function postProcessContentObjectInitialization(ContentObjectRenderer & $parentObject)  | 
                                                        |
| 173 | 173 |      { | 
                                                        
| 174 | 174 |          if (!empty($parentObject->currentRecord)) { | 
                                                        
| 175 | 175 |              list($table) = explode(':', $parentObject->currentRecord); | 
                                                        
@@ -251,7 +251,7 @@  | 
                                                    ||
| 251 | 251 |          if (empty($GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_solr.']['enabled'])) { | 
                                                        
| 252 | 252 | return false;  | 
                                                        
| 253 | 253 | }  | 
                                                        
| 254 | - return (bool) $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_solr.']['enabled'];  | 
                                                        |
| 254 | + return (bool)$GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_solr.']['enabled'];  | 
                                                        |
| 255 | 255 | }  | 
                                                        
| 256 | 256 | |
| 257 | 257 | /**  | 
                                                        
@@ -28,7 +28,6 @@  | 
                                                    ||
| 28 | 28 | use ApacheSolrForTypo3\Solr\Domain\Index\Queue\RecordMonitor\Helper\MountPagesUpdater;  | 
                                                        
| 29 | 29 | use ApacheSolrForTypo3\Solr\Domain\Index\Queue\RecordMonitor\Helper\RootPageResolver;  | 
                                                        
| 30 | 30 | use ApacheSolrForTypo3\Solr\GarbageCollector;  | 
                                                        
| 31 | -use ApacheSolrForTypo3\Solr\System\Cache\TwoLevelCache;  | 
                                                        |
| 32 | 31 | use ApacheSolrForTypo3\Solr\System\Configuration\ExtensionConfiguration;  | 
                                                        
| 33 | 32 | use ApacheSolrForTypo3\Solr\System\TCA\TCAService;  | 
                                                        
| 34 | 33 | use ApacheSolrForTypo3\Solr\Util;  |