Erikmitk / kitodo-presentation

Classes/Plugin/Search.php

Spacing +35 added lines, -35 removed lines

@@ -61,7 +61,7 @@ 
 
         if ($result->rowCount() == 1) {
             $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/Search/Suggester.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)).'Resources/Public/Javascript/Search/Suggester.js');
         } else {
             $this->logger->warning('No metadata fields configured for search suggestions');
         }
@@ -83,7 +83,7 @@ 
             && $list->metadata['options']['source'] == 'collection'
         ) {
             // Get collection's UID.
-            return '<input type="hidden" name="' . $this->prefixId . '[collection]" value="' . $list->metadata['options']['select'] . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$list->metadata['options']['select'].'" />';
         } elseif (!empty($list->metadata['options']['params']['filterquery'])) {
             // Get collection's UID from search metadata.
             foreach ($list->metadata['options']['params']['filterquery'] as $facet) {
@@ -95,7 +95,7 @@ 
                     $collectionId = Helper::getUidFromIndexName(trim($facetKeyVal[1], '(")'), 'tx_dlf_collections');
                 }
             }
-            return '<input type="hidden" name="' . $this->prefixId . '[collection]" value="' . $collectionId . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$collectionId.'" />';
         }
         return '';
     }
@@ -119,7 +119,7 @@ 
             $this->loadDocument();
             // Get document's UID
             if ($this->doc->ready) {
-                return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . ($this->doc->uid) . '" />';
+                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.($this->doc->uid).'" />';
             }
         } elseif (!empty($list->metadata['options']['params']['filterquery'])) {
             // Get document's UID from search metadata.
@@ -134,7 +134,7 @@ 
                 }
             }
             if (!empty($documentId)) {
-                return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . $documentId . '" />';
+                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
             }
         }
         return '';
@@ -157,7 +157,7 @@ 
         }
         // Add encrypted fields to search form.
         if ($name !== false) {
-            return '<input type="hidden" name="' . $this->prefixId . '[encrypted]" value="' . $name . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[encrypted]" value="'.$name.'" />';
         } else {
             return '';
         }
@@ -183,19 +183,19 @@ 
         // Get operator options.
         $operatorOptions = '';
         foreach (['AND', 'OR', 'NOT'] as $operator) {
-            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-' . $operator . '" value="' . $operator . '">' . htmlspecialchars($this->pi_getLL($operator, '')) . '</option>';
+            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.htmlspecialchars($this->pi_getLL($operator, '')).'</option>';
         }
         // Get field selector options.
         $fieldSelectorOptions = '';
         $searchFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], true);
         foreach ($searchFields as $searchField) {
-            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-' . $searchField . '" value="' . $searchField . '">' . Helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']) . '</option>';
+            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-'.$searchField.'" value="'.$searchField.'">'.Helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']).'</option>';
         }
         for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
             $markerArray = [
-                '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-' . $i . '" name="' . $this->prefixId . '[extOperator][' . $i . ']">' . $operatorOptions . '</select>',
-                '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-' . $i . '" name="' . $this->prefixId . '[extField][' . $i . ']">' . $fieldSelectorOptions . '</select>',
-                '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-' . $i . '" type="text" name="' . $this->prefixId . '[extQuery][' . $i . ']" />'
+                '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-'.$i.'" name="'.$this->prefixId.'[extOperator]['.$i.']">'.$operatorOptions.'</select>',
+                '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-'.$i.'" name="'.$this->prefixId.'[extField]['.$i.']">'.$fieldSelectorOptions.'</select>',
+                '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-'.$i.'" type="text" name="'.$this->prefixId.'[extQuery]['.$i.']" />'
             ];
             $extendedSearch .= $this->templateService->substituteMarkerArray($this->templateService->getSubpart($this->template, '###EXT_SEARCH_ENTRY###'), $markerArray);
         }
