Erikmitk / kitodo-presentation

Classes/Middleware/DOMDocumentValidation.php

Spacing +3 added lines, -3 removed lines

@@ -78,19 +78,19 @@
         $validation = GeneralUtility::makeInstance(DOMDocumentValidationStack::class, $settings['domDocumentValidationValidators']);
 
         if (!GeneralUtility::isValidUrl($urlParam)) {
-            $this->logger->debug('Parameter "' . $urlParam . '" is not a valid url.');
+            $this->logger->debug('Parameter "'.$urlParam.'" is not a valid url.');
             throw new InvalidArgumentException('Value of url parameter is not a valid url.', 1724852611);
         }
 
         $content = GeneralUtility::getUrl($urlParam);
         if ($content === false) {
-            $this->logger->debug('Error while loading content of "' . $urlParam . '"');
+            $this->logger->debug('Error while loading content of "'.$urlParam.'"');
             throw new InvalidArgumentException('Error while loading content of url.', 1724420640);
         }
 
         $document = new DOMDocument();
         if ($document->loadXML($content) === false) {
-            $this->logger->debug('Error converting content of "' . $urlParam . '" to xml.');
+            $this->logger->debug('Error converting content of "'.$urlParam.'" to xml.');
             throw new InvalidArgumentException('Error converting content to xml.', 1724420648);
         }
 

Tests/Unit/Validation/SaxonXslToSvrlValidatorTest.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
     {
         parent::setUp();
         $this->resetSingletonInstances = true;
-        $this->dlfExtensionPath = Environment::getExtensionsPath() . 'dlf';
+        $this->dlfExtensionPath = Environment::getExtensionsPath().'dlf';
     }
 
     public function testJarFileNotFound(): void
@@ -63,12 +63,12 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage("XSL Schematron file not found.");
         // It only checks if a file exists at the specified path, so we can use one of the test files.
-        new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml']);
+        new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml']);
     }
 
     public function testValidation(): void
     {
-        $saxonXslToSvrlValidator = new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml', "xsl" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml']);
+        $saxonXslToSvrlValidator = new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml', "xsl" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml']);
         $reflection = new ReflectionClass($saxonXslToSvrlValidator);
 
         $result = $reflection->getProperty("result");

Classes/Controller/AbstractController.php

Spacing +10 added lines, -10 removed lines

@@ -164,11 +164,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');
         }
     }
 
@@ -265,7 +265,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']);
         }
 
@@ -325,7 +325,7 @@ 
     {
         if (!array_key_exists($setting, $this->settings) || empty($this->settings[$setting])) {
             $this->settings[$setting] = $value;
-            $this->logger->warning('Setting "' . $setting . '" not set, using default value "' . $value . '". Probably FlexForm for controller "' . get_class($this) . '" is not read.');
+            $this->logger->warning('Setting "'.$setting.'" not set, using default value "'.$value.'". Probably FlexForm for controller "'.get_class($this).'" is not read.');
         } else {
             $this->settings[$setting] = (int) $this->settings[$setting];
         }
@@ -410,7 +410,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;
@@ -425,7 +425,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) {
@@ -468,7 +468,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]);
                 };
             };
         };
@@ -534,7 +534,7 @@ 
             // fix for count(): Argument #1 ($value) must be of type Countable|array, null given
             $this->documentArray[] = $doc;
         } 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;
@@ -572,7 +572,7 @@ 
             foreach ($this->requestData['multipleSource'] as $location) {
                 $document = AbstractDocument::getInstance($location, $this->settings, true);
                 if ($document !== null) {
-                    $this->documentArray['extra_' . $i] = $document;
+                    $this->documentArray['extra_'.$i] = $document;
                 }
                 $i++;
             }
@@ -596,7 +596,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/Hooks/DataHandler.php

Spacing +7 added lines, -7 removed lines

