Erikmitk / kitodo-presentation

Classes/Domain/Repository/BasketRepository.php

Braces +1 added lines, -2 removed lines

@@ -12,7 +12,6 @@
 
 namespace Kitodo\Dlf\Domain\Repository;
 
-class BasketRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class BasketRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
 }

Classes/Domain/Repository/DocumentRepository.php

Spacing +32 added lines, -32 removed lines

@@ -394,7 +394,7 @@ 
 
         $excludeOtherWhere = '';
         if ($settings['excludeOther']) {
-            $excludeOtherWhere = 'tx_dlf_documents.pid=' . intval($settings['pages']);
+            $excludeOtherWhere = 'tx_dlf_documents.pid='.intval($settings['pages']);
         }
         // Check if there are any metadata to suggest.
         $result = $queryBuilder
@@ -446,12 +446,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 = [
@@ -481,13 +481,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 = [
@@ -569,13 +569,13 @@ 
         // Set search query.
         if (
             (!empty($searchParams['fulltext']))
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
             $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1];
             // Search in fulltext field if applicable. Query must not be empty!
             if (!empty($searchParams['query'])) {
-                $query = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
+                $query = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')';
             }
             $params['fulltext'] = true;
         } else {
@@ -598,9 +598,9 @@ 
                         in_array($searchParams['extOperator'][$i], $allowedOperators)
                     ) {
                         if (!empty($query)) {
-                            $query .= ' ' . $searchParams['extOperator'][$i] . ' ';
+                            $query .= ' '.$searchParams['extOperator'][$i].' ';
                         }
-                        $query .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')';
+                        $query .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')';
                     }
                 }
             }
@@ -620,12 +620,12 @@ 
         ) {
             // Search in document and all subordinates (valid for up to three levels of hierarchy).
             $params['filterquery'][]['query'] = '_query_:"{!join from='
-                . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':{!join from=' . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':' . $searchParams['documentId'] . '"' . ' OR {!join from='
-                . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':' . $searchParams['documentId'] . ' OR '
-                . $fields['uid'] . ':' . $searchParams['documentId'];
+                . $fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':{!join from='.$fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':'.$searchParams['documentId'].'"'.' OR {!join from='
+                . $fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':'.$searchParams['documentId'].' OR '
+                . $fields['uid'].':'.$searchParams['documentId'];
         }
 
         // if a collection is given, we prepare the collection query string
@@ -633,7 +633,7 @@ 
             $collecionsQueryString = $collection->getIndexName();
             $params['filterquery'][]['query'] = 'toplevel:true';
             $params['filterquery'][]['query'] = 'partof:0';
-            $params['filterquery'][]['query'] = 'collection_faceting:("' . $collecionsQueryString . '")';
+            $params['filterquery'][]['query'] = 'collection_faceting:("'.$collecionsQueryString.'")';
         }
 
         // Set some query parameters.
@@ -662,8 +662,8 @@ 
         if ($listedMetadata) {
             foreach ($listedMetadata as $metadata) {
                 if ($metadata->getIndexStored() || $metadata->getIndexIndexed()) {
-                    $listMetadataRecord = $metadata->getIndexName() . '_' . ($metadata->getIndexTokenized() ? 't' : 'u') . ($metadata->getIndexStored() ? 's' : 'u') . ($metadata->getIndexIndexed() ? 'i' : 'u');
-                    $params['fields'] .= ',' . $listMetadataRecord;
+                    $listMetadataRecord = $metadata->getIndexName().'_'.($metadata->getIndexTokenized() ? 't' : 'u').($metadata->getIndexStored() ? 's' : 'u').($metadata->getIndexIndexed() ? 'i' : 'u');
+                    $params['fields'] .= ','.$listMetadataRecord;
                     $params['listMetadataRecords'][$metadata->getIndexName()] = $listMetadataRecord;
                 }
             }
@@ -749,7 +749,7 @@ 
                     if (empty($documents[$doc['uid']]['title']) && ($documents[$doc['uid']]['partOf'] > 0)) {
                         $parentDocument = $this->findByUid($documents[$doc['uid']]['partOf']);
                         if ($parentDocument) {
-                            $documents[$doc['uid']]['title'] = '[' . $parentDocument->getTitle() . ']';
+                            $documents[$doc['uid']]['title'] = '['.$parentDocument->getTitle().']';
                         }
                     }
                 }