@@ -223,12 +223,12 @@ 
         // Get facets from plugin configuration.
         $facets = [];
         foreach (GeneralUtility::trimExplode(',', $this->conf['facets'], true) as $facet) {
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
         }
         // Render facets menu.
         $TSconfig = [];
         $TSconfig['special'] = 'userfunction';
-        $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\Search::class . '->makeFacetsMenuArray';
+        $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\Search::class.'->makeFacetsMenuArray';
         $TSconfig['special.']['facets'] = $facets;
         $TSconfig['special.']['limit'] = max(intval($this->conf['limitFacets']), 1);
         $TSconfig = Helper::mergeRecursiveWithOverrule($this->conf['facetsConf.'], $TSconfig);
@@ -249,10 +249,10 @@ 
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['fulltext'])) {
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="' . $this->prefixId . '[fulltext]" value="0" ' . ($isFulltextSearch == 0 ? 'checked="checked"' : '') . ' />';
-            $output .= ' <label for="tx-dlf-search-fulltext-no">' . htmlspecialchars($this->pi_getLL('label.inMetadata', '')) . '</label>';
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="' . $this->prefixId . '[fulltext]" value="1" ' . ($isFulltextSearch == 1 ? 'checked="checked"' : '') . '/>';
-            $output .= ' <label for="tx-dlf-search-fulltext-yes">' . htmlspecialchars($this->pi_getLL('label.inFulltext', '')) . '</label>';
+            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="'.$this->prefixId.'[fulltext]" value="0" '.($isFulltextSearch == 0 ? 'checked="checked"' : '').' />';
+            $output .= ' <label for="tx-dlf-search-fulltext-no">'.htmlspecialchars($this->pi_getLL('label.inMetadata', '')).'</label>';
+            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="'.$this->prefixId.'[fulltext]" value="1" '.($isFulltextSearch == 1 ? 'checked="checked"' : '').'/>';
+            $output .= ' <label for="tx-dlf-search-fulltext-yes">'.htmlspecialchars($this->pi_getLL('label.inFulltext', '')).'</label>';
         }
         return $output;
     }
@@ -269,8 +269,8 @@ 
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
-            $output .= ' <label for="tx-dlf-search-logical-page">' . htmlspecialchars($this->pi_getLL('label.logicalPage', '')) . ': </label>';
-            $output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="' . $this->prefixId . '[logicalPage]" />';
+            $output .= ' <label for="tx-dlf-search-logical-page">'.htmlspecialchars($this->pi_getLL('label.logicalPage', '')).': </label>';
+            $output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="'.$this->prefixId.'[logicalPage]" />';
         }
         return $output;
     }
@@ -311,7 +311,7 @@ 
         $entryArray['doNotLinkIt'] = 0;
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
         if ($index !== false) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
@@ -328,7 +328,7 @@ 
             }
         } else {
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
             $entryArray['ITEM_STATE'] = 'NO';
         }
         $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['query' => $search['query'], 'fq' => $queryColumn]);
@@ -384,7 +384,7 @@ 
                 '###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
                 '###LABEL_QUERY###' => (!empty($search['query']) ? htmlspecialchars($search['query']) : htmlspecialchars($this->pi_getLL('label.query'))),
                 '###LABEL_SUBMIT###' => htmlspecialchars($this->pi_getLL('label.submit')),
-                '###FIELD_QUERY###' => $this->prefixId . '[query]',
+                '###FIELD_QUERY###' => $this->prefixId.'[query]',
                 '###QUERY###' => (!empty($search['query']) ? htmlspecialchars($search['query']) : ''),
                 '###FULLTEXTSWITCH###' => $this->addFulltextSwitch($list->metadata['fulltextSearch']),
                 '###FIELD_DOC###' => ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all' ? $this->addCurrentDocument() : ''),
