Erikmitk / kitodo-presentation

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 = [

Braces +13 added lines, -26 removed lines

@@ -36,8 +36,7 @@ 
  *
  * @access public
  */
-class DocumentRepository extends Repository
-{
+class DocumentRepository extends Repository {
     /**
      * @access protected
      * @var array The controller settings passed to the repository for some special actions.
@@ -61,8 +60,7 @@ 
      *
      * @return Document|null
      */
-    public function findOneByParameters($parameters)
-    {
+    public function findOneByParameters($parameters) {
         $doc = null;
         $document = null;
 
@@ -108,8 +106,7 @@ 
      *
      * @return Document|null
      */
-    public function findOldestDocument()
-    {
+    public function findOldestDocument() {
         $query = $this->createQuery();
 
         $query->setOrderings(['tstamp' => QueryInterface::ORDER_ASCENDING]);
@@ -126,8 +123,7 @@ 
      *
      * @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));
@@ -150,8 +146,7 @@ 
      *
      * @return Document|null
      */
-    public function findOneByIdAndSettings($uid, $settings = [])
-    {
+    public function findOneByIdAndSettings($uid, $settings = []) {
         $settings = ['documentSets' => $uid];
 
         return $this->findDocumentsBySettings($settings)->getFirst();
@@ -166,8 +161,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentsBySettings($settings = [])
-    {
+    public function findDocumentsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -200,8 +194,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllByCollectionsLimited($collections, int $limit = 50, int $offset = 0)
-    {
+    public function findAllByCollectionsLimited($collections, int $limit = 50, int $offset = 0) {
         $query = $this->createQuery();
 
         // order by start_date -> start_time...
@@ -241,8 +234,7 @@ 
      *
      * @return array
      */
-    public function getStatisticsForSelectedCollection($settings)
-    {
+    public function getStatisticsForSelectedCollection($settings) {
         if ($settings['collections']) {
             // Include only selected collections.
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -378,8 +370,7 @@ 
      *
      * @return Result
      */
-    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');
@@ -429,8 +420,7 @@ 
      *
      * @return array The found document object
      */
-    public function getOaiRecord($settings, $parameters)
-    {
+    public function getOaiRecord($settings, $parameters) {
         $where = '';
 
         if (!$settings['show_userdefined']) {
@@ -507,8 +497,7 @@ 
      *
      * @return array
      */
-    public function findAllByUids($uids, $checkPartof = false)
-    {
+    public function findAllByUids($uids, $checkPartof = false) {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_documents');
@@ -557,8 +546,7 @@ 
      *
      * @return array
      */
-    public function findChildrenOfEach(array $uids)
-    {
+    public function findChildrenOfEach(array $uids) {
         $allDocuments = $this->findAllByUids($uids, true);
 
         $result = [];
@@ -583,8 +571,7 @@ 
      *
      * @return SolrSearch
      */
-    public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null)
-    {
+    public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null) {
         return $this->findSolr([$collection], $settings, $searchParams, $listedMetadata, $indexedMetadata);
     }
 

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

@@ -63,8 +63,8 @@ 
      */
     public function findOneByParameters($parameters)
     {
-        $doc = null;
-        $document = null;
+        $doc = NULL;
+        $document = NULL;
 
         if (isset($parameters['id']) && MathUtility::canBeInterpretedAsInteger($parameters['id'])) {
 
@@ -76,13 +76,13 @@ 
 
         } else if (isset($parameters['location']) && GeneralUtility::isValidUrl($parameters['location'])) {
 
-            $doc = AbstractDocument::getInstance($parameters['location'], [], true);
+            $doc = AbstractDocument::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']);
@@ -90,11 +90,11 @@ 
 
         }
 
-        if ($document !== null && $doc === null) {
-            $doc = AbstractDocument::getInstance($document->getLocation(), [], true);
+        if ($document !== NULL && $doc === NULL) {
+            $doc = AbstractDocument::getInstance($document->getLocation(), [], TRUE);
         }
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             $document->setCurrentDocument($doc);
         }
 
@@ -177,7 +177,7 @@ 
         }
 
         if (isset($settings['excludeOther']) && (int) $settings['excludeOther'] === 0) {
-            $query->getQuerySettings()->setRespectStoragePage(false);
+            $query->getQuerySettings()->setRespectStoragePage(FALSE);
         }
 
         if (count($constraints)) {
@@ -507,7 +507,7 @@ 
      *
      * @return array
      */
-    public function findAllByUids($uids, $checkPartof = false)
+    public function findAllByUids($uids, $checkPartof = FALSE)
     {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
@@ -559,7 +559,7 @@ 
      */
     public function findChildrenOfEach(array $uids)
     {
-        $allDocuments = $this->findAllByUids($uids, true);
+        $allDocuments = $this->findAllByUids($uids, TRUE);
 
         $result = [];
         foreach ($allDocuments as $doc) {
@@ -583,7 +583,7 @@ 
      *
      * @return SolrSearch
      */
-    public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null)
+    public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = NULL, $indexedMetadata = NULL)
     {
         return $this->findSolr([$collection], $settings, $searchParams, $listedMetadata, $indexedMetadata);
     }
@@ -601,7 +601,7 @@ 
      *
      * @return SolrSearch
      */
-    public function findSolrByCollections($collections, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null): SolrSearch
+    public function findSolrByCollections($collections, $settings, $searchParams, $listedMetadata = NULL, $indexedMetadata = NULL): SolrSearch
     {
         return $this->findSolr($collections, $settings, $searchParams, $listedMetadata, $indexedMetadata);
     }
@@ -618,7 +618,7 @@ 
      *
      * @return SolrSearch
      */
-    public function findSolrWithoutCollection($settings, $searchParams, $listedMetadata = null, $indexedMetadata = null): SolrSearch
+    public function findSolrWithoutCollection($settings, $searchParams, $listedMetadata = NULL, $indexedMetadata = NULL): SolrSearch
     {
         return $this->findSolr([], $settings, $searchParams, $listedMetadata, $indexedMetadata);
     }
@@ -635,7 +635,7 @@ 
      *
      * @return SolrSearch
      */
-    private function findSolr($collections, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null): SolrSearch
+    private function findSolr($collections, $settings, $searchParams, $listedMetadata = NULL, $indexedMetadata = NULL): SolrSearch
     {
         // set settings global inside this repository
         // (may be necessary when SolrSearch calls back)

Classes/Domain/Repository/MetadataFormatRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,7 +22,6 @@
  *
  * @access public
  */
-class MetadataFormatRepository extends Repository
-{
+class MetadataFormatRepository extends Repository {
 
 }

Classes/Domain/Repository/CollectionRepository.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
  *
  * @access public
  */
-class CollectionRepository extends Repository
-{
+class CollectionRepository extends Repository {
     /**
      * @access protected
      * @var array Set the default ordering. This is applied to findAll(), too.

Classes/Domain/Repository/PrinterRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,7 +22,6 @@
  *
  * @access public
  */
-class PrinterRepository extends Repository
-{
+class PrinterRepository extends Repository {
 
 }

Classes/Domain/Model/Structure.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class Structure extends AbstractEntity
-{
+class Structure extends AbstractEntity {
     /**
      * @access protected
      * @var Structure

Classes/Domain/Model/Collection.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  *
  * @access public
  */
-class Collection extends AbstractEntity
-{
+class Collection extends AbstractEntity {
     /**
      * @access protected
      * @var int

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

@@ -71,7 +71,7 @@
      * @access protected
      * @var FileReference thumbnail
      */
-    protected $thumbnail = null;
+    protected $thumbnail = NULL;
 
     /**
      * @access protected

Classes/Domain/Model/Mail.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class Mail extends AbstractEntity
-{
+class Mail extends AbstractEntity {
     /**
      * @access protected
      * @var string

Classes/Domain/Model/Document.php

Braces +4 added lines, -8 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  */
-class Document extends AbstractEntity
-{
+class Document extends AbstractEntity {
     /**
      * @access protected
      * @var \DateTime
@@ -225,14 +224,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->collections = new ObjectStorage();
     }
 
@@ -610,8 +607,7 @@ 
      *
      * @return ObjectStorage<Collection> $collections
      */
-    public function getCollections()
-    {
+    public function getCollections() {
         return $this->collections;
     }
 

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

@@ -44,7 +44,7 @@ 
      * @access protected
      * @var AbstractDocument|null This contains the representative of the raw XML / IIIF data of the document.
      */
-    protected $currentDocument = null;
+    protected $currentDocument = NULL;
 
     /**
      * @access protected
@@ -183,7 +183,7 @@ 
      * @var ObjectStorage<Collection>
      * @Extbase\ORM\Lazy
      */
-    protected $collections = null;
+    protected $collections = NULL;
 
     /**
      * @access protected

Classes/Domain/Model/Metadata.php

Braces +6 added lines, -12 removed lines

@@ -24,8 +24,7 @@ 
  *
  * @access public
  */
-class Metadata extends AbstractEntity
-{
+class Metadata extends AbstractEntity {
     /**
      * @access protected
      * @var Metadata
@@ -128,14 +127,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->format = new ObjectStorage();
     }
 
@@ -206,8 +203,7 @@ 
     /**
      * @return ObjectStorage<MetadataFormat> $format
      */
-    public function getFormat()
-    {
+    public function getFormat() {
         return $this->format;
     }
 
@@ -226,8 +222,7 @@ 
      *
      * @return void
      */
-    public function addFormat(MetadataFormat $format)
-    {
+    public function addFormat(MetadataFormat $format) {
         $this->format->attach($format);
     }
 
@@ -238,8 +233,7 @@ 
      *
      * @return void
      */
-    public function removeFormat(MetadataFormat $formatToRemove)
-    {
+    public function removeFormat(MetadataFormat $formatToRemove) {
         $this->format->detach($formatToRemove);
     }