Erikmitk / kitodo-presentation

Classes/Controller/NavigationController.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getDoc()->numPages; $i++) {
-            $pageOptions[$i] = '[' . $i . ']' . ($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
+            $pageOptions[$i] = '['.$i.']'.($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
         }
         $this->view->assign('pageOptions', $pageOptions);
 

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

@@ -35,8 +35,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -81,7 +81,7 @@ 
         // prepare feature array for fluid
         $features = [];
         foreach (explode(',', $this->settings['features']) as $feature) {
-            $features[$feature] = true;
+            $features[$feature] = TRUE;
         }
         $this->view->assign('features', $features);
     }

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * Method to get the page select values and use them with chash
      * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm
@@ -53,8 +52,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

Classes/Controller/TableOfContentsController.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
         }
         return $entryArray;
     }

Braces +8 added lines, -16 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *
@@ -45,8 +44,7 @@ 
      *
      * @return void
      */
-    public function filterAction()
-    {
+    public function filterAction() {
         // if filter was triggered, get filter parameters from POST variables
         $this->filterParams = $this->getParametersSafely('filterParameter');
 
@@ -59,8 +57,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
@@ -91,8 +88,7 @@ 
      * @access protected
      * @return array HMENU array
      */
-    protected function makeMenuArray()
-    {
+    protected function makeMenuArray() {
         // Set default values for page if not set.
         // $this->requestData['page'] may be integer or string (physical structure @ID)
         if (
@@ -168,8 +164,7 @@ 
      *
      * @return array HMENU array
      */
-    protected function makeMenuFor3DObjects()
-    {
+    protected function makeMenuFor3DObjects() {
         $menuArray = [];
 
         // Go through table of contents and create all menu entries.
@@ -192,8 +187,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
-    {
+    protected function getMenuEntry(array $entry, $recursive = false) {
         $entry = $this->resolveMenuEntry($entry);
 
         $entryArray = [];
@@ -287,8 +281,7 @@ 
      * @param array $entry
      * @return array
      */
-    protected function resolveMenuEntry($entry)
-    {
+    protected function resolveMenuEntry($entry) {
         // If the menu entry points to the parent document,
         // resolve to the parent UID set on indexation.
         $doc = $this->document->getDoc();
@@ -304,8 +297,7 @@ 
         return $entry;
     }
 
-    protected function getMenuEntryWithImage(array $entry, $recursive = false)
-    {
+    protected function getMenuEntryWithImage(array $entry, $recursive = false) {
         $entryArray = [];
 
         // don't filter if the entry type is collection or search params are empty

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

@@ -51,7 +51,7 @@ 
         $this->filterParams = $this->getParametersSafely('filterParameter');
 
         // output is done by main action
-        $this->forward('main', null, null, ['filterParameter' => $this->filterParams]);
+        $this->forward('main', NULL, NULL, ['filterParameter' => $this->filterParams]);
     }
 
     /**
@@ -64,8 +64,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return;
@@ -127,12 +127,12 @@ 
             }
             // Go through table of contents and create all menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, true);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
             }
         } else {
             // Go through table of contents and create top-level menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, false);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
             }
             // Build table of contents from database.
             $result = $this->documentRepository->getTableOfContentsFromDb($this->document->getUid(), $this->document->getPid(), $this->settings);
@@ -151,7 +151,7 @@ 
                         'pagination' => '',
                         'targetUid' => $resArray['uid']
                     ];
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
                 }
             }
         }
@@ -174,7 +174,7 @@ 
 
         // Go through table of contents and create all menu entries.
         foreach ($this->document->getDoc()->tableOfContents as $entry) {
-            $menuEntry = $this->getMenuEntryWithImage($entry, true);
+            $menuEntry = $this->getMenuEntryWithImage($entry, TRUE);
             if (!empty($menuEntry)) {
                 $menuArray[] = $menuEntry;
             }
@@ -192,7 +192,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
+    protected function getMenuEntry(array $entry, $recursive = FALSE)
     {
         $entry = $this->resolveMenuEntry($entry);
 
@@ -250,7 +250,7 @@ 
         }
         // Build sub-menu if available and called recursively.
         if (
-            $recursive === true
+            $recursive === TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:
@@ -268,7 +268,7 @@ 
                     if (in_array($child['id'], $this->activeEntries)) {
                         $entryArray['ITEM_STATE'] = 'ACT';
                     }
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
@@ -304,7 +304,7 @@ 
         return $entry;
     }
 
-    protected function getMenuEntryWithImage(array $entry, $recursive = false)
+    protected function getMenuEntryWithImage(array $entry, $recursive = FALSE)
     {
         $entryArray = [];
 
@@ -325,7 +325,7 @@ 
         $entryArray['doNotLinkIt'] = 1;
         $entryArray['ITEM_STATE'] = 'HEADER';
 
-        if ($entry['children'] === null) {
+        if ($entry['children'] === NULL) {
             $entryArray['description'] = $entry['description'];
             $id = $this->document->getDoc()->smLinks['l2p'][$entry['id']][0];
             $entryArray['image'] = $this->document->getDoc()->getFileLocation($this->document->getDoc()->physicalStructureInfo[$id]['files']['THUMBS']);
@@ -338,7 +338,7 @@ 
 
         // Build sub-menu if available and called recursively.
         if (
-            $recursive == true
+            $recursive == TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:

Classes/Hooks/DataHandler.php

Spacing +9 added lines, -9 removed lines

@@ -139,10 +139,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -164,10 +164,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -242,7 +242,7 @@ 
                                 if ($solr->ready) {
                                     // Delete Solr document.
                                     $updateQuery = $solr->service->createUpdate();
-                                    $updateQuery->addDeleteQuery('uid:' . $id);
+                                    $updateQuery->addDeleteQuery('uid:'.$id);
                                     $updateQuery->addCommit();
                                     $solr->service->update($updateQuery);
                                 }
@@ -254,7 +254,7 @@ 
                                     $document->setDoc($doc);
                                     Indexer::add($document);
                                 } else {
-                                    $this->logger->error('Failed to re-index document with UID ' . $id);
+                                    $this->logger->error('Failed to re-index document with UID '.$id);
                                 }
                             }
                         }
@@ -321,7 +321,7 @@ 
                         if ($solr->ready) {
                             // Delete Solr document.
                             $updateQuery = $solr->service->createUpdate();
-                            $updateQuery->addDeleteQuery('uid:' . $id);
+                            $updateQuery->addDeleteQuery('uid:'.$id);
                             $updateQuery->addCommit();
                             $solr->service->update($updateQuery);
                             if ($command == 'delete') {
@@ -336,7 +336,7 @@ 
                             $document->setDoc($doc);
                             Indexer::add($document);
                         } else {
-                            $this->logger->error('Failed to re-index document with UID ' . $id);
+                            $this->logger->error('Failed to re-index document with UID '.$id);
                         }
                         break;
                 }
@@ -387,7 +387,7 @@ 
                             // Nothing to do here.
                         }
                     }
-                    $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
+                    $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr');
                 }
             }
         }

Braces +5 added lines, -10 removed lines

@@ -34,8 +34,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -43,8 +42,7 @@ 
      */
     protected $documentRepository;
 
-    protected function getDocumentRepository()
-    {
+    protected function getDocumentRepository() {
         if ($this->documentRepository === null) {
             $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
             $this->documentRepository = $objectManager->get(DocumentRepository::class);
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray) {
         if ($status == 'new') {
             switch ($table) {
                     // Field post-processing for table "tx_dlf_documents".
@@ -195,8 +192,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray) {
         if ($status == 'update') {
             switch ($table) {
                     // After database operations for table "tx_dlf_documents".
@@ -275,8 +271,7 @@ 
      *
      * @return void
      */
-    public function processCmdmap_postProcess($command, $table, $id)
-    {
+    public function processCmdmap_postProcess($command, $table, $id) {
         if (
             in_array($command, ['move', 'delete', 'undelete'])
             && $table == 'tx_dlf_documents'

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

@@ -45,7 +45,7 @@ 
 
     protected function getDocumentRepository()
     {
-        if ($this->documentRepository === null) {
+        if ($this->documentRepository === NULL) {
             $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
             $this->documentRepository = $objectManager->get(DocumentRepository::class);
         }
@@ -249,8 +249,8 @@ 
                             } else {
                                 // Reindex document.
                                 $document = $this->getDocumentRepository()->findByUid($id);
-                                $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], true);
-                                if ($document !== null && $doc !== null) {
+                                $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], TRUE);
+                                if ($document !== NULL && $doc !== NULL) {
                                     $document->setDoc($doc);
                                     Indexer::add($document);
                                 } else {
@@ -331,8 +331,8 @@ 
                     case 'undelete':
                         // Reindex document.
                         $document = $this->getDocumentRepository()->findByUid($id);
-                        $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], true);
-                        if ($document !== null && $doc !== null) {
+                        $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], TRUE);
+                        if ($document !== NULL && $doc !== NULL) {
                             $document->setDoc($doc);
                             Indexer::add($document);
                         } else {
@@ -374,9 +374,9 @@ 
                         $query = $solr->service->createCoreAdmin();
                         $action = $query->createUnload();
                         $action->setCore($resArray['core']);
-                        $action->setDeleteDataDir(true);
-                        $action->setDeleteIndex(true);
-                        $action->setDeleteInstanceDir(true);
+                        $action->setDeleteDataDir(TRUE);
+                        $action->setDeleteIndex(TRUE);
+                        $action->setDeleteInstanceDir(TRUE);
                         $query->setAction($action);
                         try {
                             $response = $solr->service->coreAdmin($query);

Classes/Hooks/ItemsProcFunc.php

Spacing +2 added lines, -2 removed lines

@@ -126,8 +126,8 @@
             ->select(...explode(',', $fields))
             ->from($table)
             ->where(
-                $queryBuilder->expr()->eq($table . '.pid', intval($this->storagePid)),
-                $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
+                $queryBuilder->expr()->eq($table.'.pid', intval($this->storagePid)),
+                $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
                 $andWhere
             )
             ->orderBy($sorting)

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ItemsProcFunc implements LoggerAwareInterface
-{
+class ItemsProcFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -46,8 +45,7 @@ 
      *
      * @return void
      */
-    public function toolList(&$params)
-    {
+    public function toolList(&$params) {
         foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] as $class => $label) {
             $params['items'][] = [Helper::getLanguageService()->sL($label), $class];
         }
@@ -97,8 +95,7 @@ 
      *
      * @return void
      */
-    public function extendedSearchList(&$params)
-    {
+    public function extendedSearchList(&$params) {
         $this->generateList(
             $params,
             'label,index_name',
@@ -139,8 +136,7 @@ 
      *
      * @return void
      */
-    protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '')
-    {
+    protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '') {
         $this->getTyposcriptConfigFromPluginSiteRoot($params);
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)

Classes/Hooks/ThumbnailCustomElement.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         // parameters are available in $this->data['parameterArray']['fieldConf']['config']['parameters']
         $result = $this->initializeResultArray();
         if (!empty($this->data['databaseRow']['thumbnail'])) {
-            $result['html'] = '<img alt="Thumbnail" title="" src="' . $this->data['databaseRow']['thumbnail'] . '" />';
+            $result['html'] = '<img alt="Thumbnail" title="" src="'.$this->data['databaseRow']['thumbnail'].'" />';
         } else {
             $result['html'] = '';
         }

Braces +2 added lines, -4 removed lines

@@ -14,10 +14,8 @@
 
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 
-class ThumbnailCustomElement extends AbstractFormElement
-{
-    public function render()
-    {
+class ThumbnailCustomElement extends AbstractFormElement {
+    public function render() {
         // Custom TCA properties and other data can be found in $this->data, for example the above
         // parameters are available in $this->data['parameterArray']['fieldConf']['config']['parameters']
         $result = $this->initializeResultArray();

Classes/Hooks/ConfigurationForm.php

Braces +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
 
     /**
      * Check if a connection to a Solr server could be established with the given credentials.
@@ -39,8 +38,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkSolrConnection()
-    {
+    public function checkSolrConnection() {
         $solr = Solr::getInstance();
         if ($solr->ready) {
             Helper::addMessage(
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load backend localization file.
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_be.xlf');
     }

Classes/Domain/Model/Document.php

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

@@ -40,7 +40,7 @@ 
      *
      * @var \Kitodo\Dlf\Common\Doc|null
      */
-    protected $doc = null;
+    protected $doc = NULL;
 
     /**
      * @var string
@@ -156,7 +156,7 @@ 
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\Collection>
      * @Extbase\ORM\Lazy
      */
-    protected $collections = null;
+    protected $collections = NULL;
 
     /**
      * @var string

Braces +4 added lines, -8 removed lines

@@ -192,14 +192,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();
     }
 
@@ -577,8 +575,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\Collection> $collections
      */
-    public function getCollections()
-    {
+    public function getCollections() {
         return $this->collections;
     }
 
@@ -607,8 +604,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\Collection> collections
      */
-    public function removeCollection(Collection $collection)
-    {
+    public function removeCollection(Collection $collection) {
         $this->collections->detach($collection);
     }
 

Classes/Domain/Model/Collection.php

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

@@ -61,7 +61,7 @@
      *
      * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference
      */
-    protected $thumbnail = null;
+    protected $thumbnail = NULL;
 
     /**
      * @var int

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 +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findBySettings($settings = [])
-    {
+    public function findBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];