Erikmitk / kitodo-presentation

Classes/Task/BaseAdditionalFieldProvider.php

Spacing +17 added lines, -17 removed lines

@@ -62,7 +62,7 @@ 
 
         if (isset($submittedData['doc']) && empty($submittedData['doc'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.doc').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -73,7 +73,7 @@ 
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.pid').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -100,7 +100,7 @@ 
 
         if ((isset($submittedData['lib']) && (int) $submittedData['lib'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.lib').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -111,7 +111,7 @@ 
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.solr').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -192,8 +192,8 @@ 
     protected function getDryRunField(bool $dryRun): array
     {
         $fieldName = 'dryRun';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($dryRun ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($dryRun ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.dryRun',
@@ -215,15 +215,15 @@ 
     protected function getSolrField(int $solr, int $pid = null): array
     {
         $fieldName = 'solr';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $allSolrCores = $this->getSolrCores($pid);
         $options = [];
         $options[] = '<option value="-1"></option>';
         foreach ($allSolrCores as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . ($solr == $uid ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.($solr == $uid ? 'selected' : '').' >'.$label.'</option>';
         };
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.solr',
@@ -244,7 +244,7 @@ 
     protected function getPidField(int $pid): array
     {
         $fieldName = 'pid';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class);
         $pages = $pageRepository->getTree(0);
@@ -252,11 +252,11 @@ 
         $options = [];
         foreach ($pages['_children'] as $page) {
             if ($page['doktype'] == 254) {
-                $options[] = '<option value="' . $page['uid'] . '" ' . ($pid == $page['uid'] ? 'selected' : '') . ' >' . $page['title'] . '</option>';
+                $options[] = '<option value="'.$page['uid'].'" '.($pid == $page['uid'] ? 'selected' : '').' >'.$page['title'].'</option>';
             }
         }
 
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.pid',
@@ -277,8 +277,8 @@ 
     protected function getOwnerField(string $owner): array
     {
         $fieldName = 'owner';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $owner . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$owner.'" >';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.owner',
@@ -312,7 +312,7 @@ 
         $result = $queryBuilder->execute();
 
         while ($record = $result->fetchAssociative()) {
-            $solrCores[$record['label'] . ' (' . $record['index_name'] . ')'] = $record['uid'];
+            $solrCores[$record['label'].' ('.$record['index_name'].')'] = $record['uid'];
         }
 
         return $solrCores;
@@ -330,8 +330,8 @@ 
     protected function getSoftCommitField(bool $softCommit): array
     {
         $fieldName = 'softCommit';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($softCommit ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($softCommit ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.softCommit',

Classes/Task/DeleteAdditionalFieldProvider.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
 
         // Text field for document URL
         $fieldName = 'doc';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.doc',

Classes/Task/OptimizeAdditionalFieldProvider.php

Spacing +4 added lines, -4 removed lines

@@ -57,8 +57,8 @@ 
 
         // Checkbox for commit
         $fieldName = 'commit';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($taskInfo['commit'] ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($taskInfo['commit'] ? ' checked="checked"' : '').'>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.commit',
@@ -68,8 +68,8 @@ 
 
         // Checkbox for optimize
         $fieldName = 'optimize';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($taskInfo['optimize'] ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($taskInfo['optimize'] ? ' checked="checked"' : '').'>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.optimize',

Classes/Controller/ToolboxController.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
                         $this->renderToolByName('renderScoreTool');
                         break;
                     default:
-                        $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.');
+                        $this->logger->warning('Incorrect tool configuration: "'.$this->settings['tools'].'". Tool "'.$tool.'" does not exist.');
                 }
             }
         }
@@ -318,7 +318,7 @@ 
                 $file['url'] = $this->currentDocument->getDownloadLocation($fileId);
                 $file['mimetype'] = $this->currentDocument->getFileMimeType($fileId);
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $file;
@@ -426,7 +426,7 @@ 
             empty($firstPageLink)
             && empty($secondPageLink)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
 
         if (!empty($firstPageLink)) {
@@ -464,7 +464,7 @@ 
             }
         }
         if (empty($workLink)) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
         return $workLink;
     }

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -66,15 +66,15 @@ 
 $_EXTKEY = 'dlf';
 // Register tools for toolbox plugin.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = [];
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_scoretool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.scoretool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltexttool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.annotationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltextdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagedownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagemanipulationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_modeldownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.modeldownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.pdfdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.searchindocumenttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_scoretool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.scoretool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltexttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.annotationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltextdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagedownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagemanipulationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_modeldownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.modeldownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.pdfdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.searchindocumenttool';
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
@@ -112,7 +112,7 @@ 
 ];
 // Register AJAX eID handlers.
 if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['general']['enableInternalProxy'] ?? false) {
-    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
+    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class.'::main';
 }
 // Use Caching Framework for Solr queries
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] ??= [];

Classes/Command/SuggestBuildCommand.php

Spacing +2 added lines, -2 removed lines

@@ -74,12 +74,12 @@
         $solr = Solr::getInstance($input->getOption('solr'));
         // Connect to Solr server.
         if (!$solr->ready) {
-            $io->error('ERROR: Connection to Solr core ("' . $input->getOption('solr') . '") not possible \n');
+            $io->error('ERROR: Connection to Solr core ("'.$input->getOption('solr').'") not possible \n');
             return BaseCommand::FAILURE;
         }
 
         if (!$solr->suggestBuild()) {
-            $io->error('ERROR: Sending the command suggest.build=true to Solr core ("' . $input->getOption('solr') . '") not possible \n');
+            $io->error('ERROR: Sending the command suggest.build=true to Solr core ("'.$input->getOption('solr').'") not possible \n');
             return BaseCommand::FAILURE;
         }
 

Classes/Command/IndexCommand.php

Spacing +12 added lines, -12 removed lines

@@ -104,7 +104,7 @@ 
         $this->initializeRepositories((int) $input->getOption('pid'));
 
         if ($this->storagePid == 0) {
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
             return BaseCommand::FAILURE;
         }
 
@@ -119,13 +119,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $outputSolrCores = [];
                 foreach ($allSolrCores as $indexName => $uid) {
-                    $outputSolrCores[] = $uid . ' : ' . $indexName;
+                    $outputSolrCores[] = $uid.' : '.$indexName;
                 }
                 if (empty($outputSolrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
                     return BaseCommand::FAILURE;
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n");
                     return BaseCommand::FAILURE;
                 }
             }
@@ -165,7 +165,7 @@ 
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
 
             if ($document === null) {
-                $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
+                $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .');
                 return BaseCommand::FAILURE;
             } else {
                 $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
@@ -178,31 +178,31 @@ 
         }
 
         if ($doc === null) {
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
             return BaseCommand::FAILURE;
         }
 
         $document->setSolrcore($solrCoreUid);
 
         if ($dryRun) {
-            $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
+            $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
             $io->success('All done!');
             return BaseCommand::SUCCESS;
         } else {
             $document->setCurrentDocument($doc);
 
             if ($io->isVerbose()) {
-                $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . '.');
+                $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.'.');
             }
             $isSaved = $this->saveToDatabase($document, $input->getOption('softCommit'));
 
             if ($isSaved) {
                 if ($io->isVerbose()) {
-                    $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on Solr core ' . $solrCoreUid . '.');
+                    $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on Solr core '.$solrCoreUid.'.');
                 }
                 $isSaved = Indexer::add($document, $this->documentRepository, $input->getOption('softCommit'));
             } else {
-                $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on PID ' . $this->storagePid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['general']['requiredMetadataFields'] . ') in this document.');
+                $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on PID '.$this->storagePid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['general']['requiredMetadataFields'].') in this document.');
                 return BaseCommand::FAILURE;
             }
 
@@ -211,8 +211,8 @@ 
                 return BaseCommand::SUCCESS;
             }
 
-            $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on Solr core ' . $solrCoreUid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['general']['requiredMetadataFields'] . ') in this document.');
-            $io->info('INFO: Document with UID "' . $document->getUid() . '" is already in database. If you want to keep the database and index consistent you need to remove it.');
+            $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on Solr core '.$solrCoreUid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['general']['requiredMetadataFields'].') in this document.');
+            $io->info('INFO: Document with UID "'.$document->getUid().'" is already in database. If you want to keep the database and index consistent you need to remove it.');
             return BaseCommand::FAILURE;
         }
     }

Classes/Controller/PageViewController.php

Spacing +20 added lines, -20 removed lines

@@ -181,18 +181,18 @@ 
             }
 
             $navigationArray[$i]['next'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
             ];
             $navigationArray[$i]['prev'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
             ];
 
             $navigateAllPageNext = array_merge(
                 $navigateAllPageNext,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
                 ]
             );