@@ -411,13 +411,13 @@ 
             // Set search query.
             if (
                 (!empty($this->conf['fulltext']) && !empty($this->piVars['fulltext']))
-                || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($this->piVars['query']), $matches)
+                || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($this->piVars['query']), $matches)
             ) {
                 // If the query already is a fulltext query e.g using the facets
                 $this->piVars['query'] = empty($matches[1]) ? $this->piVars['query'] : $matches[1];
                 // Search in fulltext field if applicable. Query must not be empty!
                 if (!empty($this->piVars['query'])) {
-                    $query = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($this->piVars['query'])) . ')';
+                    $query = $fields['fulltext'].':('.Solr::escapeQuery(trim($this->piVars['query'])).')';
                 }
             } else {
                 // Retain given search field if valid.
@@ -438,9 +438,9 @@ 
                             && in_array($this->piVars['extField'][$i], $allowedFields)
                         ) {
                             if (!empty($query)) {
-                                $query .= ' ' . $this->piVars['extOperator'][$i] . ' ';
+                                $query .= ' '.$this->piVars['extOperator'][$i].' ';
                             }
-                            $query .= Indexer::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']) . ':(' . Solr::escapeQuery($this->piVars['extQuery'][$i]) . ')';
+                            $query .= Indexer::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']).':('.Solr::escapeQuery($this->piVars['extQuery'][$i]).')';
                         }
                     }
                 }
@@ -462,12 +462,12 @@ 
                 ) {
                     // Search in document and all subordinates (valid for up to three levels of hierarchy).
                     $params['filterquery'][]['query'] = '_query_:"{!join from='
-                        . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                        . $fields['uid'] . ':{!join from=' . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                        . $fields['uid'] . ':' . $this->piVars['id'] . '"' . ' OR {!join from='
-                        . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                        . $fields['uid'] . ':' . $this->piVars['id'] . ' OR '
-                        . $fields['uid'] . ':' . $this->piVars['id'];
+                        . $fields['uid'].' to='.$fields['partof'].'}'
+                        . $fields['uid'].':{!join from='.$fields['uid'].' to='.$fields['partof'].'}'
+                        . $fields['uid'].':'.$this->piVars['id'].'"'.' OR {!join from='
+                        . $fields['uid'].' to='.$fields['partof'].'}'
+                        . $fields['uid'].':'.$this->piVars['id'].' OR '
+                        . $fields['uid'].':'.$this->piVars['id'];
                     $label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), Document::getTitle($this->piVars['id'])));
                 }
             }
@@ -481,7 +481,7 @@ 
                     && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['collection'])
                 ) {
                     $index_name = Helper::getIndexNameFromUid($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
-                    $params['filterquery'][]['query'] = 'collection_faceting:("' . Solr::escapeQuery($index_name) . '")';
+                    $params['filterquery'][]['query'] = 'collection_faceting:("'.Solr::escapeQuery($index_name).'")';
                     $label .= sprintf($this->pi_getLL('in', '', true), Helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
                 }
             }
@@ -493,7 +493,7 @@ 
                     $collIndexNames[] = Solr::escapeQuery(Helper::getIndexNameFromUid(intval($collId), 'tx_dlf_collections', $this->conf['pages']));
                 }
                 // Last value is fake and used for distinction in $this->addCurrentCollection()
-                $params['filterquery'][]['query'] = 'collection_faceting:("' . implode('" OR "', $collIndexNames) . '" OR "FakeValueForDistinction")';
+                $params['filterquery'][]['query'] = 'collection_faceting:("'.implode('" OR "', $collIndexNames).'" OR "FakeValueForDistinction")';
             }
             // Set some query parameters.
             $params['query'] = !empty($query) ? $query : '*';
@@ -543,7 +543,7 @@ 
             $linkConf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
             $linkConf['additionalParams'] = GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false);
             // Send headers.
-            header('Location: ' . GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
+            header('Location: '.GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
             exit;
         }
     }