@@ -125,10 +125,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', (int) $id),
+                                $queryBuilder->expr()->eq($table.'.uid', (int) $id),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -151,10 +151,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', (int) $id),
+                                $queryBuilder->expr()->eq($table.'.uid', (int) $id),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -324,7 +324,7 @@ 
         if ($solr->ready) {
             // Delete Solr document.
             $updateQuery = $solr->service->createUpdate();
-            $updateQuery->addDeleteQuery('uid:' . (int) $id);
+            $updateQuery->addDeleteQuery('uid:'.(int) $id);
             $updateQuery->addCommit(false);
             $solr->service->update($updateQuery);
         }
@@ -348,7 +348,7 @@ 
             $document->setCurrentDocument($doc);
             Indexer::add($document, $documentRepository);
         } else {
-            $this->logger->error('Failed to re-index document with UID ' . (string) $id);
+            $this->logger->error('Failed to re-index document with UID '.(string) $id);
         }
     }
 
@@ -399,7 +399,7 @@ 
                     try {
                         $response = $solr->service->coreAdmin($query);
                         if ($response->getWasSuccessful() == false) {
-                            $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
+                            $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr');
                         }
                     } catch (\Exception $e) {
                         $this->logger->warning($e->getMessage());

Classes/Validation/AbstractDlfValidator.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     public function validate($value): Result
     {
         if (!$value instanceof $this->valueClassName) {
-            $this->logger->debug('Value must be an instance of ' . $this->valueClassName . '.');
+            $this->logger->debug('Value must be an instance of '.$this->valueClassName.'.');
             throw new InvalidArgumentException('Type of value is not valid.', 1723126505626);
         }
         return parent::validate($value);

Classes/Controller/ListViewController.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
         // extract collection(s) from collection parameter
         $collections = [];
         if (is_array($this->searchParams) && array_key_exists('collection', $this->searchParams)) {
-            foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
+            foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 if (!empty($collectionEntry)) {
                     $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
                 }
@@ -116,7 +116,7 @@ 
             $simplePagination = new SimplePagination($solrPaginator);
 
             $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-            $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+            $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
         }
 
         $this->view->assign('viewData', $this->viewData);

Classes/Controller/PageGridController.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,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/MetadataController.php

Spacing +3 added lines, -3 removed lines

@@ -131,7 +131,7 @@ 
         }
 
         if (empty(array_filter($metadata))) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->document->getUid());
+            $this->logger->warning('No metadata found for document with UID '.$this->document->getUid());
             return $this->htmlResponse();
         }
         ksort($metadata);
@@ -184,7 +184,7 @@ 
                     $this->parseMetadata($i, $name, $value, $metadata);
 
                     if (is_array($metadata[$i][$name])) {
-                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function ($metadataValue) {
+                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue) {
                             return !empty($metadataValue);
                         }));
                     }
@@ -401,7 +401,7 @@ 
         if (empty(implode('', $value)) && $this->settings['getTitle'] && $this->document->getPartof()) {
             $superiorTitle = AbstractDocument::getTitle($this->document->getPartof(), true);
             if (!empty($superiorTitle)) {
-                $metadata[$i]['title'] = ['[' . $superiorTitle . ']'];
+                $metadata[$i]['title'] = ['['.$superiorTitle.']'];
             }
         }
     }

Classes/Controller/PageViewController.php

Spacing +20 added lines, -20 removed lines

@@ -183,18 +183,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)
                 ]
             );
@@ -202,7 +202,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)
                 ]
             );
@@ -210,7 +210,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)
                 ]
             );
@@ -218,19 +218,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)
                 ];
             }
@@ -284,7 +284,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;
@@ -332,7 +332,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
@@ -416,7 +416,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;
     }
@@ -447,11 +447,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;
     }
@@ -511,7 +511,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++;
                 }
@@ -520,8 +520,8 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        ' . $jsViewer . '
-                        viewerCount = ' . ($i - 1) . ';
+                        ' . $jsViewer.'
+                        viewerCount = ' . ($i - 1).';
                     }
                 });';
         } else {
@@ -551,7 +551,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).');
                     }
                 });';
         }
@@ -647,7 +647,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 {
@@ -667,12 +667,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;
     }