Erikmitk / kitodo-presentation

Classes/Controller/StatisticsController.php

Spacing +2 added lines, -2 removed lines

@@ -33,13 +33,13 @@
         $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings);
 
         // Set replacements.
-        $args['###TITLES###'] = $foundNumbers['titles'] . ' ' . htmlspecialchars(
+        $args['###TITLES###'] = $foundNumbers['titles'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['titles'] > 1 ? 'titles' : 'title'), 'dlf'
             )
         );
 
-        $args['###VOLUMES###'] = $foundNumbers['volumes'] . ' ' . htmlspecialchars(
+        $args['###VOLUMES###'] = $foundNumbers['volumes'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['volumes'] > 1 ? 'volumes' : 'volume'), 'dlf'
             )

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
  * @subpackage dlf
  * @access public
  */
-class StatisticsController extends AbstractController
-{
+class StatisticsController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings);
 
         // Set replacements.

Classes/Command/BaseCommand.php

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

@@ -107,11 +107,11 @@ 
             // Get extension configuration.
             $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
         } else {
-            return false;
+            return FALSE;
         }
         $this->storagePid = MathUtility::forceIntegerInRange((int) $storagePid, 0);
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -172,10 +172,10 @@ 
      */
     protected function saveToDatabase(Document $document)
     {
-        $success = false;
+        $success = FALSE;
 
         $doc = $document->getDoc();
-        if ($doc === null) {
+        if ($doc === NULL) {
             return $success;
         }
         $doc->cPid = $this->storagePid;
@@ -267,7 +267,7 @@ 
             $document->setPartof($this->getParentDocumentUidForSaving($document));
         }
 
-        if ($document->getUid() === null) {
+        if ($document->getUid() === NULL) {
             // new document
             $this->documentRepository->add($document);
         } else {
@@ -278,7 +278,7 @@ 
         $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
         $persistenceManager->persistAll();
 
-        $success = true;
+        $success = TRUE;
 
         return $success;
     }
@@ -295,7 +295,7 @@ 
     {
         $doc = $document->getDoc();
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             // Get the closest ancestor of the current document which has a MPTR child.
             $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
             if (!empty($parentMptr)) {
@@ -307,7 +307,7 @@ 
                 if ($parentDoc->recordId) {
                     $parentDocument = $this->documentRepository->findOneByRecordId($parentDoc->recordId);
 
-                    if ($parentDocument === null) {
+                    if ($parentDocument === NULL) {
                         // create new Document object
                         $parentDocument = GeneralUtility::makeInstance(Document::class);
                     }
@@ -319,7 +319,7 @@ 
 
                     $success = $this->saveToDatabase($parentDocument);
 
-                    if ($success === true) {
+                    if ($success === TRUE) {
                         // add to index
                         Indexer::add($parentDocument);
                         return $parentDocument->getUid();

Classes/Domain/Repository/DocumentRepository.php

Indentation -1 removed lines

@@ -210,7 +210,6 @@
      * Volumes are documents that are both
      *  a) "leaf" elements i.e. partof != 0
      *  b) "root" elements that are not referenced by other documents ("root" elements that have no descendants)
-
      * @param array $settings
      *
      * @return array

Spacing +32 added lines, -32 removed lines

@@ -358,7 +358,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.
         $result = $queryBuilder
@@ -410,12 +410,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 = [
@@ -445,13 +445,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 = [
@@ -533,13 +533,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 {
@@ -562,9 +562,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]).')';
                     }
                 }
             }
@@ -584,12 +584,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
@@ -597,7 +597,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.
@@ -626,8 +626,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;
                 }
             }
@@ -713,7 +713,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().']';
                         }
                     }
                 }
@@ -737,7 +737,7 @@ 
         $metadataArray = [];
 
         // Set some query parameters.
-        $params['query'] = 'uid:' . $uid;
+        $params['query'] = 'uid:'.$uid;
         $params['start'] = 0;
         $params['rows'] = 1;
         $params['sort'] = ['score' => 'desc'];
@@ -749,8 +749,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;
                 }
             }
@@ -800,7 +800,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 +14 added lines, -28 removed lines

@@ -50,8 +50,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByParameters($parameters)
-    {
+    public function findOneByParameters($parameters) {
         $doc = null;
         $document = null;
 
@@ -95,8 +94,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOldestDocument()
-    {
+    public function findOldestDocument() {
         $query = $this->createQuery();
 
         $query->setOrderings(['tstamp' => QueryInterface::ORDER_ASCENDING]);
@@ -110,8 +108,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));
@@ -132,8 +129,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();
@@ -146,8 +142,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentsBySettings($settings = [])
-    {
+    public function findDocumentsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -177,8 +172,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...
@@ -215,8 +209,7 @@ 
      *
      * @return array
      */
-    public function getStatisticsForSelectedCollection($settings)
-    {
+    public function getStatisticsForSelectedCollection($settings) {
         if ($settings['collections']) {
             // Include only selected collections.
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -350,8 +343,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    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');
@@ -399,8 +391,7 @@ 
      *
      * @return array The found document object
      */
-    public function getOaiRecord($settings, $parameters)
-    {
+    public function getOaiRecord($settings, $parameters) {
         $where = '';
 
         if (!$settings['show_userdefined']) {
@@ -440,8 +431,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');
 
@@ -475,8 +465,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');
@@ -520,8 +509,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;
 
@@ -730,8 +718,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    protected function fetchMetadataFromSolr($uid, $listedMetadata = [])
-    {
+    protected function fetchMetadataFromSolr($uid, $listedMetadata = []) {
         // Prepare query parameters.
         $params = [];
         $metadataArray = [];
@@ -780,8 +767,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.