Erikmitk / kitodo-presentation

Tests/routeFunctionalInstance.php

Spacing +3 added lines, -3 removed lines

@@ -15,10 +15,10 @@
 preg_match("@.*/(?:acceptance|functional-[a-z0-9]+)@", $_SERVER['REQUEST_URI'], $matches);
 
 if (!empty($matches)) {
-    $root = realpath($_SERVER['DOCUMENT_ROOT'] . $matches[0]);
+    $root = realpath($_SERVER['DOCUMENT_ROOT'].$matches[0]);
     if ($root !== false) {
-        putenv('TYPO3_PATH_ROOT=' . $root);
-        putenv('TYPO3_PATH_APP=' . $root);
+        putenv('TYPO3_PATH_ROOT='.$root);
+        putenv('TYPO3_PATH_APP='.$root);
     }
 }
 

Tests/Functional/FunctionalTestCase.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
 
         if ($this->disableJsonWrappedResponse) {
-            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function ($ext) {
+            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function($ext) {
                 return $ext !== 'Resources/Core/Functional/Extensions/json_response';
             });
         }
@@ -82,7 +82,7 @@ 
 
         $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 
-        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
+        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-'.$this->identifier.'/';
         $this->httpClient = new HttpClient([
             'base_uri' => $this->baseUrl,
             'http_errors' => false,
@@ -126,13 +126,13 @@ 
 
     protected function addSiteConfig($identifier, $baseUrl)
     {
-        $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
+        $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $baseUrl;
         $siteConfig['languages'][0]['base'] = $baseUrl;
 
-        $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
+        $siteConfigPath = $this->instancePath.'/typo3conf/sites/'.$identifier;
         @mkdir($siteConfigPath, 0775, true);
-        file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
+        file_put_contents($siteConfigPath.'/config.yaml', Yaml::dump($siteConfig));
     }
 
     protected function initializeRepository(string $className, int $storagePid)

Tests/Functional/Api/PageViewProxyTest.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
         ]);
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('This is some plain text test file.' . "\n", (string) $response->getBody());
+        $this->assertEquals('This is some plain text test file.'."\n", (string) $response->getBody());
     }
 
     /**

Tests/Functional/Api/OaiPmhTest.php

Spacing +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@ 
     {
         parent::setUp();
 
-        $this->oaiUrl = $this->baseUrl . '/index.php?id=' . $this->oaiPage;
-        $this->oaiUrlNoStoragePid = $this->baseUrl . '/index.php?id=' . $this->oaiPageNoStoragePid;
+        $this->oaiUrl = $this->baseUrl.'/index.php?id='.$this->oaiPage;
+        $this->oaiUrlNoStoragePid = $this->baseUrl.'/index.php?id='.$this->oaiPageNoStoragePid;
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/metadata.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/pages.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/pages.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/solrcores.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/metadata.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/pages.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/OaiPmh/pages.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/OaiPmh/solrcores.xml');
 
         $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
@@ -62,7 +62,7 @@ 
             $coreName = Solr::createCore();
             $solr = Solr::getInstance($coreName);
 
-            $this->importSolrDocuments($solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');
+            $this->importSolrDocuments($solr, __DIR__.'/../../Fixtures/Common/documents_1.solr.json');
         }
 
         $oaiCoreModel = $this->solrCoreRepository->findByUid(11001);
@@ -76,7 +76,7 @@ 
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
-        $documents = array_map(function ($jsonDoc) use ($updateQuery) {
+        $documents = array_map(function($jsonDoc) use ($updateQuery) {
             $document = $updateQuery->createDocument();
             foreach ($jsonDoc as $key => $value) {
                 $document->setField($key, $value);

Tests/Functional/Repository/DocumentRepositoryTest.php

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@
 
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/pages.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/pages.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml');
     }
 
     /**

Tests/Functional/Common/SolrIndexingTest.php

Spacing +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/metadata.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/metadata.xml');
     }
 
     /**

Classes/Controller/PageViewController.php

Spacing +10 added lines, -10 removed lines

@@ -146,11 +146,11 @@ 
                 $fulltext['mimetype'] = $this->document->getDoc()->getFileMimeType($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$page]]['files'][$fileGrpFulltext]);
                 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->settings['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->settings['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -168,12 +168,12 @@ 
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->settings['elementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->settings['elementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });';
@@ -274,11 +274,11 @@ 
                 }
                 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->settings['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->settings['fileGrpImages'].'"');
         }
         return $image;
     }

Build/Documentation/dbdocs/Generator.php

Spacing +5 added lines, -5 removed lines

@@ -183,7 +183,7 @@ 
 
             // There may be a single non-signifying space after the doc-comment asterisk,
             // which is not included.
-            $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line) . "\n";
+            $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line)."\n";
         }
         $text = trim($text);
 
@@ -204,7 +204,7 @@ 
 RST);
 
         // Sort tables alphabetically
-        usort($tables, function ($lhs, $rhs) {
+        usort($tables, function($lhs, $rhs) {
             return $lhs->name <=> $rhs->name;
         });
 
@@ -214,13 +214,13 @@ 
             // Set header
             $header = $tableInfo->name;
             if (!empty($tableInfo->feComment)) {
-                $header .= ': ' . $tableInfo->feComment;
+                $header .= ': '.$tableInfo->feComment;
             }
             $section->setHeader($header);
 
             // Set introductory text of subsection
             if ($tableInfo->modelClass) {
-                $section->addText('Extbase domain model: ``' . $tableInfo->modelClass . '``');
+                $section->addText('Extbase domain model: ``'.$tableInfo->modelClass.'``');
             }
             $section->addText($tableInfo->classComment);
             $section->addText($tableInfo->sqlComment);
@@ -231,7 +231,7 @@ 
                 'description' => 'Description',
             ]];
 
-            $rows = array_map(function ($column) use ($page) {
+            $rows = array_map(function($column) use ($page) {
                 return [
                     'field' => (
                         $page->format($column->name, ['bold' => $column->isPrimary])

Classes/Controller/BasketController.php

Spacing +26 added lines, -26 removed lines

@@ -109,7 +109,7 @@ 
                 foreach ($this->requestData['selected'] as $docValue) {
                     if ($docValue['id']) {
                         $docData = $this->getDocumentData($docValue['id'], $docValue);
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                         $this->redirectToUri($pdfUrl);
                     }
                 }
@@ -172,7 +172,7 @@ 
         if ($allMails->count() > 0) {
             $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf'));
             foreach ($allMails as $mail) {
-                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')';
+                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')';
             }
             $this->view->assign('mailSelect', $mailSelect);
         }
@@ -256,12 +256,12 @@ 
 
         $entryArray['BASKETDATA'] = $docData;
 
-        $entryKey = $id . '_' . $startpage;
+        $entryKey = $id.'_'.$startpage;
         if (!empty($startX)) {
-            $entryKey .= '_' . $startX;
+            $entryKey .= '_'.$startX;
         }
         if (!empty($endX)) {
-            $entryKey .= '_' . $endX;
+            $entryKey .= '_'.$endX;
         }
 
         $entryArray['id'] = $id;
@@ -312,7 +312,7 @@ 
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams);
 
-            $downloadUrl = $this->settings['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->settings['pdfgenerate'].$urlParams;
 
             $title = $this->document->getTitle();
             if (empty($title)) {
@@ -323,15 +323,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' ';
+                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'];
             } else {
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -407,12 +407,12 @@ 
             if ($_piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $this->document->getDoc()->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -431,14 +431,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams;
                 if ($this->settings['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -476,12 +476,12 @@ 
         }
         foreach ($_piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (!empty($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (!empty($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -514,7 +514,7 @@ 
 
         $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst();
 
-        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n";
+        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->settings['pdfdownload'];
         // prepare links
@@ -522,7 +522,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData($explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -533,7 +533,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php');
         // Hook for getting a customized mail body.
@@ -560,7 +560,7 @@ 
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
         $newActionLog->setFileName($pdfUrl);
         $newActionLog->setCountPages($numberOfPages);
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
 
         if ($GLOBALS["TSFE"]->loginUser) {
             // internal user
@@ -592,7 +592,7 @@ 
         foreach ($this->requestData['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -610,7 +610,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -627,12 +627,12 @@ 
             // internal user
             $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']);
             $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']);
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         } else {
             // external user
             $actionLog->setUserId(0);
             $actionLog->setName('n/a');
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         }
         // add action to protocol
         $this->actionLogRepository->add($actionLog);