@@ -200,7 +200,7 @@ 
             $navigateAllPagePrev = array_merge(
                 $navigateAllPagePrev,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
                 ]
             );
@@ -208,7 +208,7 @@ 
             $navigateAllMeasureNext = array_merge(
                 $navigateAllMeasureNext,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ]
             );
@@ -216,19 +216,19 @@ 
             $navigateAllMeasurePrev = array_merge(
                 $navigateAllMeasurePrev,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ]
             );
 
             if ($document->numMeasures > 0) {
                 $navigationMeasureArray[$i]['next'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ];
 
                 $navigationMeasureArray[$i]['prev'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ];
             }
@@ -282,7 +282,7 @@ 
             }
             $params = array_merge(
                 ['tx_dlf' => $this->requestData],
-                ['tx_dlf[multipleSource][' . $nextMultipleSourceKey . ']' => $formAddDocument->getLocation()],
+                ['tx_dlf[multipleSource]['.$nextMultipleSourceKey.']' => $formAddDocument->getLocation()],
                 ['tx_dlf[multiview]' => 1]
             );
             $uriBuilder = $this->uriBuilder;
@@ -329,7 +329,7 @@ 
                             // build link for each measure
                             $params = [
                                 'tx_dlf' => $this->requestData,
-                                'tx_dlf[docMeasure][' . $docNumber . ']' => $i
+                                'tx_dlf[docMeasure]['.$docNumber.']' => $i
                             ];
                         } else {
                             // build link for each measure
@@ -413,7 +413,7 @@ 
         }
 
         if (empty($score)) {
-            $this->logger->notice('No score file found for page "' . $page . '" in fileGrps "' . $this->settings['fileGrpScore'] . '"');
+            $this->logger->notice('No score file found for page "'.$page.'" in fileGrps "'.$this->settings['fileGrpScore'].'"');
         }
         return $score;
     }
@@ -444,11 +444,11 @@ 
                 $fulltext['mimetype'] = $file['mimeType'];
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -508,7 +508,7 @@ 
                         'measureIdLinks' => $docMeasures['measureLinks']
                     ];
 
-                    $jsViewer .= 'tx_dlf_viewer[' . $i . '] = new dlfViewer(' . json_encode($viewer) . ');
+                    $jsViewer .= 'tx_dlf_viewer['.$i.'] = new dlfViewer('.json_encode($viewer).');
                             ';
                     $i++;
                 }
@@ -517,8 +517,8 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        ' . $jsViewer . '
-                        viewerCount = ' . ($i - 1) . ';
+                        ' . $jsViewer.'
+                        viewerCount = ' . ($i - 1).';
                     }
                 });';
         } else {
@@ -548,7 +548,7 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer) . ');
+                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer).');
                     }
                 });';
         }
@@ -644,7 +644,7 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
 
             } else {
@@ -664,12 +664,12 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
         }
         return $image;
     }