Erikmitk / kitodo-presentation

Classes/Api/Orcid/Client.php

Spacing +4 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
         try {
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
-            $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
+            $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.');
             return false;
         }
         return $response->getBody()->getContents();
@@ -126,10 +126,10 @@ 
      **/
     private function getApiEndpoint(): string
     {
-        $url  = 'https://' . $this->level . '.' . self::HOSTNAME;
-        $url .= '/v' . self::VERSION . '/';
+        $url  = 'https://'.$this->level.'.'.self::HOSTNAME;
+        $url .= '/v'.self::VERSION.'/';
         $url .= $this->orcid;
-        $url .= '/' . $this->endpoint;
+        $url .= '/'.$this->endpoint;
         return $url;
     }
 }

Classes/Common/IiifManifest.php

Spacing +6 added lines, -6 removed lines

@@ -653,16 +653,16 @@ 
                 if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])) {
                     $values = $iiifResource->jsonPath($resArray['xpath_sorting']);
                     if (is_string($values)) {
-                        $metadata[$resArray['index_name'] . '_sorting'][0] = [trim((string) $values)];
+                        $metadata[$resArray['index_name'].'_sorting'][0] = [trim((string) $values)];
                     } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) {
                         $metadata[$resArray['index_name']] = [];
                         foreach ($values->data() as $value) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $value);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value);
                         }
                     }
                 }
-                if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
-                    $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
+                if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                    $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
                 }
             }
         }
@@ -772,7 +772,7 @@ 
                     }
                 }
             } else {
-                $this->logger->warning('Invalid structure resource @id "' . $id . '"');
+                $this->logger->warning('Invalid structure resource @id "'.$id.'"');
                 return $rawText;
             }
             $this->rawTextArray[$id] = $rawText;
@@ -817,7 +817,7 @@ 
                 return true;
             }
         }
-        $this->logger->error('Could not load IIIF manifest from "' . $location . '"');
+        $this->logger->error('Could not load IIIF manifest from "'.$location.'"');
         return false;
     }
 

Classes/Common/Solr/SearchResult/Highlight.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         $this->xEndPosition = $highlight['lrx'];
         $this->yBeginPosition = $highlight['uly'];
         $this->yEndPosition = $highlight['lry'];
-        $this->id = $this->xBeginPosition . '_' . $this->yBeginPosition;
+        $this->id = $this->xBeginPosition.'_'.$this->yBeginPosition;
     }
 
     /**

Classes/Common/Solr/Solr.php

Spacing +10 added lines, -10 removed lines

@@ -127,7 +127,7 @@ 
     {
         // Get next available core name if none given.
         if (empty($core)) {
-            $core = 'dlfCore' . self::getNextCoreNumber();
+            $core = 'dlfCore'.self::getNextCoreNumber();
         }
         // Get Solr service instance.
         $solr = self::getInstance($core);
@@ -217,13 +217,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetchAssociative()) {
-                $fields[] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . ($resArray['index_stored'] ? 's' : 'u') . 'i';
+                $fields[] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').($resArray['index_stored'] ? 's' : 'u').'i';
             }
 
             // Check if queried field is valid.
             $splitQuery = explode(':', $query, 2);
             if (in_array($splitQuery[0], $fields)) {
-                $query = $splitQuery[0] . ':(' . self::escapeQuery(trim($splitQuery[1], '()')) . ')';
+                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
             } else {
                 $query = self::escapeQuery($query);
             }
@@ -330,7 +330,7 @@ 
     {
         $number = max($number, 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -388,7 +388,7 @@ 
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
         // Calculate cache identifier.
-        $cacheIdentifier = Helper::digest($this->core . print_r(array_merge($this->params, $parameters), true));
+        $cacheIdentifier = Helper::digest($this->core.print_r(array_merge($this->params, $parameters), true));
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         $resultSet = [];
         $entry = $cache->get($cacheIdentifier);
@@ -520,12 +520,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();
@@ -558,12 +558,12 @@ 
      */
     public function __set(string $var, $value): void
     {
-        $method = 'magicSet' . ucfirst($var);
+        $method = 'magicSet'.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);
         }
@@ -603,7 +603,7 @@ 
                     'scheme' => $this->config['scheme'],
                     'host' => $this->config['host'],
                     'port' => $this->config['port'],
-                    'path' => '/' . $this->config['path'],
+                    'path' => '/'.$this->config['path'],
                     'core' => $core,
                     'username' => $this->config['username'],
                     'password' => $this->config['password']

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']);
     }
 
     /**