Classes/Plugin/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         if ($solr->ready) {
             $query = $solr->service->createSelect();
             $query->setFields([$fields['id'], $fields['uid'], $fields['page']]);
-            $query->setQuery($fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . intval($parameters['uid']));
+            $query->setQuery($fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$fields['uid'].':'.intval($parameters['uid']));
             $query->setStart($count)->setRows(20);
             $hl = $query->getHighlighting();
             $hl->setFields([$fields['fulltext']]);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
             $query->setStart($count)->setRows(20);
             $hl = $query->getHighlighting();
             $hl->setFields([$fields['fulltext']]);
-            $hl->setUseFastVectorHighlighter(true);
+            $hl->setUseFastVectorHighlighter(TRUE);
             $results = $solr->service->select($query);
             $output['numFound'] = $results->getNumFound();
             $highlighting = $results->getHighlighting();

Classes/Common/DocumentList.php

Spacing +17 added lines, -17 removed lines

@@ -137,7 +137,7 @@ 
         if ($this->valid()) {
             return $this->getRecord($this->elements[$this->position]);
         } else {
-            $this->logger->notice('Invalid position "' . $this->position . '" for list element');
+            $this->logger->notice('Invalid position "'.$this->position.'" for list element');
             return;
         }
     }
@@ -240,9 +240,9 @@ 
                     $fields = Solr::getFields();
                     $params = [];
                     // Restrict the fields to the required ones
-                    $params['fields'] = $fields['uid'] . ',' . $fields['id'] . ',' . $fields['toplevel'] . ',' . $fields['thumbnail'] . ',' . $fields['page'];
+                    $params['fields'] = $fields['uid'].','.$fields['id'].','.$fields['toplevel'].','.$fields['thumbnail'].','.$fields['page'];
                     foreach ($this->solrConfig as $solr_name) {
-                        $params['fields'] .= ',' . $solr_name;
+                        $params['fields'] .= ','.$solr_name;
                     }
                     // If it is a fulltext search, enable highlighting.
                     if ($this->metadata['fulltextSearch']) {
@@ -264,15 +264,15 @@ 
                     // Extend filter query to get all documents with the same UID.
                     foreach ($params['filterquery'] as $key => $value) {
                         if (isset($value['query'])) {
-                            $params['filterquery'][$key]['query'] = $value['query'] . ' OR ' . $fields['toplevel'] . ':true';
+                            $params['filterquery'][$key]['query'] = $value['query'].' OR '.$fields['toplevel'].':true';
                         }
                     }
                     // Add filter query to get all documents with the required uid.
-                    $params['filterquery'][] = ['query' => $fields['uid'] . ':' . Solr::escapeQuery($record['uid'])];
+                    $params['filterquery'][] = ['query' => $fields['uid'].':'.Solr::escapeQuery($record['uid'])];
                     // Add sorting.
                     $params['sort'] = $this->metadata['options']['params']['sort'];
                     // Set query.
-                    $params['query'] = $this->metadata['options']['select'] . ' OR ' . $fields['toplevel'] . ':true';
+                    $params['query'] = $this->metadata['options']['select'].' OR '.$fields['toplevel'].':true';
                     // Perform search for all documents with the same uid that either fit to the search or marked as toplevel.
                     $selectQuery = $this->solr->service->createSelect($params);
                     $result = $this->solr->service->select($selectQuery);
@@ -347,7 +347,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element moving');
+            $this->logger->warning('Invalid position "'.$position.'" for element moving');
             return;
         }
         $steps = intval($steps);
@@ -355,7 +355,7 @@ 
         if (($position + $steps) < 0
             || ($position + $steps) >= $this->count
         ) {
-            $this->logger->warning('Invalid steps "' . $steps . '" for moving element at position "' . $position . '"');
+            $this->logger->warning('Invalid steps "'.$steps.'" for moving element at position "'.$position.'"');
             return;
         }
         $element = $this->remove($position);
