Erikmitk / kitodo-presentation

Classes/Common/AbstractDocument.php

Spacing +13 added lines, -13 removed lines

@@ -664,14 +664,14 @@ 
                     if ($fileContent !== false) {
                         $textFormat = $this->getTextFormat($fileContent);
                     } else {
-                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
+                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "'.$id.'"');
                         return $fullText;
                     }
                     break;
                 }
             }
         } else {
-            $this->logger->warning('Invalid structure node @ID "' . $id . '"');
+            $this->logger->warning('Invalid structure node @ID "'.$id.'"');
             return $fullText;
         }
         // Is this text format supported?
@@ -683,7 +683,7 @@ 
             }
             $fullText = $textMiniOcr;
         } else {
-            $this->logger->warning('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"');
+            $this->logger->warning('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"');
         }
         return $fullText;
     }
@@ -712,10 +712,10 @@ 
                 $textMiniOcr = $obj->getTextAsMiniOcr($ocrTextXml);
                 $this->rawTextArray[$id] = $textMiniOcr;
             } else {
-                $this->logger->warning('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"');
+                $this->logger->warning('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"');
             }
         } else {
-            $this->logger->warning('Class "' . $class . ' does not exists for "' . $textFormat . ' text format"');
+            $this->logger->warning('Class "'.$class.' does not exists for "'.$textFormat.' text format"');
         }
         return $textMiniOcr;
     }
@@ -790,10 +790,10 @@ 
                     $title = self::getTitle($partof, true);
                 }
             } else {
-                Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING);
+                Helper::log('No document with UID '.$uid.' found or document not accessible', LOG_SEVERITY_WARNING);
             }
         } else {
-            Helper::log('Invalid UID ' . $uid . ' for document', LOG_SEVERITY_ERROR);
+            Helper::log('Invalid UID '.$uid.' for document', LOG_SEVERITY_ERROR);
         }
         return $title;
     }
@@ -883,7 +883,7 @@ 
             // the actual loading is format specific
             return $this->loadLocation($location);
         } else {
-            $this->logger->error('Invalid file location "' . $location . '" for document loading');
+            $this->logger->error('Invalid file location "'.$location.'" for document loading');
         }
         return false;
     }
