Erikmitk / kitodo-presentation

Classes/Plugin/Tools/FulltextTool.php

Spacing +6 added lines, -6 removed lines

@@ -84,14 +84,14 @@
         }
         if (!empty($fullTextFile)) {
             $markerArray['###FULLTEXT_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-fulltext" title="" data-dic="'
-            . 'fulltext:' . htmlspecialchars($this->pi_getLL('fulltext', ''))
-            . ';fulltext-on:' . htmlspecialchars($this->pi_getLL('fulltext-on', ''))
-            . ';fulltext-off:' . htmlspecialchars($this->pi_getLL('fulltext-off', ''))
-            . ';activate-full-text-initially:' . MathUtility::forceIntegerInRange($this->conf['activateFullTextInitially'], 0, 1, 0)
-            . ';full-text-scroll-element:' . $this->conf['fullTextScrollElement']
+            . 'fulltext:'.htmlspecialchars($this->pi_getLL('fulltext', ''))
+            . ';fulltext-on:'.htmlspecialchars($this->pi_getLL('fulltext-on', ''))
+            . ';fulltext-off:'.htmlspecialchars($this->pi_getLL('fulltext-off', ''))
+            . ';activate-full-text-initially:'.MathUtility::forceIntegerInRange($this->conf['activateFullTextInitially'], 0, 1, 0)
+            . ';full-text-scroll-element:'.$this->conf['fullTextScrollElement']
             . '">&nbsp;</a>';
         } else {
-            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">' . htmlspecialchars($this->pi_getLL('fulltext-not-available', '')) . '</span>';
+            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">'.htmlspecialchars($this->pi_getLL('fulltext-not-available', '')).'</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Classes/Plugin/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      */
     private function getQuery($fields, $parameters)
     {
-        return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
+        return $fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$fields['uid'].':'.$this->getUid($parameters['uid']);
     }
 
     /**

Classes/Common/Document.php

Spacing +16 added lines, -16 removed lines

@@ -681,14 +681,14 @@ 
                     if ($fileContent !== false) {
                         $textFormat = $this->getTextFormat($fileContent);
                     } else {
-                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
+                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "'.$id.'"');
                         return $fullText;
                     }
                     break;
                 }
             }
         } else {
-            $this->logger->warning('Invalid structure node @ID "' . $id . '"');
+            $this->logger->warning('Invalid structure node @ID "'.$id.'"');
             return $fullText;
         }
         // Is this text format supported?
@@ -707,12 +707,12 @@ 
                     $textMiniOcr = $obj->getTextAsMiniOcr($ocrTextXml);
                     $this->rawTextArray[$id] = $textMiniOcr;
                 } else {
-                    $this->logger->warning('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"');
+                    $this->logger->warning('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"');
                 }
             }
             $fullText = $textMiniOcr;
         } else {
-            $this->logger->warning('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"');
+            $this->logger->warning('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"');
         }
         return $fullText;
     }
@@ -807,10 +807,10 @@ 
                     $title = self::getTitle($partof, true);
                 }
             } else {
-                $logger->warning('No document with UID ' . $uid . ' found or document not accessible');
+                $logger->warning('No document with UID '.$uid.' found or document not accessible');
             }
         } else {
-            $logger->error('Invalid UID ' . $uid . ' for document');
+            $logger->error('Invalid UID '.$uid.' for document');
         }
         return $title;
     }
@@ -945,7 +945,7 @@ 
             // the actual loading is format specific
             return $this->loadLocation($location);
         } else {
-            $this->logger->error('Invalid file location "' . $location . '" for document loading');
+            $this->logger->error('Invalid file location "'.$location.'" for document loading');
         }
         return false;
     }
@@ -1055,7 +1055,7 @@ 
             // Retain current PID.
             $pid = $this->pid;
         } elseif (!$pid) {
-            $this->logger->error('Invalid PID ' . $pid . ' for document saving');
+            $this->logger->error('Invalid PID '.$pid.' for document saving');
             return false;
         }
         // Set PID for metadata definitions.
@@ -1092,7 +1092,7 @@ 
         if ($resArray = $result->fetch()) {
             $structure = $resArray['uid'];
         } else {
-            $this->logger->error('Could not identify document/structure type "' . $queryBuilder->expr()->literal($metadata['type'][0]) . '"');
+            $this->logger->error('Could not identify document/structure type "'.$queryBuilder->expr()->literal($metadata['type'][0]).'"');
             return false;
         }
         $metadata['type'][0] = $structure;
@@ -1341,7 +1341,7 @@ 
         if ($core) {
             return Indexer::add($this, $core);
         } else {
-            $this->logger->notice('Invalid UID "' . $core . '" for Solr core');
+            $this->logger->notice('Invalid UID "'.$core.'" for Solr core');
             return false;
         }
     }
@@ -1419,7 +1419,7 @@ 
         // Set metadata definitions' PID.
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
         if (!$cPid) {
-            $this->logger->error('Invalid PID ' . $cPid . ' for metadata definitions');
+            $this->logger->error('Invalid PID '.$cPid.' for metadata definitions');
             return [];
         }
         if (
@@ -1747,7 +1747,7 @@ 
             // Document ready!
             $this->ready = true;
         } else {
-            $this->logger->error('No document with UID ' . $uid . ' found or document not accessible');
+            $this->logger->error('No document with UID '.$uid.' found or document not accessible');
         }
     }
 
@@ -1762,12 +1762,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();
@@ -1800,12 +1800,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);
         }

Classes/Common/DocumentList.php

Spacing +17 added lines, -17 removed lines

@@ -139,7 +139,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;
         }
     }
@@ -267,7 +267,7 @@ 
 
         $query = $this->solr->service->createSelect();
         // Restrict the fields to the required ones
-        $query->setFields($fields['uid'] . ',' . $fields['id'] . ',' . $fields['toplevel'] . ',' . $fields['thumbnail'] . ',' . $fields['page']);
+        $query->setFields($fields['uid'].','.$fields['id'].','.$fields['toplevel'].','.$fields['thumbnail'].','.$fields['page']);
         foreach ($this->solrConfig as $solr_name) {
             $query->addField($solr_name);
         }
@@ -280,16 +280,16 @@ 
         // Extend filter query to get all documents with the same UID.
         foreach ($filterQueries as $key => $value) {
             if (isset($value['query'])) {
-                $filterQuery[$key] = $value['query'] . ' OR ' . $fields['toplevel'] . ':true';
+                $filterQuery[$key] = $value['query'].' OR '.$fields['toplevel'].':true';
                 $filterQuery = [
                     'key' => $key,
-                    'query' => $value['query'] . ' OR ' . $fields['toplevel'] . ':true'
+                    'query' => $value['query'].' OR '.$fields['toplevel'].':true'
                 ];
                 $query->addFilterQuery($filterQuery);
             }
         }
         // Add filter query to get all documents with the required uid.
-        $query->createFilterQuery('uid')->setQuery($fields['uid'] . ':' . Solr::escapeQuery($record['uid']));
+        $query->createFilterQuery('uid')->setQuery($fields['uid'].':'.Solr::escapeQuery($record['uid']));
         // Add sorting.
         if (is_array($this->metadata['options']['params']['sort'])) {
             foreach ($this->metadata['options']['params']['sort'] as $key => $direction) {
@@ -297,7 +297,7 @@ 
             }
         }
         // Set query.
-        $query->setQuery($this->metadata['options']['select'] . ' OR ' . $fields['toplevel'] . ':true');
+        $query->setQuery($this->metadata['options']['select'].' OR '.$fields['toplevel'].':true');
 
         // If it is a fulltext search, enable highlighting.
         if ($this->metadata['fulltextSearch']) {
@@ -405,7 +405,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);
@@ -413,7 +413,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);
@@ -491,7 +491,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;
         }
     }
@@ -535,7 +535,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);
@@ -560,7 +560,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);
@@ -653,7 +653,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';
@@ -681,7 +681,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;
             }
@@ -819,12 +819,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();
@@ -857,12 +857,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);
         }

Classes/Common/SolrSearchResult/Highlight.php

Spacing +1 added lines, -1 removed lines

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

Classes/Common/Indexer.php

Spacing +15 added lines, -15 removed lines

@@ -105,7 +105,7 @@ 
                 if ($parent->ready) {
                     $success = self::add($parent, $core);
                 } else {
-                    $logger->error('Could not load parent document with UID ' . $doc->parentId);
+                    $logger->error('Could not load parent document with UID '.$doc->parentId);
                     return false;
                 }
             }
@@ -114,7 +114,7 @@ 
                 self::$processedDocs[] = $doc->uid;
                 // Delete old Solr documents.
                 $updateQuery = self::$solr->service->createUpdate();
-                $updateQuery->addDeleteQuery('uid:' . $doc->uid);
+                $updateQuery->addDeleteQuery('uid:'.$doc->uid);
                 self::$solr->service->update($updateQuery);
 
                 // Index every logical unit as separate Solr document.
@@ -179,14 +179,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getMessage('flash.solrException', true) . '<br />' . htmlspecialchars($e->getMessage()),
+                        Helper::getMessage('flash.solrException', true).'<br />'.htmlspecialchars($e->getMessage()),
                         Helper::getMessage('flash.error', true),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                $logger->error('Apache Solr threw exception: "' . $e->getMessage() . '"');
+                $logger->error('Apache Solr threw exception: "'.$e->getMessage().'"');
                 return false;
             }
         } else {
@@ -221,7 +221,7 @@ 
         // Sanitize input.
         $pid = max(intval($pid), 0);
         if (!$pid) {
-            $logger->error('Invalid PID ' . $pid . ' for metadata configuration');
+            $logger->error('Invalid PID '.$pid.' for metadata configuration');
             return '';
         }
         // Load metadata configuration.
@@ -230,7 +230,7 @@ 
         $suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
         $suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
         $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
-        $index_name .= '_' . $suffix;
+        $index_name .= '_'.$suffix;
         return $index_name;
     }
 
@@ -340,7 +340,7 @@ 
             $updateQuery = self::$solr->service->createUpdate();
             $solrDoc = $updateQuery->createDocument();
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid . $logicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
             $solrDoc->setField('uid', $doc->uid);
             $solrDoc->setField('pid', $doc->pid);
             if (MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
@@ -381,11 +381,11 @@ 
                     $solrDoc->setField(self::getIndexFieldName($index_name, $doc->pid), $data, self::$fields['fieldboost'][$index_name]);
                     if (in_array($index_name, self::$fields['sortables'])) {
                         // Add sortable fields to index.
-                        $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]);
+                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
                     }
                     if (in_array($index_name, self::$fields['facets'])) {
                         // Add facets to index.
-                        $solrDoc->setField($index_name . '_faceting', $data);
+                        $solrDoc->setField($index_name.'_faceting', $data);
                     }
                     if (in_array($index_name, self::$fields['autocomplete'])) {
                         $autocomplete = array_merge($autocomplete, $data);
@@ -410,14 +410,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getMessage('flash.solrException', true) . '<br />' . htmlspecialchars($e->getMessage()),
+                        Helper::getMessage('flash.solrException', true).'<br />'.htmlspecialchars($e->getMessage()),
                         Helper::getMessage('flash.error', true),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                $logger->error('Apache Solr threw exception: "' . $e->getMessage() . '"');
+                $logger->error('Apache Solr threw exception: "'.$e->getMessage().'"');
                 return false;
             }
         }
@@ -457,7 +457,7 @@ 
             $updateQuery = self::$solr->service->createUpdate();
             $solrDoc = $updateQuery->createDocument();
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid . $physicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
             $solrDoc->setField('uid', $doc->uid);
             $solrDoc->setField('pid', $doc->pid);
             $solrDoc->setField('page', $page);
@@ -492,7 +492,7 @@ 
                             }
                         }
                         // Add facets to index.
-                        $solrDoc->setField($index_name . '_faceting', $data);
+                        $solrDoc->setField($index_name.'_faceting', $data);
                     }
                 }
             }
@@ -509,14 +509,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getMessage('flash.solrException', true) . '<br />' . htmlspecialchars($e->getMessage()),
+                        Helper::getMessage('flash.solrException', true).'<br />'.htmlspecialchars($e->getMessage()),
                         Helper::getMessage('flash.error', true),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                $logger->error('Apache Solr threw exception: "' . $e->getMessage() . '"');
+                $logger->error('Apache Solr threw exception: "'.$e->getMessage().'"');
                 return false;
             }
         }

Classes/Format/Alto.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
      */
     private function getWord($attributes)
     {
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
     }
 
     /**
@@ -115,6 +115,6 @@ 
      */
     private function getCoordinates($attributes)
     {
-        return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
+        return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT'];
     }
 }