@@ -433,7 +433,7 @@ 
         if ($this->offsetExists($offset)) {
             return $this->getRecord($this->elements[$offset]);
         } else {
-            $this->logger->notice('Invalid offset "' . $offset . '" for list element');
+            $this->logger->notice('Invalid offset "'.$offset.'" for list element');
             return;
         }
     }
@@ -477,7 +477,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element removing');
+            $this->logger->warning('Invalid position "'.$position.'" for element removing');
             return;
         }
         $removed = array_splice($this->elements, $position, 1);
@@ -502,7 +502,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element removing');
+            $this->logger->warning('Invalid position "'.$position.'" for element removing');
             return;
         }
         $removed = array_splice($this->elements, $position, $length);
@@ -595,7 +595,7 @@ 
                     ->execute();
 
                 while ($resArray = $result->fetch()) {
-                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . 's' . ($resArray['index_indexed'] ? 'i' : 'u');
+                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
                 }
                 // Add static fields.
                 $this->solrConfig['type'] = 'type';
@@ -623,7 +623,7 @@ 
         foreach ($this->elements as $num => $element) {
             // Is this element sortable?
             if (!empty($element['s'][$by])) {
-                $newOrder[$element['s'][$by] . str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
+                $newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
             } else {
                 $nonSortable[] = $element;
             }
@@ -761,12 +761,12 @@ 
      */
     public function __get($var)
     {
-        $method = '_get' . ucfirst($var);
+        $method = '_get'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no getter function for property "' . $var . '"');
+            $this->logger->warning('There is no getter function for property "'.$var.'"');
             return;
         } else {
             return $this->$method();
@@ -799,12 +799,12 @@ 
      */
     public function __set($var, $value)
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no setter function for property "' . $var . '"');
+            $this->logger->warning('There is no setter function for property "'.$var.'"');
         } else {
             $this->$method($value);
         }

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -222,7 +222,7 @@ 
                     if ($resArray['uid'] == $record['uid']) {
                         $record['thumbnail'] = $resArray['thumbnail'];
                         $record['metadata'] = $metadata;
-                    } elseif (($key = array_search(['u' => $resArray['uid']], $record['subparts'], true)) !== false) {
+                    } elseif (($key = array_search(['u' => $resArray['uid']], $record['subparts'], TRUE)) !== FALSE) {
                         $record['subparts'][$key] = [
                             'uid' => $resArray['uid'],
                             'page' => 1,
@@ -250,7 +250,7 @@ 
                             'highlighting' => [
                                 'query' => Solr::escapeQuery($this->metadata['searchString']),
                                 'field' => $fields['fulltext'],
-                                'usefastvectorhighlighter' => true
+                                'usefastvectorhighlighter' => TRUE
                             ]
                         ];
                     }
@@ -294,7 +294,7 @@ 
                             $record['thumbnail'] = $resArray->thumbnail;
                             $record['metadata'] = $metadata;
                         } else {
-                            $highlightedDoc = !empty($highlighting) ? $highlighting->getResult($resArray->id) : null;
+                            $highlightedDoc = !empty($highlighting) ? $highlighting->getResult($resArray->id) : NULL;
                             $highlight = !empty($highlightedDoc) ? $highlightedDoc->getField($fields['fulltext'])[0] : '';
                             $record['subparts'][$resArray->id] = [
                                 'uid' => $resArray->uid,
@@ -600,10 +600,10 @@ 
                 // Add static fields.
                 $this->solrConfig['type'] = 'type';
             } else {
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -616,7 +616,7 @@ 
      *
      * @return void
      */
-    public function sort($by, $asc = true)
+    public function sort($by, $asc = TRUE)
     {
         $newOrder = [];
         $nonSortable = [];

Classes/Common/SolrSearchResult/ResultDocument.php

Braces +15 added lines, -30 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ResultDocument
-{
+class ResultDocument {
 
     /**
      * The identifier
@@ -102,8 +101,7 @@ 
      *
      * @return void
      */
-    public function __construct($record, $highlighting, $fields)
-    {
+    public function __construct($record, $highlighting, $fields) {
         $this->id = $record[$fields['id']];
         $this->uid = $record[$fields['uid']];
         $this->page = $record[$fields['page']];
@@ -124,8 +122,7 @@ 
      *
      * @return string The result's record identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -136,8 +133,7 @@ 
      *
      * @return string|null The result's record unified identifier
      */
-    public function getUid()
-    {
+    public function getUid() {
         return $this->uid;
     }
 
@@ -148,8 +144,7 @@ 
      *
      * @return int The result's record page
      */
-    public function getPage()
-    {
+    public function getPage() {
         return $this->page;
     }
 
@@ -160,8 +155,7 @@ 
      *
      * @return string All result's record snippets imploded to one string
      */
-    public function getSnippets()
-    {
+    public function getSnippets() {
         return $this->snippets;
     }
 
@@ -172,8 +166,7 @@ 
      *
      * @return array(Page) All result's pages which contain search phrase
      */
-    public function getPages()
-    {
+    public function getPages() {
         return $this->pages;
     }
 
@@ -184,8 +177,7 @@ 
      *
      * @return array(Region) All result's regions which contain search phrase
      */
-    public function getRegions()
-    {
+    public function getRegions() {
         return $this->regions;
     }
 
@@ -196,8 +188,7 @@ 
      *
      * @return array(Highlight) All result's highlights of search phrase
      */
-    public function getHighlights()
-    {
+    public function getHighlights() {
         return $this->highlights;
     }
 
@@ -208,8 +199,7 @@ 
      *
      * @return array(string) All result's highlights of search phrase
      */
-    public function getHighlightsIds()
-    {
+    public function getHighlightsIds() {
         $highlightsIds = [];
         foreach ($this->highlights as $highlight) {
             array_push($highlightsIds, $highlight->getId());
@@ -225,8 +215,7 @@ 
      *
      * @return void
      */
-    private function parseSnippets()
-    {
+    private function parseSnippets() {
         $snippetArray = $this->getArrayByIndex('text');
 
         $this->snippets = !empty($snippetArray) ? implode(' [...] ', $snippetArray) : '';
@@ -240,8 +229,7 @@ 
      *
      * @return void
      */
-    private function parsePages()
-    {
+    private function parsePages() {
         $pageArray = $this->getArrayByIndex('pages');
 
         $i = 0;
@@ -261,8 +249,7 @@ 
      *
      * @return void
      */
-    private function parseRegions()
-    {
+    private function parseRegions() {
         $regionArray = $this->getArrayByIndex('regions');
 
         $i = 0;
@@ -282,8 +269,7 @@ 
      *
      * @return void
      */
-    private function parseHighlights()
-    {
+    private function parseHighlights() {
         $highlightArray = $this->getArrayByIndex('highlights');
 
         foreach ($highlightArray as $highlights) {
@@ -304,8 +290,7 @@ 
      *
      * @return array
      */
-    private function getArrayByIndex($index)
-    {
+    private function getArrayByIndex($index) {
         $objectArray = [];
         foreach ($this->snippetsForRecord as $snippet) {
             array_push($objectArray, $snippet[$index]);

Classes/Common/SolrSearchResult/Region.php

Braces +11 added lines, -22 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Region
-{
+class Region {
 
     /**
      * The identifier of the region
@@ -105,8 +104,7 @@ 
      *
      * @return void
      */
-    public function __construct($id, $region)
-    {
+    public function __construct($id, $region) {
         $this->id = $id;
         $this->pageId = $region['pageIdx'];
         $this->xBeginPosition = $region['ulx'];
@@ -125,8 +123,7 @@ 
      *
      * @return int The region's identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -137,8 +134,7 @@ 
      *
      * @return int The region's page identifier
      */
-    public function getPageId()
-    {
+    public function getPageId() {
         return $this->pageId;
     }
 
@@ -149,8 +145,7 @@ 
      *
      * @return int The region's horizontal beginning position
      */
-    public function getXBeginPosition()
-    {
+    public function getXBeginPosition() {
         return $this->xBeginPosition;
     }
 
@@ -161,8 +156,7 @@ 
      *
      * @return int The region's horizontal ending position
      */
-    public function getXEndPosition()
-    {
+    public function getXEndPosition() {
         return $this->xEndPosition;
     }
 
@@ -173,8 +167,7 @@ 
      *
      * @return int The region's vertical beginning position
      */
-    public function getYBeginPosition()
-    {
+    public function getYBeginPosition() {
         return $this->yBeginPosition;
     }
 
@@ -185,8 +178,7 @@ 
      *
      * @return int The region's vertical ending position
      */
-    public function getYEndPosition()
-    {
+    public function getYEndPosition() {
         return $this->yEndPosition;
     }
 
@@ -197,8 +189,7 @@ 
      *
      * @return int The region's width
      */
-    public function getWidth()
-    {
+    public function getWidth() {
         return $this->width;
     }
 
@@ -209,8 +200,7 @@ 
      *
      * @return int The region's height
      */
-    public function getHeight()
-    {
+    public function getHeight() {
         return $this->height;
     }
 
@@ -221,8 +211,7 @@ 
      *
      * @return string The region's text
      */
-    public function getText()
-    {
+    public function getText() {
         return $this->text;
     }
 }

Classes/Common/SolrSearchResult/Highlight.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
         $this->yEndPosition = $highlight['lry'];
         $this->width = $highlight['lrx'] - $highlight['ulx'];
         $this->height = $highlight['lry'] - $highlight['uly'];
-        $this->id = $this->width . '_' . $this->height . '_' . $this->xBeginPosition . '_' . $this->yBeginPosition;
+        $this->id = $this->width.'_'.$this->height.'_'.$this->xBeginPosition.'_'.$this->yBeginPosition;
     }
 
     /**

Braces +9 added lines, -18 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Highlight
-{
+class Highlight {
 
     /**
      * The identifier in form 'w_h_x_y'
@@ -96,8 +95,7 @@ 
      *
      * @return void
      */
-    public function __construct($highlight)
-    {
+    public function __construct($highlight) {
         $this->parentRegionId = $highlight['parentRegionIdx'];
         $this->xBeginPosition = $highlight['ulx'];
         $this->xEndPosition = $highlight['lrx'];
@@ -115,8 +113,7 @@ 
      *
      * @return string The highlight's identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -127,8 +124,7 @@ 
      *
      * @return int The highlight's horizontal beginning position
      */
-    public function getXBeginPosition()
-    {
+    public function getXBeginPosition() {
         return $this->xBeginPosition;
     }
 
@@ -139,8 +135,7 @@ 
      *
      * @return int The highlight's horizontal ending position
      */
-    public function getXEndPosition()
-    {
+    public function getXEndPosition() {
         return $this->xEndPosition;
     }
 
@@ -151,8 +146,7 @@ 
      *
      * @return int The highlight's vertical beginning position
      */
-    public function getYBeginPosition()
-    {
+    public function getYBeginPosition() {
         return $this->yBeginPosition;
     }
 
@@ -163,8 +157,7 @@ 
      *
      * @return int The highlight's vertical ending position
      */
-    public function getYEndPosition()
-    {
+    public function getYEndPosition() {
         return $this->yEndPosition;
     }
 
@@ -175,8 +168,7 @@ 
      *
      * @return int The highlight's width
      */
-    public function getWidth()
-    {
+    public function getWidth() {
         return $this->width;
     }
 
@@ -187,8 +179,7 @@ 
      *
      * @return int The highlight's height
      */
-    public function getHeight()
-    {
+    public function getHeight() {
         return $this->height;
     }
 }

Classes/Common/SolrSearchResult/Page.php

Braces +6 added lines, -12 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Page
-{
+class Page {
 
     /**
      * The identifier of the page
@@ -65,8 +64,7 @@ 
      *
      * @return void
      */
-    public function __construct($id, $page)
-    {
+    public function __construct($id, $page) {
         $this->id = $id;
         $this->name = $page['id'];
         $this->width = $page['width'];
@@ -80,8 +78,7 @@ 
      *
      * @return int The page's identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -92,8 +89,7 @@ 
      *
      * @return string The page's name
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -104,8 +100,7 @@ 
      *
      * @return int The page's width
      */
-    public function getWidth()
-    {
+    public function getWidth() {
         return $this->width;
     }
 
@@ -116,8 +111,7 @@ 
      *
      * @return int The page's height
      */
-    public function getHeight()
-    {
+    public function getHeight() {
         return $this->height;
     }
 }

Classes/Common/Solr.php

Braces +22 added lines, -44 removed lines

@@ -37,8 +37,7 @@ 
  * @property-read bool $ready Is the Solr service instantiated successfully?
  * @property-read \Solarium\Client $service This holds the Solr service object
  */
-class Solr implements LoggerAwareInterface
-{
+class Solr implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -130,8 +129,7 @@ 
      *
      * @return string The name of the new core
      */
-    public static function createCore($core = '')
-    {
+    public static function createCore($core = '') {
         // Get next available core name if none given.
         if (empty($core)) {
             $core = 'dlfCore' . self::getNextCoreNumber();
@@ -178,8 +176,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQuery($query)
-    {
+    public static function escapeQuery($query) {
         $helper = GeneralUtility::makeInstance(\Solarium\Core\Query\Helper::class);
         // Escape query phrase or term.
         if (preg_match('/^".*"$/', $query)) {
@@ -202,8 +199,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQueryKeepField($query, $pid)
-    {
+    public static function escapeQueryKeepField($query, $pid) {
         // Is there a field query?
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -253,8 +249,7 @@ 
      *
      * @return array fields
      */
-    public static function getFields()
-    {
+    public static function getFields() {
         $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
         $fields = [];
@@ -296,8 +291,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
-    {
+    public static function getInstance($core = null) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         // Get core name if UID is given.
@@ -339,8 +333,7 @@ 
      *
      * @return int First unused core number found
      */
-    public static function getNextCoreNumber($number = 0)
-    {
+    public static function getNextCoreNumber($number = 0) {
         $number = max(intval($number), 0);
         // Check if core already exists.
         $solr = self::getInstance('dlfCore' . $number);
@@ -358,8 +351,7 @@ 
      *
      * @return void
      */
-    protected function loadSolrConnectionInfo()
-    {
+    protected function loadSolrConnectionInfo() {
         if (empty($this->config)) {
             $config = [];
             // Extract extension configuration.
@@ -397,8 +389,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\DocumentList The result list
      */
-    public function search()
-    {
+    public function search() {
         $toplevel = [];
         // Take over query parameters.
         $params = $this->params;
@@ -467,8 +458,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    public function search_raw($query = '', $parameters = [])
-    {
+    public function search_raw($query = '', $parameters = []) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
@@ -500,8 +490,7 @@ 
      *
      * @return string|null The core name of the current query endpoint or null if core admin endpoint
      */
-    protected function _getCore()
-    {
+    protected function _getCore() {
         return $this->core;
     }
 
@@ -512,8 +501,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -524,8 +512,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -536,8 +523,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -548,8 +534,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -562,8 +547,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -576,8 +560,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -590,8 +573,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -604,8 +586,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -627,8 +608,7 @@ 
      *
      * @return bool true if variable is set and not empty, false otherwise
      */
-    public function __isset($var)
-    {
+    public function __isset($var) {
         return !empty($this->__get($var));
     }
 
@@ -642,8 +622,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -664,8 +643,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.