@@ -773,7 +773,7 @@ 
         $metadataArray = [];
 
         // Set some query parameters.
-        $params['query'] = 'uid:' . $uid;
+        $params['query'] = 'uid:'.$uid;
         $params['start'] = 0;
         $params['rows'] = 1;
         $params['sort'] = ['score' => 'desc'];
@@ -785,8 +785,8 @@ 
         if ($listedMetadata) {
             foreach ($listedMetadata as $metadata) {
                 if ($metadata->getIndexIndexed()) {
-                    $listMetadataRecord = $metadata->getIndexName() . '_' . ($metadata->getIndexTokenized() ? 't' : 'u') . ($metadata->getIndexStored() ? 's' : 'u') . 'i';
-                    $params['fields'] .= ',' . $listMetadataRecord;
+                    $listMetadataRecord = $metadata->getIndexName().'_'.($metadata->getIndexTokenized() ? 't' : 'u').($metadata->getIndexStored() ? 's' : 'u').'i';
+                    $params['fields'] .= ','.$listMetadataRecord;
                     $params['listMetadataRecords'][$metadata->getIndexName()] = $listMetadataRecord;
                 }
             }
@@ -836,7 +836,7 @@ 
         $cache = null;
         // Calculate cache identifier.
         if ($enableCache === true) {
-            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, true));
+            $cacheIdentifier = Helper::digest($solr->core.print_r($parameters, true));
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         }
         $resultSet = [

Braces +19 added lines, -38 removed lines

@@ -25,8 +25,7 @@ 
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-class DocumentRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class DocumentRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
     /**
      * The controller settings passed to the repository for some special actions.
      *
@@ -48,8 +47,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByParameters($parameters)
-    {
+    public function findOneByParameters($parameters) {
         $doc = null;
         $document = null;
 
@@ -90,8 +88,7 @@ 
     }
 
 
-    public function findByUidAndPartOf($uid, $partOf)
-    {
+    public function findByUidAndPartOf($uid, $partOf) {
         $query = $this->createQuery();
 
         $query->matching($query->equals('uid', $uid));
@@ -105,8 +102,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOldestDocument()
-    {
+    public function findOldestDocument() {
         $query = $this->createQuery();
 
         $query->setOrderings(['tstamp' => QueryInterface::ORDER_ASCENDING]);
@@ -120,8 +116,7 @@ 
      * @param  \Kitodo\Dlf\Domain\Model\Structure $structure
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function getChildrenOfYearAnchor($partOf, $structure)
-    {
+    public function getChildrenOfYearAnchor($partOf, $structure) {
         $query = $this->createQuery();
 
         $query->matching($query->equals('structure', $structure));
@@ -142,8 +137,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByIdAndSettings($uid, $settings = [])
-    {
+    public function findOneByIdAndSettings($uid, $settings = []) {
         $settings = ['documentSets' => $uid];
 
         return $this->findDocumentsBySettings($settings)->getFirst();
@@ -156,8 +150,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentsBySettings($settings = [])
-    {
+    public function findDocumentsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -187,8 +180,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllByCollectionsLimited($collections, $limit = 50)
-    {
+    public function findAllByCollectionsLimited($collections, $limit = 50) {
         $query = $this->createQuery();
 
         // order by start_date -> start_time...
@@ -223,8 +215,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllTitles($settings = [])
-    {
+    public function findAllTitles($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -252,8 +243,7 @@ 
      *
      * @return int
      */
-    public function countAllTitles($settings = [])
-    {
+    public function countAllTitles($settings = []) {
         return $this->findAllTitles($settings)->count();
     }
 
@@ -266,8 +256,7 @@ 
      *
      * @return int
      */
-    public function countAllVolumes($settings = [])
-    {
+    public function countAllVolumes($settings = []) {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
         $subQueryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -295,8 +284,7 @@ 
         return $countVolumes;
     }
 
-    public function getStatisticsForSelectedCollection($settings)
-    {
+    public function getStatisticsForSelectedCollection($settings) {
         // Include only selected collections.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
@@ -386,8 +374,7 @@ 
         return ['titles' => $countTitles, 'volumes' => $countVolumes];
     }
 
-    public function getTableOfContentsFromDb($uid, $pid, $settings)
-    {
+    public function getTableOfContentsFromDb($uid, $pid, $settings) {
         // Build table of contents from database.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
@@ -435,8 +422,7 @@ 
      *
      * @return array The found document object
      */
-    public function getOaiRecord($settings, $parameters)
-    {
+    public function getOaiRecord($settings, $parameters) {
         $where = '';
 
         if (!$settings['show_userdefined']) {
@@ -476,8 +462,7 @@ 
      *
      * @return array The found document objects
      */
-    public function getOaiDocumentList($settings, $documentsToProcess)
-    {
+    public function getOaiDocumentList($settings, $documentsToProcess) {
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
@@ -511,8 +496,7 @@ 
      *
      * @return array
      */
-    private function findAllByUids($uids)
-    {
+    private function findAllByUids($uids) {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_documents');
@@ -556,8 +540,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null)
-    {
+    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null) {
         // set settings global inside this repository
         $this->settings = $settings;
 
@@ -766,8 +749,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function fetchMetadataFromSolr($uid, $listedMetadata = [])
-    {
+    public function fetchMetadataFromSolr($uid, $listedMetadata = []) {
         // Prepare query parameters.
         $params = [];
         $metadataArray = [];
@@ -816,8 +798,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    protected function searchSolr($parameters = [], $enableCache = true)
-    {
+    protected function searchSolr($parameters = [], $enableCache = true) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         // Set query.

Upper-Lower-Casing +23 added lines, -23 removed lines

@@ -50,8 +50,8 @@ 
      */
     public function findOneByParameters($parameters)
     {
-        $doc = null;
-        $document = null;
+        $doc = NULL;
+        $document = NULL;
 
         if (isset($parameters['id']) && MathUtility::canBeInterpretedAsInteger($parameters['id'])) {
 
@@ -63,13 +63,13 @@ 
 
         } else if (isset($parameters['location']) && GeneralUtility::isValidUrl($parameters['location'])) {
 
-            $doc = Doc::getInstance($parameters['location'], [], true);
+            $doc = Doc::getInstance($parameters['location'], [], TRUE);
 
             if ($doc->recordId) {
                 $document = $this->findOneByRecordId($doc->recordId);
             }
 
-            if ($document === null) {
+            if ($document === NULL) {
                 // create new (dummy) Document object
                 $document = GeneralUtility::makeInstance(Document::class);
                 $document->setLocation($parameters['location']);
@@ -77,11 +77,11 @@ 
 
         }
 
-        if ($document !== null && $doc === null) {
-            $doc = Doc::getInstance($document->getLocation(), [], true);
+        if ($document !== NULL && $doc === NULL) {
+            $doc = Doc::getInstance($document->getLocation(), [], TRUE);
         }
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             $document->setDoc($doc);
         }
 
@@ -167,7 +167,7 @@ 
         }
 
         if (isset($settings['excludeOther']) && (int) $settings['excludeOther'] === 0) {
-            $query->getQuerySettings()->setRespectStoragePage(false);
+            $query->getQuerySettings()->setRespectStoragePage(FALSE);
         }
 
         if (count($constraints)) {
@@ -556,7 +556,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null)
+    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = NULL)
     {
         // set settings global inside this repository
         $this->settings = $settings;
@@ -577,7 +577,7 @@ 
             if (!empty($searchParams['query'])) {
                 $query = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
             }
-            $params['fulltext'] = true;
+            $params['fulltext'] = TRUE;
         } else {
             // Retain given search field if valid.
             if (!empty($searchParams['query'])) {
@@ -670,7 +670,7 @@ 
         }
 
         // Perform search.
-        $result = $this->searchSolr($params, true);
+        $result = $this->searchSolr($params, TRUE);
 
         // Initialize values
         $numberOfToplevels = 0;
@@ -693,7 +693,7 @@ 
                     $documents[$doc['uid']] = $allDocuments[$doc['uid']];
                 }
                 if ($documents[$doc['uid']]) {
-                    if ($doc['toplevel'] === false) {
+                    if ($doc['toplevel'] === FALSE) {
                         // this maybe a chapter, article, ..., year
                         if ($doc['type'] === 'year') {
                             continue;
@@ -718,7 +718,7 @@ 
                             }
                             $documents[$doc['uid']]['searchResults'][] = $searchResult;
                         }
-                    } else if ($doc['toplevel'] === true) {
+                    } else if ($doc['toplevel'] === TRUE) {
                         $numberOfToplevels++;
                         foreach ($params['listMetadataRecords'] as $indexName => $solrField) {
                             if (isset($doc['metadata'][$indexName])) {
@@ -795,7 +795,7 @@ 
         $params['filterquery'][] = ['query' => 'toplevel:true'];
 
         // Perform search.
-        $result = $this->searchSolr($params, true);
+        $result = $this->searchSolr($params, TRUE);
 
         if ($result['numFound'] > 0) {
             // There is only one result found because of toplevel:true.
@@ -816,7 +816,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    protected function searchSolr($parameters = [], $enableCache = true)
+    protected function searchSolr($parameters = [], $enableCache = TRUE)
     {
         // Set additional query parameters.
         $parameters['start'] = 0;
@@ -833,27 +833,27 @@ 
         }
 
         $cacheIdentifier = '';
-        $cache = null;
+        $cache = NULL;
         // Calculate cache identifier.
-        if ($enableCache === true) {
-            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, true));
+        if ($enableCache === TRUE) {
+            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, TRUE));
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         }
         $resultSet = [
             'documents' => [],
             'numFound' => 0,
         ];
-        if ($enableCache === false || ($entry = $cache->get($cacheIdentifier)) === false) {
+        if ($enableCache === FALSE || ($entry = $cache->get($cacheIdentifier)) === FALSE) {
             $selectQuery = $solr->service->createSelect($parameters);
 
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 // get highlighting component and apply settings
                 $selectQuery->getHighlighting();
             }
 
             $solrRequest = $solr->service->createRequest($selectQuery);
 
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 // If it is a fulltext search, enable highlighting.
                 // field for which highlighting is going to be performed,
                 // is required if you want to have OCR highlighting
@@ -873,7 +873,7 @@ 
             /** @scrutinizer ignore-call */
             $resultSet['numFound'] = $result->getNumFound();
             $highlighting = [];
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 $data = $result->getData();
                 $highlighting = $data['ocrHighlighting'];
             }
@@ -902,7 +902,7 @@ 
             }
 
             // Save value in cache.
-            if (!empty($resultSet) && $enableCache === true) {
+            if (!empty($resultSet) && $enableCache === TRUE) {
                 $cache->set($cacheIdentifier, $resultSet);
             }
         } else {

Classes/Domain/Repository/ActionLogRepository.php

Braces +1 added lines, -2 removed lines

@@ -12,7 +12,6 @@
 
 namespace Kitodo\Dlf\Domain\Repository;
 
-class ActionLogRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class ActionLogRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
 }

Classes/Domain/Repository/MetadataRepository.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
         // order by oai_name
         $query->setOrderings(
-            array('sorting' => QueryInterface::ORDER_ASCENDING)
+            array ('sorting' => QueryInterface::ORDER_ASCENDING)
         );
 
         return $query->execute();

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-class MetadataRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class MetadataRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
     /**
      * Finds all collection for the given settings
      *
@@ -25,8 +24,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findBySettings($settings = [])
-    {
+    public function findBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];

Classes/Domain/Repository/TokenRepository.php

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 
-class TokenRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class TokenRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
     /**
      * Delete all expired token
      *
@@ -25,8 +24,7 @@ 
      *
      * @return void
      */
-    public function deleteExpiredTokens($expireTime)
-    {
+    public function deleteExpiredTokens($expireTime) {
         $query = $this->createQuery();
 
         $constraints = [];

Classes/Domain/Repository/CollectionRepository.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
         // order by oai_name
         $query->setOrderings(
-            array('oai_name' => QueryInterface::ORDER_ASCENDING)
+            array ('oai_name' => QueryInterface::ORDER_ASCENDING)
         );
 
         return $query->execute();

Braces +5 added lines, -10 removed lines

@@ -17,8 +17,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-class CollectionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class CollectionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
     /**
      * Set the default ordering. This is applied to findAll(), too.
      *
@@ -35,8 +34,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllByUids($uids)
-    {
+    public function findAllByUids($uids) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -49,8 +47,7 @@ 
         return $query->execute();
     }
 
-    public function getCollectionForMetadata($pages)
-    {
+    public function getCollectionForMetadata($pages) {
         // Get list of collections to show.
         $query = $this->createQuery();
 
@@ -66,8 +63,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findCollectionsBySettings($settings = [])
-    {
+    public function findCollectionsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -104,8 +100,7 @@ 
         return $query->execute();
     }
 
-    public function getIndexNameForSolr($settings, $set)
-    {
+    public function getIndexNameForSolr($settings, $set) {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
 

Classes/Domain/Repository/FormatRepository.php

Braces +1 added lines, -2 removed lines

@@ -12,7 +12,6 @@
 
 namespace Kitodo\Dlf\Domain\Repository;
 
-class FormatRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class FormatRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
 }

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Spacing +4 added lines, -4 removed lines

@@ -157,7 +157,7 @@ 
                 if ($this->document) {
                     $doc = Doc::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
@@ -175,7 +175,7 @@ 
 
                     $this->document->setLocation($requestData['id']);
                 } else {
-                    $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
+                    $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading');
                 }
             }
 
@@ -192,11 +192,11 @@ 
                 if ($this->document !== null && $doc !== null) {
                     $this->document->setDoc($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+            $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading');
         }
     }
 }

Braces +5 added lines, -10 removed lines

@@ -41,8 +41,7 @@ 
     /**
      * @return ExpressionFunction[] An array of Function instances
      */
-    public function getFunctions()
-    {
+    public function getFunctions() {
         return [
             $this->getDocumentTypeFunction(),
         ];
@@ -68,8 +67,7 @@ 
      *
      * @return void
      */
-    protected function initializeRepositories($storagePid)
-    {
+    protected function initializeRepositories($storagePid) {
         Helper::polyfillExtbaseClassesForTYPO3v9();
 
         // TODO: When we drop support for TYPO3v9, we needn't/shouldn't use ObjectManager anymore
@@ -92,12 +90,10 @@ 
     {
         return new ExpressionFunction(
             'getDocumentType',
-            function()
-            {
+            function() {
                 // Not implemented, we only use the evaluator
             },
-            function($arguments, $cPid)
-            {
+            function($arguments, $cPid) {
                 /** @var RequestWrapper $requestWrapper */
                 $requestWrapper = $arguments['request'];
                 $queryParams = $requestWrapper->getQueryParams();
@@ -143,8 +139,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData, int $pid)
-    {
+    protected function loadDocument($requestData, int $pid) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -112,7 +112,7 @@ 
 
                 // Load document with current plugin parameters.
                 $this->loadDocument($queryParams['tx_dlf'], $cPid);
-                if ($this->document === null) {
+                if ($this->document === NULL) {
                     return $type;
                 }
                 // Set PID for metadata definitions.
@@ -123,7 +123,7 @@ 
                     // Calendar plugin does not support IIIF (yet). Abort for all newspaper related types.
                     if (
                         $this->document->getDoc() instanceof IiifManifest
-                        && array_search($metadata['type'][0], ['newspaper', 'ephemera', 'year', 'issue']) !== false
+                        && array_search($metadata['type'][0], ['newspaper', 'ephemera', 'year', 'issue']) !== FALSE
                     ) {
                         return $type;
                     }
@@ -150,25 +150,25 @@ 
 
             $this->initializeRepositories($pid);
 
-            $doc = null;
+            $doc = NULL;
             if (MathUtility::canBeInterpretedAsInteger($requestData['id'])) {
                 // find document from repository by uid
                 $this->document = $this->documentRepository->findOneByIdAndSettings((int) $requestData['id'], ['storagePid' => $pid]);
                 if ($this->document) {
-                    $doc = Doc::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
+                    $doc = Doc::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
                 } else {
                     $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
-                $doc = Doc::getInstance($requestData['id'], ['storagePid' => $pid], true);
+                $doc = Doc::getInstance($requestData['id'], ['storagePid' => $pid], TRUE);
 
-                if ($doc !== null) {
+                if ($doc !== NULL) {
                     if ($doc->recordId) {
                         $this->document = $this->documentRepository->findOneByRecordId($doc->recordId);
                     }
 
-                    if ($this->document === null) {
+                    if ($this->document === NULL) {
                         // create new dummy Document object
                         $this->document = GeneralUtility::makeInstance(Document::class);
                     }
@@ -179,7 +179,7 @@ 
                 }
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setDoc($doc);
             }
 
@@ -187,9 +187,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = Doc::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
-                if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = Doc::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
+                if ($this->document !== NULL && $doc !== NULL) {
                     $this->document->setDoc($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');

Classes/Common/Solr.php

Spacing +10 added lines, -10 removed lines

@@ -134,7 +134,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);
@@ -230,13 +230,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetch()) {
-                $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);
             }
@@ -341,7 +341,7 @@ 
     {
         $number = max(intval($number), 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -403,7 +403,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 = [];
         if (($entry = $cache->get($cacheIdentifier)) === false) {
@@ -534,12 +534,12 @@ 
      */
     public function __get($var)
     {
-        $method = '_get' . ucfirst($var);
+        $method = '_get'.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;
         } else {
             return $this->$method();
@@ -572,12 +572,12 @@ 
      */
     public function __set($var, $value)
     {
-        $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);
         }
@@ -614,7 +614,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'],

Braces +21 added lines, -42 removed lines

@@ -37,8 +37,7 @@ 
  * @property-read bool $ready Is the Solr service instantiated successfully?
  * @property-read \Solarium\Client $service This holds the Solr service object
  */
-class Solr implements LoggerAwareInterface
-{
+class Solr implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -130,8 +129,7 @@ 
      *
      * @return string The name of the new core
      */
-    public static function createCore($core = '')
-    {
+    public static function createCore($core = '') {
         // Get next available core name if none given.
         if (empty($core)) {
             $core = 'dlfCore' . self::getNextCoreNumber();
@@ -178,8 +176,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQuery($query)
-    {
+    public static function escapeQuery($query) {
         $helper = GeneralUtility::makeInstance(\Solarium\Core\Query\Helper::class);
         // Escape query phrase or term.
         if (preg_match('/^".*"$/', $query)) {
@@ -202,8 +199,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQueryKeepField($query, $pid)
-    {
+    public static function escapeQueryKeepField($query, $pid) {
         // Is there a field query?
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -253,8 +249,7 @@ 
      *
      * @return array fields
      */
-    public static function getFields()
-    {
+    public static function getFields() {
         $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
 
         $fields = [];
@@ -296,8 +291,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
-    {
+    public static function getInstance($core = null) {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
             $core = Helper::getIndexNameFromUid($core, 'tx_dlf_solrcores');
@@ -337,8 +331,7 @@ 
      *
      * @return int First unused core number found
      */
-    public static function getNextCoreNumber($number = 0)
-    {
+    public static function getNextCoreNumber($number = 0) {
         $number = max(intval($number), 0);
         // Check if core already exists.
         $solr = self::getInstance('dlfCore' . $number);
@@ -356,8 +349,7 @@ 
      *
      * @return void
      */
-    protected function loadSolrConnectionInfo()
-    {
+    protected function loadSolrConnectionInfo() {
         if (empty($this->config)) {
             $config = [];
             // Extract extension configuration.
@@ -397,8 +389,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    public function search_raw($parameters = [])
-    {
+    public function search_raw($parameters = []) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
@@ -428,8 +419,7 @@ 
      *
      * @return string|null The core name of the current query endpoint or null if core admin endpoint
      */
-    protected function _getCore()
-    {
+    protected function _getCore() {
         return $this->core;
     }
 
@@ -440,8 +430,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -452,8 +441,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -464,8 +452,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -476,8 +463,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -490,8 +476,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -504,8 +489,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -518,8 +502,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -532,8 +515,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -555,8 +537,7 @@ 
      *
      * @return bool true if variable is set and not empty, false otherwise
      */
-    public function __isset($var)
-    {
+    public function __isset($var) {
         return !empty($this->__get($var));
     }
 
@@ -570,8 +551,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -592,8 +572,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -55,7 +55,7 @@ 
      * @var string|null
      * @access protected
      */
-    protected $core = null;
+    protected $core = NULL;
 
     /**
      * This holds the PID for the configuration
@@ -103,7 +103,7 @@ 
      * @var bool
      * @access protected
      */
-    protected $ready = false;
+    protected $ready = FALSE;
 
     /**
      * This holds the singleton search objects with their core as array key
@@ -296,7 +296,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
+    public static function getInstance($core = NULL)
     {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
@@ -305,7 +305,7 @@ 
         // Check if core is set or null.
         if (
             empty($core)
-            && $core !== null
+            && $core !== NULL
         ) {
             Helper::log('Invalid core UID or name given for Apache Solr', LOG_SEVERITY_ERROR);
         }
@@ -403,10 +403,10 @@ 
         $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 = [];
-        if (($entry = $cache->get($cacheIdentifier)) === false) {
+        if (($entry = $cache->get($cacheIdentifier)) === FALSE) {
             $selectQuery = $this->service->createSelect(array_merge($this->params, $parameters));
             $result = $this->service->select($selectQuery);
             foreach ($result as $doc) {
@@ -632,7 +632,7 @@ 
         // Check if connection is established.
         $query = $this->service->createCoreAdmin();
         $action = $query->createStatus();
-        if ($core !== null) {
+        if ($core !== NULL) {
             $action->setCore($core);
         }
         $query->setAction($action);
@@ -640,7 +640,7 @@ 
             $response = $this->service->coreAdmin($query);
             if ($response->getWasSuccessful()) {
                 // Solr is reachable, but is the core as well?
-                if ($core !== null) {
+                if ($core !== NULL) {
                     $result = $response->getStatusResult();
                     if (
                         $result instanceof \Solarium\QueryType\Server\CoreAdmin\Result\StatusResult
@@ -654,7 +654,7 @@ 
                     }
                 }
                 // Instantiation successful!
-                $this->ready = true;
+                $this->ready = TRUE;
             }
         } catch (\Exception $e) {
             // Nothing to do here.