TYPO3-Solr / ext-solr

Classes/Query.php

Spacing +4 added lines, -4 removed lines

@@ -155,7 +155,7 @@ 
      */
     public function __construct($keywords, $solrConfiguration = null)
     {
-        $keywords = (string) $keywords;
+        $keywords = (string)$keywords;
         if ($solrConfiguration == null) {
             $this->solrConfiguration = Util::getSolrConfiguration();
         } else {
@@ -676,7 +676,7 @@ 
      */
     public function getGroupFields()
     {
-        return (array) $this->getQueryParameter('group.field', []);
+        return (array)$this->getQueryParameter('group.field', []);
     }
 
     /**
@@ -699,7 +699,7 @@ 
      */
     public function getGroupSortings()
     {
-        return (array) $this->getQueryParameter('group.sort', []);
+        return (array)$this->getQueryParameter('group.sort', []);
     }
 
     // faceting
@@ -725,7 +725,7 @@ 
      */
     public function getGroupQueries()
     {
-        return (array) $this->getQueryParameter('group.query', []);
+        return (array)$this->getQueryParameter('group.query', []);
     }
 
     /**

Doc Comments +3 added lines, -3 removed lines

@@ -193,7 +193,7 @@ 
      *
      * @param string $msg
      * @param int $severity
-     * @param mixed $dataVar
+     * @param string[] $dataVar
      */
     protected function writeDevLog($msg, $severity = 0, $dataVar = false)
     {
@@ -1003,7 +1003,7 @@ 
     /**
      * Sets the fields to return by a query.
      *
-     * @param array|string $fieldList an array or comma-separated list of field names
+     * @param string $fieldList an array or comma-separated list of field names
      * @throws \UnexpectedValueException on parameters other than comma-separated lists and arrays
      */
     public function setFieldList($fieldList = array('*', 'score'))
@@ -1079,7 +1079,7 @@ 
      *
      * This query supports the complete Lucene Query Language.
      *
-     * @param mixed $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.
+     * @param string $alternativeQuery String alternative query or boolean FALSE to disable / reset the q.alt parameter.
      * @see http://wiki.apache.org/solr/DisMaxQParserPlugin#q.alt
      */
     public function setAlternativeQuery($alternativeQuery)

Classes/IndexQueue/PageIndexerRequest.php

Doc Comments +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
      * Sets a request's parameter and its value.
      *
      * @param string $parameter Parameter name
-     * @param mixed $value Parameter value.
+     * @param string $value Parameter value.
      */
     public function setParameter($parameter, $value)
     {

Classes/IndexQueue/Initializer/Page.php

Spacing +2 added lines, -2 removed lines

@@ -287,8 +287,8 @@
 
         $mountedPagesIdsWithQueueItems = [];
         foreach ($queueItemsOfExistingMountPoints as $id => $queueItemsOfExistingMountPoint) {
-            if (((int) $queueItemsOfExistingMountPoint['queueItemCount']) > 0) {
-                $mountedPagesIdsWithQueueItems[] = (int) $id;
+            if (((int)$queueItemsOfExistingMountPoint['queueItemCount']) > 0) {
+                $mountedPagesIdsWithQueueItems[] = (int)$id;
             }
         }
 

Classes/SolrService.php

Doc Comments +4 added lines, -4 removed lines

@@ -232,7 +232,7 @@ 
      *
      * Also does not report the time, see https://forge.typo3.org/issues/64551
      *
-     * @param float|int $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
+     * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
      * @param boolean $useCache indicates if the ping result should be cached in the instance or not
      * @return bool TRUE if Solr can be reached, FALSE if not
      */
@@ -245,7 +245,7 @@ 
     /**
      * Call the /admin/ping servlet, can be used to get the runtime of a ping request.
      *
-     * @param float|int $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
+     * @param integer $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
      * @param boolean $useCache indicates if the ping result should be cached in the instance or not
      * @return double runtime in milliseconds
      * @throws \ApacheSolrForTypo3\Solr\PingFailedException
@@ -482,7 +482,7 @@ 
      *
      * @param string $url
      * @param float|bool $timeout Read timeout in seconds
-     * @return \Apache_Solr_Response
+     * @return string
      */
     protected function _sendRawGet($url, $timeout = false)
     {
@@ -656,7 +656,7 @@ 
      * a complete and well formed "delete" xml document
      *
      * @param string $rawPost Expected to be utf-8 encoded xml document
-     * @param float|int $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @param integer $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
      * @return \Apache_Solr_Response
      */
     public function delete($rawPost, $timeout = 3600)

Spacing +2 added lines, -2 removed lines

@@ -276,7 +276,7 @@ 
      */
     protected function performPingRequest($timeout = 2, $useCache = true)
     {
-        $cacheKey = (string) ($this);
+        $cacheKey = (string)($this);
         if ($useCache && isset(static::$pingCache[$cacheKey])) {
             return static::$pingCache[$cacheKey];
         }
@@ -610,7 +610,7 @@ 
             $solrconfigXmlUrl = $this->_scheme . '://'
                 . $this->_host . ':' . $this->_port
                 . $this->_path . 'admin/file/?file=solrconfig.xml';
-            $response= $this->_sendRawGet($solrconfigXmlUrl);
+            $response = $this->_sendRawGet($solrconfigXmlUrl);
 
             $solrconfigXml = simplexml_load_string($response->getRawResponse());
             if ($solrconfigXml === false) {

Classes/Site.php

Spacing +3 added lines, -3 removed lines

@@ -230,7 +230,7 @@ 
     {
         /** @var $registry Registry */
         $registry = GeneralUtility::makeInstance(Registry::class);
-        $servers = (array) $registry->get('tx_solr', 'servers', []);
+        $servers = (array)$registry->get('tx_solr', 'servers', []);
         return $servers;
     }
 
@@ -314,7 +314,7 @@ 
         $recursionRootPageId = intval($rootPageId);
         if ($rootPageId == 'SITE_ROOT') {
             $recursionRootPageId = $this->rootPage['uid'];
-            $pageIds[] = (int) $this->rootPage['uid'];
+            $pageIds[] = (int)$this->rootPage['uid'];
         }
 
         if ($maxDepth <= 0) {
@@ -345,7 +345,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid', 'pages', 'pid = ' . $recursionRootPageId . ' ' . BackendUtility::deleteClause('pages'));
 
         while ($page = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
-            $pageIds[] = (int) $page['uid'];
+            $pageIds[] = (int)$page['uid'];
 
             if ($maxDepth > 1) {
                 $pageIds = array_merge($pageIds, $this->getPages($page['uid'], $maxDepth - 1));

Classes/System/DateTime/FormatService.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         }
 
         // try to create DateTime object
-        $timezone = is_null($timezone) ?  new DateTimeZone(date_default_timezone_get()) : $timezone;
+        $timezone = is_null($timezone) ? new DateTimeZone(date_default_timezone_get()) : $timezone;
         return $this->getFormattedDate($input, $inputFormat, $outputFormat, $timezone);
     }
 

Classes/Domain/Index/IndexService.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
         $this->configuration = $site->getSolrConfiguration();
         $this->site = $site;
         $this->indexQueue = is_null($queue) ? GeneralUtility::makeInstance(Queue::class) : $queue;
-        $this->signalSlotDispatcher = is_null($dispatcher)  ? GeneralUtility::makeInstance(Dispatcher::class) : $dispatcher;
+        $this->signalSlotDispatcher = is_null($dispatcher) ? GeneralUtility::makeInstance(Dispatcher::class) : $dispatcher;
     }
 
     /**
@@ -140,7 +140,7 @@ 
     protected function generateIndexingErrorLog(Item $itemToIndex, \Exception $e)
     {
         $message = 'Failed indexing Index Queue item ' . $itemToIndex->getIndexQueueUid();
-        $data = [   'code' => $e->getCode(),
+        $data = ['code' => $e->getCode(),
                     'message' => $e->getMessage(),
                     'trace' => $e->getTrace(),
                     'item' => (array)$itemToIndex];

Classes/System/Configuration/TypoScriptConfiguration.php

Spacing +3 added lines, -3 removed lines

@@ -406,7 +406,7 @@ 
     {
         $monitoredTables = [];
 
-        $indexingConfigurations =  $this->getEnabledIndexQueueConfigurationNames();
+        $indexingConfigurations = $this->getEnabledIndexQueueConfigurationNames();
         foreach ($indexingConfigurations as $indexingConfigurationName) {
             $monitoredTable = $this->getIndexQueueTableNameOrFallbackToConfigurationName($indexingConfigurationName);
             $monitoredTables[] = $monitoredTable;
@@ -532,13 +532,13 @@ 
     public function getInitialPagesAdditionalWhereClause($defaultIfEmpty = ' AND 1=1')
     {
         $path = 'plugin.tx_solr.index.queue.pages' . '.initialPagesAdditionalWhereClause';
-        $initialPagesAdditionalWhereClause =  $this->getValueByPathOrDefaultValue($path, '');
+        $initialPagesAdditionalWhereClause = $this->getValueByPathOrDefaultValue($path, '');
 
         if (trim($initialPagesAdditionalWhereClause) === '') {
             return $defaultIfEmpty;
         }
 
-        return ' AND ' .  $initialPagesAdditionalWhereClause;
+        return ' AND ' . $initialPagesAdditionalWhereClause;
     }
 
     /**

Doc Comments +4 added lines, -4 removed lines

@@ -604,7 +604,7 @@ 
      *
      * @param string $configurationName
      * @param string $defaultIfEmpty
-     * @return mixed
+     * @return string
      */
     public function getIndexQueueInitializerClassByConfigurationName($configurationName, $defaultIfEmpty = 'ApacheSolrForTypo3\\Solr\\IndexQueue\\Initializer\\Record')
     {
@@ -1309,7 +1309,7 @@ 
      * plugin.tx_solr.search.query.allowEmptyQuery
      *
      * @param string $defaultIfEmpty
-     * @return string
+     * @return boolean
      */
     public function getSearchQueryAllowEmptyQuery($defaultIfEmpty = '')
     {
@@ -1371,7 +1371,7 @@ 
      *
      * plugin.tx_solr.search.query.returnFields
      *
-     * @param array $defaultIfEmpty
+     * @param string[] $defaultIfEmpty
      * @return array
      */
     public function getSearchQueryReturnFieldsAsArray($defaultIfEmpty = array())
@@ -1956,7 +1956,7 @@ 
      * plugin.tx_solr.index.enableCommits
      *
      * @param bool $defaultIfEmpty
-     * @return bool
+     * @return boolean|null
      */
     public function getEnableCommits($defaultIfEmpty = true)
     {

Indentation +2 added lines, -5 removed lines

@@ -827,7 +827,6 @@ 
      * Returns if a log message should be written when a page was indexed.
      *
      * plugin.tx_solr.logging.indexing.pageIndexed
-
      * @param bool $defaultIfEmpty
      * @return bool
      */
@@ -841,7 +840,6 @@ 
      * Returns if a log message should be written when the TYPO3 search markers are missing in the page.
      *
      * plugin.tx_solr.logging.indexing.missingTypo3SearchMarkers
-
      * @param bool $defaultIfEmpty
      * @return bool
      */
@@ -869,7 +867,6 @@ 
      * Indicates if the debug mode is enabled or not.
      *
      * plugin.tx_solr.enableDebugMode
-
      * @param bool $defaultIfEmpty
      * @return bool
      */
@@ -1960,8 +1957,8 @@ 
      */
     public function getEnableCommits($defaultIfEmpty = true)
     {
-	$enableCommits = $this->getValueByPathOrDefaultValue('plugin.tx_solr.index.enableCommits', $defaultIfEmpty);
-	$this->getBool($enableCommits);
+    $enableCommits = $this->getValueByPathOrDefaultValue('plugin.tx_solr.index.enableCommits', $defaultIfEmpty);
+    $this->getBool($enableCommits);
     }
 
 }

Classes/GarbageCollector.php

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
             $solrConnections = $connectionManager->getConnectionsBySite($site);
             foreach ($solrConnections as $solr) {
                 $solr->deleteByQuery('type:' . $table . ' AND uid:' . intval($uid));
-                if($solrConfiguration->getEnableCommits()) {
+                if ($solrConfiguration->getEnableCommits()) {
                     $solr->commit(false, false, false);
                 }
             }