Erikmitk / kitodo-presentation

Classes/Controller/AbstractController.php

Spacing +8 added lines, -8 removed lines

@@ -145,11 +145,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 
@@ -245,7 +245,7 @@ 
             && !MathUtility::canBeInterpretedAsInteger($this->requestData['id'])
             && !GeneralUtility::isValidUrl($this->requestData['id'])
         ) {
-            $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading');
+            $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading');
             unset($this->requestData['id']);
         }
 
@@ -331,7 +331,7 @@ 
         $pages = [];
         $pagesSect = [];
         $aRange = [];
-        $nRange = 5;    // ToDo: should be made configurable
+        $nRange = 5; // ToDo: should be made configurable
 
         // lower limit of the range
         $nBottom = $currentPageNumber - $nRange;
@@ -346,7 +346,7 @@ 
 
         // check whether the first screen page is > 1, if yes then points must be added
         if ($aRange[0] > 1) {
-            array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']);
+            array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']);
         };
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
@@ -389,7 +389,7 @@ 
 
                 // Check if screen page is in range
                 if (in_array($i, $aRange)) {
-                    array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]);
+                    array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]);
                 };
             };
         };
@@ -451,7 +451,7 @@ 
         if ($this->document) {
             $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
         } else {
-            $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
 
         return $doc;
@@ -489,7 +489,7 @@ 
 
             $this->document->setLocation($documentId);
         } else {
-            $this->logger->error('Invalid location given "' . $documentId . '" for document loading');
+            $this->logger->error('Invalid location given "'.$documentId.'" for document loading');
         }
 
         return $doc;

Classes/Controller/OaiPmhController.php

Spacing +11 added lines, -11 removed lines

@@ -250,10 +250,10 @@ 
             if ($root->item(0) instanceof \DOMNode) {
                 $mets = $xml->saveXML($root->item(0));
             } else {
-                $this->logger->error('No METS part found in document with location "' . $record['location'] . '"');
+                $this->logger->error('No METS part found in document with location "'.$record['location'].'"');
             }
         } else {
-            $this->logger->error('Could not load XML file from "' . $record['location'] . '"');
+            $this->logger->error('Could not load XML file from "'.$record['location'].'"');
         }
         return $mets;
     }
@@ -421,7 +421,7 @@ 
             $pageSettings = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
             $storagePid = $pageSettings["plugin."]["tx_dlf."]["persistence."]["storagePid"];
             if ($storagePid > 0) {
-                $this->logger->notice('No records found with PID ' . $storagePid);
+                $this->logger->notice('No records found with PID '.$storagePid);
             } else {
                 $this->logger->notice('No records found');
             }