@@ -1035,7 +1035,7 @@ 
         // Set metadata definitions' PID.
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
         if (!$cPid) {
-            $this->logger->error('Invalid PID ' . $cPid . ' for metadata definitions');
+            $this->logger->error('Invalid PID '.$cPid.' for metadata definitions');
             return [];
         }
         if (
@@ -1212,12 +1212,12 @@ 
      */
     public function __get(string $var)
     {
-        $method = 'magicGet' . ucfirst($var);
+        $method = 'magicGet'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no getter function for property "' . $var . '"');
+            $this->logger->warning('There is no getter function for property "'.$var.'"');
             return null;
         } else {
             return $this->$method();
@@ -1250,12 +1250,12 @@ 
      */
     public function __set(string $var, $value): void
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no setter function for property "' . $var . '"');
+            $this->logger->warning('There is no setter function for property "'.$var.'"');
         } else {
             $this->$method($value);
         }

Classes/Command/BaseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -334,7 +334,7 @@ 
      *
      * @return void
      */
-    private function addCollections(Document &$document, array $collections): void
+    private function addCollections(Document & $document, array $collections): void
     {
         foreach ($collections as $collection) {
             $documentCollection = $this->collectionRepository->findOneByIndexName($collection);
@@ -376,11 +376,11 @@ 
 
         for ($i = 0; $i < $count; $i++) {
             // Build the next part to add
-            $nextPart = ($i === 0 ? '' : $delimiter) . $metadataAuthor[$i];
+            $nextPart = ($i === 0 ? '' : $delimiter).$metadataAuthor[$i];
             // Check if adding this part and ellipsis in future would exceed the character limit
-            if (strlen($authors . $nextPart . $delimiter . $ellipsis) > 255) {
+            if (strlen($authors.$nextPart.$delimiter.$ellipsis) > 255) {
                 // Add ellipsis and stop adding more authors
-                $authors .= $delimiter . $ellipsis;
+                $authors .= $delimiter.$ellipsis;
                 break;
             }
             // Add the part to the main string

Classes/Domain/Repository/DocumentRepository.php

Spacing +14 added lines, -14 removed lines

@@ -384,7 +384,7 @@ 
 
         $excludeOtherWhere = '';
         if ($settings['excludeOther']) {
-            $excludeOtherWhere = 'tx_dlf_documents.pid=' . intval($settings['storagePid']);
+            $excludeOtherWhere = 'tx_dlf_documents.pid='.intval($settings['storagePid']);
         }
         // Check if there are any metadata to suggest.
         return $queryBuilder
@@ -438,12 +438,12 @@ 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`record_id` = ? ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`record_id` = ? '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
             $where;
 
         $values = [
@@ -474,13 +474,13 @@ 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
-            'AND ' . Helper::whereExpression('tx_dlf_collections') . ' ' .
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
+            'AND '.Helper::whereExpression('tx_dlf_collections').' '.
             'GROUP BY `tx_dlf_documents`.`uid` ';
 
         $values = [

Classes/Middleware/SearchSuggest.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         $output = [];
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

Classes/Middleware/SearchInDocument.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 
         $encrypted = (string) $parameters['encrypted'];
         if (empty($encrypted)) {
-            throw new \InvalidArgumentException('No valid parameter passed: ' . $parameters['middleware'] . '  ' . $parameters['encrypted'] . '!', 1580585079);
+            throw new \InvalidArgumentException('No valid parameter passed: '.$parameters['middleware'].'  '.$parameters['encrypted'].'!', 1580585079);
         }
 
         $output = [
@@ -174,7 +174,7 @@ 
      */
     private function getQuery(array $parameters): string
     {
-        return $this->fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $this->fields['uid'] . ':' . $this->getUid($parameters['uid']);
+        return $this->fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$this->fields['uid'].':'.$this->getUid($parameters['uid']);
     }
 
     /**

Tests/Unit/Format/ModsTest.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function extractAuthorsIfNoAutRoleTermAssigned(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsAuthorNoAutRoleTerm.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsAuthorNoAutRoleTerm.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);
@@ -80,7 +80,7 @@ 
      */
     public function extractAuthorsWithAutRoleTermAssigned(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsAuthorWithAutRoleTerm.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsAuthorWithAutRoleTerm.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);
@@ -102,7 +102,7 @@ 
      */
     public function extractPlaces(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsOriginInfo.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);
@@ -131,7 +131,7 @@ 
      */
     public function extractYears(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsOriginInfo.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);
@@ -160,7 +160,7 @@ 
      */
     public function extractPlacesWithElectronicEdInside(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);
@@ -189,7 +189,7 @@ 
      */
     public function extractYearsWithElectronicEdInside(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/modsOriginInfoWithEditionElectronicEd.xml');
         $mods = new Mods();
 
         $mods->extractMetadata($xml, $this->metadata, false);

Tests/Unit/Format/AudioVideoMDTest.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function canExtractDuration(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/audioVideo.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/audioVideo.xml');
         $audioVideoMD = new AudioVideoMD();
 
         $videoXml = $xml->xpath('//mets:xmlData')[0];

Tests/Unit/Format/AltoTest.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
      */
     public function getRawData(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/alto.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/alto.xml');
         $alto = new Alto();
 
         $rawText = $alto->getRawText($xml);
@@ -37,7 +37,7 @@ 
      */
     public function getTextAsMiniOcr(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/alto.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/alto.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -75,7 +75,7 @@ 
      */
     public function getTextAsMiniOcrNoTextBlock(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoTextBlock.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/altoNoTextBlock.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -89,7 +89,7 @@ 
      */
     public function getTextAsMiniOcrNoTextline(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoTextLine.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/altoNoTextLine.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -103,7 +103,7 @@ 
      */
     public function getTextAsMiniOcrNoString(): void
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoString.xml');
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/Format/altoNoString.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);

Tests/Functional/Repository/TokenRepositoryTest.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     {
         parent::tearDown();
 
-        unlink(__DIR__ . '/../../Fixtures/Repository/tokenTemp.csv');
+        unlink(__DIR__.'/../../Fixtures/Repository/tokenTemp.csv');
     }
 
     /**
@@ -45,8 +45,8 @@ 
      */
     public function deleteExpiredTokens(): void
     {
-        $inputCsvFile = __DIR__ . '/../../Fixtures/Repository/token.csv';
-        $outputCsvFile = __DIR__ . '/../../Fixtures/Repository/tokenTemp.csv';
+        $inputCsvFile = __DIR__.'/../../Fixtures/Repository/token.csv';
+        $outputCsvFile = __DIR__.'/../../Fixtures/Repository/tokenTemp.csv';
 
         $inputCsvData = file_get_contents($inputCsvFile);
         $csvData = str_getcsv($inputCsvData, "\n");