Erikmitk / kitodo-presentation

Tests/Functional/Common/HelperTest.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     {
         parent::setUp();
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/libraries.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/metadata.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/libraries.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/metadata.csv');
     }
 
     /**

Tests/Functional/Common/SolrSearchTest.php

Spacing +2 added lines, -2 removed lines

@@ -21,11 +21,11 @@
 class SolrSearchTest extends FunctionalTestCase
 {
     private static array $databaseFixtures = [
-        __DIR__ . '/../../Fixtures/Common/solrcores.csv'
+        __DIR__.'/../../Fixtures/Common/solrcores.csv'
     ];
 
     private static array $solrFixtures = [
-        __DIR__ . '/../../Fixtures/Common/documents_1.solr.json'
+        __DIR__.'/../../Fixtures/Common/documents_1.solr.json'
     ];
 
     private Solr $solr;

Tests/Functional/Common/SolrIndexingTest.php

Spacing +6 added lines, -6 removed lines

@@ -45,9 +45,9 @@ 
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/libraries.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/metadata.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/documents_1.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/libraries.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/metadata.csv');
     }
 
     /**
@@ -128,9 +128,9 @@ 
     {
         $core = $this->createSolrCore();
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_fulltext.csv');
-        $this->importSolrDocuments($core->solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');
-        $this->importSolrDocuments($core->solr, __DIR__ . '/../../Fixtures/Common/documents_fulltext.solr.json');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/documents_fulltext.csv');
+        $this->importSolrDocuments($core->solr, __DIR__.'/../../Fixtures/Common/documents_1.solr.json');
+        $this->importSolrDocuments($core->solr, __DIR__.'/../../Fixtures/Common/documents_fulltext.solr.json');
 
         $collections = $this->collectionRepository->findCollectionsBySettings([
             'index_name' => ['Musik', 'Projekt: Dresdner Hefte'],

Tests/Functional/Common/SolrSearchQueryTest.php

Spacing +4 added lines, -4 removed lines

@@ -23,13 +23,13 @@
     private $solrCoreRepository;
 
     private static array $databaseFixtures = [
-        __DIR__ . '/../../Fixtures/Common/documents_1.csv',
-        __DIR__ . '/../../Fixtures/Common/pages.csv',
-        __DIR__ . '/../../Fixtures/Common/solrcores.csv'
+        __DIR__.'/../../Fixtures/Common/documents_1.csv',
+        __DIR__.'/../../Fixtures/Common/pages.csv',
+        __DIR__.'/../../Fixtures/Common/solrcores.csv'
     ];
 
     private static array $solrFixtures = [
-        __DIR__ . '/../../Fixtures/Common/documents_1.solr.json'
+        __DIR__.'/../../Fixtures/Common/documents_1.solr.json'
     ];
 
     public function setUp(): void

Tests/Functional/Common/SolrTest.php

Spacing +4 added lines, -4 removed lines

@@ -21,13 +21,13 @@
 {
 
     private static array $databaseFixtures = [
-        __DIR__ . '/../../Fixtures/Common/documents_1.csv',
-        __DIR__ . '/../../Fixtures/Common/pages.csv',
-        __DIR__ . '/../../Fixtures/Common/solrcores.csv'
+        __DIR__.'/../../Fixtures/Common/documents_1.csv',
+        __DIR__.'/../../Fixtures/Common/pages.csv',
+        __DIR__.'/../../Fixtures/Common/solrcores.csv'
     ];
 
     private static array $solrFixtures = [
-        __DIR__ . '/../../Fixtures/Common/documents_1.solr.json'
+        __DIR__.'/../../Fixtures/Common/documents_1.solr.json'
     ];
 
     /**

Tests/Functional/FunctionalTestCase.php

Spacing +7 added lines, -7 removed lines

@@ -98,7 +98,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';
             });
         }
@@ -111,9 +111,9 @@ 
         $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::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 . 'index.php',
+            'base_uri' => $this->baseUrl.'index.php',
             'http_errors' => false,
         ]);
 
@@ -164,13 +164,13 @@ 
 
     protected function addSiteConfig($identifier)
     {
-        $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
+        $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $this->baseUrl;
         $siteConfig['languages'][0]['base'] = $this->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)
@@ -189,7 +189,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);

Classes/Controller/ToolboxController.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
                         $this->renderToolByName('renderSearchInDocumentTool');
                         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.');
                 }
             }
         }
@@ -262,7 +262,7 @@ 
                 }
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $image;
@@ -346,7 +346,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)) {
@@ -384,7 +384,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;
     }

Classes/Controller/PageViewController.php

Spacing +11 added lines, -11 removed lines

@@ -119,11 +119,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;
     }
@@ -141,13 +141,13 @@ 
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->settings['elementId'] . '",
-                        progressElementId: "' . $this->settings['progressElementId'] . '",
-                        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'].'",
+                        progressElementId: "' . $this->settings['progressElementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });';
@@ -240,11 +240,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->extConf['files']['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
         }
         return $image;
     }

Tests/Functional/Common/MetsDocumentTest.php

Spacing +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@
     {
         parent::setUp();
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/metadata.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/MetsDocument/metadata_mets.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/documents_1.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/metadata.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/MetsDocument/metadata_mets.csv');
     }
 
     protected function doc(string $file)
     {
-        $url = 'http://web:8001/Tests/Fixtures/MetsDocument/' . $file;
+        $url = 'http://web:8001/Tests/Fixtures/MetsDocument/'.$file;
         $doc = AbstractDocument::getInstance($url, ['general' => ['useExternalApisForMetadata' => 0]]);
         self::assertNotNull($doc);
         return $doc;