@@ -504,7 +504,7 @@ 
             if (!empty($resArray)) {
                 // check, if all required fields are available for a given identifier
                 foreach ($details['requiredFields'] as $required) {
-                    $methodName = 'get' . GeneralUtility::underscoredToUpperCamelCase($required);
+                    $methodName = 'get'.GeneralUtility::underscoredToUpperCamelCase($required);
                     if (empty($resArray->$methodName())) {
                         // Skip metadata formats whose requirements are not met.
                         continue 2;
@@ -610,9 +610,9 @@ 
             $resArray = $result->fetchAssociative();
             if ($resArray) {
                 if ($resArray['index_query'] != "") {
-                    $solrQuery .= '(' . $resArray['index_query'] . ')';
+                    $solrQuery .= '('.$resArray['index_query'].')';
                 } else {
-                    $solrQuery .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                    $solrQuery .= 'collection:'.'"'.$resArray['index_name'].'"';
                 }
             } else {
                 $this->error = 'noSetHierarchy';
@@ -624,7 +624,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->parameters['metadataPrefix']]['requiredFields'] as $required) {
-            $solrQuery .= ' NOT ' . $required . ':""';
+            $solrQuery .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solrQuery .= ' AND toplevel:true';
@@ -638,7 +638,7 @@ 
             return $documentSet;
         }
 
-        $solrQuery .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solrQuery .= ' AND timestamp:['.$from.' TO '.$until.']';
 
         $solr = Solr::getInstance($this->settings['solrcore']);
         if (!$solr->ready) {
@@ -729,7 +729,7 @@ 
      */
     private function getDate(string $dateType)
     {
-        return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ?: strptime($this->parameters[$dateType], '%Y-%m-%d');
+        return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ? : strptime($this->parameters[$dateType], '%Y-%m-%d');
     }
 
     /**
@@ -752,7 +752,7 @@ 
             $date['tm_mday'],
             $date['tm_year'] + 1900
         );
-        return date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . $end;
+        return date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).$end;
     }
 
     /**
@@ -865,7 +865,7 @@ 
         $resumptionTokenInfo['cursor'] = $currentCursor;
         $resumptionTokenInfo['completeListSize'] = $documentListSet['metadata']['completeListSize'];
         $expireDateTime = new \DateTime();
-        $expireDateTime->add(new \DateInterval('PT' . $this->settings['expired'] . 'S'));
+        $expireDateTime->add(new \DateInterval('PT'.$this->settings['expired'].'S'));
         $resumptionTokenInfo['expired'] = $expireDateTime;
 
         $omitResumptionToken = $currentCursor === 0 && $numShownDocuments >= $documentListSet['metadata']['completeListSize'];

Classes/Controller/NavigationController.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getCurrentDocument()->numPages; $i++) {
             $orderLabel = $this->document->getCurrentDocument()->physicalStructureInfo[$this->document->getCurrentDocument()->physicalStructure[$i]]['orderlabel'];
-            $pageOptions[$i] = '[' . $i . ']' . ($orderLabel ? ' - ' . htmlspecialchars($orderLabel) : '');
+            $pageOptions[$i] = '['.$i.']'.($orderLabel ? ' - '.htmlspecialchars($orderLabel) : '');
         }
         $this->view->assign('pageOptions', $pageOptions);
 

Classes/Controller/PageGridController.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         $pageGridPagination = new PageGridPagination($pageGridPaginator);
 
         $pagination = $this->buildSimplePagination($pageGridPagination, $pageGridPaginator);
-        $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $pageGridPaginator ]);
+        $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $pageGridPaginator]);
 
         $this->view->assign('docUid', $this->requestData['id']);
     }

Classes/Controller/TableOfContentsController.php

Spacing +5 added lines, -5 removed lines

@@ -197,7 +197,7 @@ 
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
         }
         return $entryArray;
     }
@@ -309,9 +309,9 @@ 
                     $title = '';
                     foreach ($fields as $field) {
                         if ($field == 'type') {
-                            $title .= $this->getTranslatedType($entry['type']) . ' ';
+                            $title .= $this->getTranslatedType($entry['type']).' ';
                         } else {
-                            $title .= $entry[$field] . ' ';
+                            $title .= $entry[$field].' ';
                         }
                     }
         
@@ -319,7 +319,7 @@ 
                 }
             }
         }
-        return $entry['label'] ?: $entry['orderlabel'];
+        return $entry['label'] ? : $entry['orderlabel'];
     }
 
     /**
@@ -352,7 +352,7 @@ 
      */
     private function sortSubMenu(array &$menu): void
     {
-        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement) {
+        usort($menu[0]['_SUB_MENU'], function($firstElement, $secondElement) {
             if (!empty($firstElement['orderlabel'])) {
                 return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
             }

Classes/Controller/FeedsController.php

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
         if ($library) {
             $feedMeta['copyright'] = $library->getLabel();
         } else {
-            $this->logger->error('Failed to fetch label of selected library with "' . $this->settings['library'] . '"');
+            $this->logger->error('Failed to fetch label of selected library with "'.$this->settings['library'].'"');
         }
 
         if (
@@ -95,12 +95,12 @@ 
                 ) {
                     $superiorTitle = AbstractDocument::getTitle($document->getPartof(), true);
                     if (!empty($superiorTitle)) {
-                        $title .= '[' . $superiorTitle . ']';
+                        $title .= '['.$superiorTitle.']';
                     }
                 }
                 // Get title of document.
                 if (!empty($document->getTitle())) {
-                    $title .= ' ' . $document->getTitle();
+                    $title .= ' '.$document->getTitle();
                 }
                 // Set default title if empty.
                 if (empty($title)) {
@@ -108,13 +108,13 @@ 
                 }
                 // Append volume information.
                 if (!empty($document->getVolume())) {
-                    $title .= ', ' . LocalizationUtility::translate('volume', 'dlf') . ' ' . $document->getVolume();
+                    $title .= ', '.LocalizationUtility::translate('volume', 'dlf').' '.$document->getVolume();
                 }
                 // Is this document new or updated?
                 if ($document->getCrdate() == $document->getTstamp()) {
-                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf').' '.trim($title);
                 } else {
-                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf').' '.trim($title);
                 }
 
                 $document->setTitle($title);

Classes/Controller/CalendarController.php

Spacing +11 added lines, -11 removed lines

@@ -134,8 +134,8 @@ 
         $this->view->assign('calendarData', $calendarData);
         $this->view->assign('documentId', $this->document->getUid());
         $this->view->assign('yearLinkTitle', $yearLinkTitle);
-        $this->view->assign('parentDocumentId', $this->document->getPartof() ?: $this->document->getCurrentDocument()->tableOfContents[0]['points']);
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getCurrentDocument()->tableOfContents[0]['points']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
     }
 
     /**
@@ -220,7 +220,7 @@ 
         }
 
         $this->view->assign('documentId', $this->document->getUid());
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
     }
 
     /**
@@ -239,7 +239,7 @@ 
     protected function getCalendarYear(array &$calendarData, array $calendarIssuesByMonth, int $year, int $firstMonth = 1, int $lastMonth = 12): void
     {
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
-            $key = $year . '-' . $i;
+            $key = $year.'-'.$i;
 
             $calendarData[$key] = [
                 'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
@@ -249,16 +249,16 @@ 
                 'DAYFRI_NAME' => strftime('%a', strtotime('last Friday')),
                 'DAYSAT_NAME' => strftime('%a', strtotime('last Saturday')),
                 'DAYSUN_NAME' => strftime('%a', strtotime('last Sunday')),
-                'MONTHNAME'  => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
+                'MONTHNAME'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
                 'CALYEAR' => ($i == $firstMonth) ? $year : ''
             ];
 
-            $firstOfMonth = strtotime($year . '-' . $i . '-1');
+            $firstOfMonth = strtotime($year.'-'.$i.'-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
                 $calendarData[$key]['week'][$j] = [
                     'DAYMON' => ['dayValue' => '&nbsp;'],
@@ -271,7 +271,7 @@ 
                 ];
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
                     if (
                         $currentDayTime >= $firstOfMonth
                         && $currentDayTime <= $lastOfMonth
@@ -342,7 +342,7 @@ 
      */
     private function fillCalendar(array &$calendarData, int $currentDayTime, string $dayLinks, array $dayLinkDiv, int $firstDayOfWeek, int $k): void
     {
-        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
             case '0':
                 $this->fillDay($calendarData, $currentDayTime, 'DAYSUN', $dayLinks, $dayLinkDiv);
                 break;
@@ -446,7 +446,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $issuesByYear[$_year][$_month][$_day][] = $issue;
             } else {
-                $this->logger->warning('Document with UID ' . $issue['uid'] . 'has no valid date of publication');
+                $this->logger->warning('Document with UID '.$issue['uid'].'has no valid date of publication');
             }
         }
         // Sort by years.
@@ -489,7 +489,7 @@ 
             foreach ($year['children'] as $month) {
                 foreach ($month['children'] as $day) {
                     foreach ($day['children'] as $issue) {
-                        $title = $issue['label'] ?: $issue['orderlabel'];
+                        $title = $issue['label'] ? : $issue['orderlabel'];
                         if (strtotime($title) !== false) {
                             $title = strftime('%x', strtotime($title));
                         }

Classes/Format/AudioVideoMD.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $metadata['video_duration'] = [$videoDuration];
         }
 
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
 
         if ($useExternalApis) {
             // TODO?

Classes/Format/Alto.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
             }
             return ' ';
         }
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     private function getCoordinates(\SimpleXMLElement $attributes): string
     {
-        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'];
     }
 
     /**