Erikmitk / kitodo-presentation

Classes/Task/ReindexAdditionalFieldProvider.php

Spacing +6 added lines, -6 removed lines

@@ -63,10 +63,10 @@ 
 
         // Select for collection(s)
         $fieldName = 'coll';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
         $options = $this->getCollOptions($taskInfo['coll'], $taskInfo['pid']);
         ;
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . '][]" id="' . $fieldId . '" size="10" multiple="multiple">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.'][]" id="'.$fieldId.'" size="10" multiple="multiple">'.implode("\n", $options).'</select>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.coll',
@@ -85,9 +85,9 @@ 
 
         // Checkbox for all
         $fieldName = 'all';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' .
-            ($taskInfo['all'] ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.
+            ($taskInfo['all'] ? ' checked="checked"' : '').'>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.all',
@@ -111,7 +111,7 @@ 
         $options = [];
         $collections = $this->getCollections($pid);
         foreach ($collections as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . (in_array($uid, $coll) ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.(in_array($uid, $coll) ? 'selected' : '').' >'.$label.'</option>';
         }
         return $options;
     }

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
  *
  * @access public
  */
-class ReindexAdditionalFieldProvider extends BaseAdditionalFieldProvider
-{
+class ReindexAdditionalFieldProvider extends BaseAdditionalFieldProvider {
     /**
      * Gets additional fields to render in the form to add/edit a task
      *
@@ -35,8 +34,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return array A two dimensional array, array('Identifier' => array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
      */
-    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule)
-    {
+    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule) {
         $currentSchedulerModuleAction = $schedulerModule->getCurrentAction();
 
         /** @var BaseTask $task */

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

@@ -49,13 +49,13 @@
             $taskInfo['all'] = $task->isAll();
             $taskInfo['softCommit'] = $task->isSoftCommit();
         } else {
-            $taskInfo['dryRun'] = false;
+            $taskInfo['dryRun'] = FALSE;
             $taskInfo['coll'] = [];
             $taskInfo['pid'] = - 1;
             $taskInfo['solr'] = - 1;
             $taskInfo['owner'] = '';
-            $taskInfo['all'] = false;
-            $taskInfo['softCommit'] = false;
+            $taskInfo['all'] = FALSE;
+            $taskInfo['softCommit'] = FALSE;
         }
 
         $additionalFields = [];

Classes/Domain/Model/AnnotationTarget.php

Braces +11 added lines, -22 removed lines

@@ -12,8 +12,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-class AnnotationTarget
-{
+class AnnotationTarget {
     /**
      * @var string
      */
@@ -39,8 +38,7 @@ 
      */
     protected $rangeValue;
 
-    public function __construct($url)
-    {
+    public function __construct($url) {
         $this->url = $url;
 
         $path = parse_url($url, PHP_URL_PATH);
@@ -65,40 +63,35 @@ 
     /**
      * @return string
      */
-    public function getObjectId()
-    {
+    public function getObjectId() {
         return $this->objectId;
     }
 
     /**
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
     /**
      * @return string
      */
-    public function getRangeParameterName()
-    {
+    public function getRangeParameterName() {
         return $this->rangeParameterName;
     }
 
     /**
      * @return string
      */
-    public function getRangeValue()
-    {
+    public function getRangeValue() {
         return $this->rangeValue;
     }
 
     /**
      * @return bool
      */
-    public function isValid()
-    {
+    public function isValid() {
         if (empty($this->getObjectId())) {
             return false;
         }
@@ -113,8 +106,7 @@ 
     /**
      * @return bool
      */
-    public function isValidRange()
-    {
+    public function isValidRange() {
         if (empty($this->rangeParameterName) && empty($this->rangeValue)) {
             return true;
         } elseif ($this->isFacsimileRange()) {
@@ -131,24 +123,21 @@ 
     /**
      * @return bool
      */
-    public function isScoreRange()
-    {
+    public function isScoreRange() {
         return $this->getRangeParameterName() === 'measureRanges';
     }
 
     /**
      * @return bool
      */
-    public function isAudioRange()
-    {
+    public function isAudioRange() {
         return $this->getRangeParameterName() === 't';
     }
 
     /**
      * @return bool
      */
-    public function isFacsimileRange()
-    {
+    public function isFacsimileRange() {
         return $this->getRangeParameterName() === 'xywh';
     }
 }

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

@@ -100,14 +100,14 @@ 
     public function isValid()
     {
         if (empty($this->getObjectId())) {
-            return false;
+            return FALSE;
         }
 
         if (parse_url($this->getUrl(), PHP_URL_FRAGMENT)) {
             return !empty($this->getId()) && $this->isValidRange();
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -116,7 +116,7 @@ 
     public function isValidRange()
     {
         if (empty($this->rangeParameterName) && empty($this->rangeValue)) {
-            return true;
+            return TRUE;
         } elseif ($this->isFacsimileRange()) {
             return preg_match("/^(\d+)(,\d+){3}?$/", $this->rangeValue) === 1;
         } elseif ($this->isAudioRange()) {
@@ -125,7 +125,7 @@ 
             return preg_match("/^((\d+|start|end|all|(\d+|start)(-(\d+|end)){0,1})+)(,(\d+|start|end|all|(\d+|start)(-(\d+|end)){0,1})+){0,}?$/", $this->rangeValue) === 1;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**

Classes/Domain/Model/Annotation.php

Braces +18 added lines, -36 removed lines

@@ -12,8 +12,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-class Annotation
-{
+class Annotation {
     /**
      * The complete data of the annotation
      *
@@ -30,8 +29,7 @@ 
     /**
      * @param array $data
      */
-    public function __construct($data)
-    {
+    public function __construct($data) {
         $this->data = $data;
     }
 
@@ -40,8 +38,7 @@ 
      *
      * @return array
      */
-    public function getRawData()
-    {
+    public function getRawData() {
         return $this->data;
     }
 
@@ -50,8 +47,7 @@ 
      *
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->data['id'] ?? '';
     }
 
@@ -60,8 +56,7 @@ 
      *
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->data['title'] ?? '';
     }
 
@@ -70,8 +65,7 @@ 
      *
      * @return array
      */
-    public function getBody()
-    {
+    public function getBody() {
         $body = $this->data['body'] ?? '';
 
         if (is_array($body)) {
@@ -85,8 +79,7 @@ 
      * Gets the name of the annotation creator
      * @return string
      */
-    public function getCreatorName()
-    {
+    public function getCreatorName() {
         return $this->data['creator']['displayName'] ?? '';
     }
 
@@ -94,8 +87,7 @@ 
      * Gets the creation date of the annotation
      * @return string
      */
-    public function getCreated()
-    {
+    public function getCreated() {
         return $this->data['created'] ?? '';
     }
 
@@ -103,8 +95,7 @@ 
      * Gets the modification date of the annotation
      * @return string
      */
-    public function getModified()
-    {
+    public function getModified() {
         return $this->data['modified'] ?? '';
     }
 
@@ -113,8 +104,7 @@ 
      *
      * @return AnnotationTarget[]
      */
-    public function getTargets()
-    {
+    public function getTargets() {
         if (is_string($this->data['target'])) {
             return [new AnnotationTarget($this->data['target'])];
         }
@@ -133,8 +123,7 @@ 
      * @param array $targetPages
      * @return void
      */
-    public function setTargetPages($targetPages)
-    {
+    public function setTargetPages($targetPages) {
         $this->targetPages = $targetPages;
     }
 
@@ -143,8 +132,7 @@ 
      *
      * @return array
      */
-    public function getTargetPages()
-    {
+    public function getTargetPages() {
         return $this->targetPages;
     }
 
@@ -153,8 +141,7 @@ 
      *
      * @return array
      */
-    public function getPageNumbers()
-    {
+    public function getPageNumbers() {
         $pages = [];
         if (is_array($this->targetPages)) {
             foreach ($this->targetPages as $target) {
@@ -170,8 +157,7 @@ 
      *
      * @return array
      */
-    public function getPageTargets()
-    {
+    public function getPageTargets() {
         $pageTargets = [];
         if (is_array($this->targetPages)) {
             foreach ($this->targetPages as $target) {
@@ -189,8 +175,7 @@ 
      *
      * @return array
      */
-    public function getPageAudioRanges()
-    {
+    public function getPageAudioRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -209,8 +194,7 @@ 
      *
      * @return array
      */
-    public function getPageScoreRanges()
-    {
+    public function getPageScoreRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -229,8 +213,7 @@ 
      *
      * @return array
      */
-    public function getPageFacsimileRanges()
-    {
+    public function getPageFacsimileRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -250,8 +233,7 @@ 
      *
      * @return bool
      */
-    public function isVerovioRelevant()
-    {
+    public function isVerovioRelevant() {
         foreach ($this->targetPages as $target) {
             if (array_key_exists('verovioRelevant', $target) && $target['verovioRelevant']) {
                     return true;

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

@@ -254,10 +254,10 @@
     {
         foreach ($this->targetPages as $target) {
             if (array_key_exists('verovioRelevant', $target) && $target['verovioRelevant']) {
-                    return true;
+                    return TRUE;
             }
         }
 
-        return false;
+        return FALSE;
     }
 }

Classes/Domain/Model/MetadataFormat.php

Braces +6 added lines, -12 removed lines

@@ -30,8 +30,7 @@ 
  *
  * @access public
  */
-class MetadataFormat extends AbstractEntity
-{
+class MetadataFormat extends AbstractEntity {
     /**
      * @access protected
      * @var int UID of the ``tx_dlf_metadata`` that is encoded by this metadata entry.
@@ -76,14 +75,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->subentries = new ObjectStorage();
     }
 
@@ -151,8 +148,7 @@ 
         $this->xpathSorting = $xpathSorting;
     }
 
-    public function getSubentries()
-    {
+    public function getSubentries() {
         return $this->subentries;
     }
 
@@ -168,8 +164,7 @@ 
      *
      * @return void
      */
-    public function addSubentry(MetadataSubentry $subentry)
-    {
+    public function addSubentry(MetadataSubentry $subentry) {
         $this->subentries->attach($subentry);
     }
 
@@ -180,8 +175,7 @@ 
      *
      * @return void
      */
-    public function removeSubentry(MetadataSubentry $subentryToRemove)
-    {
+    public function removeSubentry(MetadataSubentry $subentryToRemove) {
         $this->subentries->detach($subentryToRemove);
     }
 

Classes/Controller/ToolboxController.php

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
  *
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
 
     /**
      * @access private
@@ -208,8 +207,7 @@ 
      *
      * @return void
      */
-    public function renderScoreTool()
-    {
+    public function renderScoreTool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['files']['fileGrpScore'])

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

@@ -120,7 +120,7 @@ 
     private function renderToolByName(string $tool): void
     {
         $this->$tool();
-        $this->view->assign($tool, true);
+        $this->view->assign($tool, TRUE);
     }
 
     /**
@@ -142,12 +142,12 @@ 
 
         $annotationContainers = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['annotationContainers'];
         if (
-            $annotationContainers != null
+            $annotationContainers != NULL
             && count($annotationContainers) > 0
         ) {
-            $this->view->assign('annotationTool', true);
+            $this->view->assign('annotationTool', TRUE);
         } else {
-            $this->view->assign('annotationTool', false);
+            $this->view->assign('annotationTool', FALSE);
         }
     }
 
@@ -196,10 +196,10 @@ 
         $this->setPage();
 
         if (!$this->isFullTextEmpty()) {
-            $this->view->assign('fulltext', true);
+            $this->view->assign('fulltext', TRUE);
             $this->view->assign('activateFullTextInitially', MathUtility::forceIntegerInRange($this->settings['activateFullTextInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('fulltext', false);
+            $this->view->assign('fulltext', FALSE);
         }
     }
 
@@ -231,10 +231,10 @@ 
             }
         }
         if (!empty($scoreFile)) {
-            $this->view->assign('score', true);
+            $this->view->assign('score', TRUE);
             $this->view->assign('activateScoreInitially', MathUtility::forceIntegerInRange($this->settings['activateScoreInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('score', false);
+            $this->view->assign('score', FALSE);
         }
     }
 
@@ -320,7 +320,7 @@ 
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
-        $this->view->assign('imageManipulation', true);
+        $this->view->assign('imageManipulation', TRUE);
         $this->view->assign('parentContainer', $parentContainer);
     }
 
@@ -483,7 +483,7 @@ 
     {
         $id = $this->document->getUid();
 
-        if ($id !== null && $id > 0) {
+        if ($id !== NULL && $id > 0) {
             // we found the document uid
             return (string) $id;
         } else {
@@ -539,9 +539,9 @@ 
         while ($fileGrpFulltext = array_shift($fileGrpsFulltext)) {
             $files = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['files'];
             if (!empty($files[$fileGrpFulltext])) {
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
                         $this->renderToolByName('renderScoreTool');
                         break;
                     default:
-                        $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.');
+                        $this->logger->warning('Incorrect tool configuration: "'.$this->settings['tools'].'". Tool "'.$tool.'" does not exist.');
                 }
             }
         }
@@ -318,7 +318,7 @@ 
                 $file['url'] = $this->currentDocument->getDownloadLocation($fileId);
                 $file['mimetype'] = $this->currentDocument->getFileMimeType($fileId);
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $file;
@@ -426,7 +426,7 @@ 
             empty($firstPageLink)
             && empty($secondPageLink)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
 
         if (!empty($firstPageLink)) {
@@ -464,7 +464,7 @@ 
             }
         }
         if (empty($workLink)) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
         return $workLink;
     }

Classes/Controller/AbstractController.php

Spacing +9 added lines, -9 removed lines

@@ -158,11 +158,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 
@@ -259,7 +259,7 @@ 
             && !MathUtility::canBeInterpretedAsInteger($this->requestData['id'])
             && !GeneralUtility::isValidUrl($this->requestData['id'])
         ) {
-            $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading');
+            $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading');
             unset($this->requestData['id']);
         }
 
@@ -355,7 +355,7 @@ 
         $pages = [];
         $pagesSect = [];
         $aRange = [];
-        $nRange = 5;    // ToDo: should be made configurable
+        $nRange = 5; // ToDo: should be made configurable
 
         // lower limit of the range
         $nBottom = $currentPageNumber - $nRange;
@@ -370,7 +370,7 @@ 
 
         // check whether the first screen page is > 1, if yes then points must be added
         if ($aRange[0] > 1) {
-            array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']);
+            array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']);
         };
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
@@ -413,7 +413,7 @@ 
 
                 // Check if screen page is in range
                 if (in_array($i, $aRange)) {
-                    array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]);
+                    array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]);
                 };
             };
         };
@@ -476,7 +476,7 @@ 
         if ($this->document) {
             $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
         } else {
-            $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
 
         return $doc;
@@ -514,7 +514,7 @@ 
             foreach ($this->requestData['multipleSource'] as $location) {
                 $document = AbstractDocument::getInstance($location, $this->settings, true);
                 if ($document !== null) {
-                    $this->documentArray['extra_' . $i] = $document;
+                    $this->documentArray['extra_'.$i] = $document;
                 }
                 $i++;
             }
@@ -538,7 +538,7 @@ 
 
             $this->document->setLocation($documentId);
         } else {
-            $this->logger->error('Invalid location given "' . $documentId . '" for document loading');
+            $this->logger->error('Invalid location given "'.$documentId.'" for document loading');
         }
 
         return $doc;

Braces +9 added lines, -12 removed lines

@@ -35,8 +35,7 @@ 
  *
  * @abstract
  */
-abstract class AbstractController extends ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -236,8 +235,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely(string $parameterName)
-    {
+    protected function getParametersSafely(string $parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -333,8 +331,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 
@@ -375,7 +372,8 @@ 
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
             // detect which pagination is active: ListView or GridView
-            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {  // ListView
+            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {
+// ListView
                 $lastStartRecordNumberGrid = $i; // save last $startRecordNumber for LastPage button
 
                 $pages[$i] = [
@@ -388,7 +386,8 @@ 
                 if (in_array($i, $aRange)) {
                     array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $i]);
                 };
-            } else { // GridView
+            } else {
+// GridView
                 // to calculate the values for generation the links for the pagination pages
                 /** @var \Kitodo\Dlf\Pagination\PageGridPaginator $paginator */
                 $itemsPerPage = $paginator->getPublicItemsPerPage();
@@ -468,8 +467,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUid(int $documentId)
-    {
+    private function getDocumentByUid(int $documentId) {
         $doc = null;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
@@ -491,8 +489,7 @@ 
      *
      * @return AbstractDocument
      */
-    protected function getDocumentByUrl(string $documentId)
-    {
+    protected function getDocumentByUrl(string $documentId) {
         $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {

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

@@ -61,7 +61,7 @@ 
      * @access protected
      * @var Document|null This holds the current document
      */
-    protected ?Document $document = null;
+    protected ?Document $document = NULL;
 
     /**
      * @access protected
@@ -137,7 +137,7 @@ 
         // Try to get document format from database
         if (!empty($documentId)) {
 
-            $doc = null;
+            $doc = NULL;
 
             if (MathUtility::canBeInterpretedAsInteger($documentId)) {
                 $doc = $this->getDocumentByUid($documentId);
@@ -145,7 +145,7 @@ 
                 $doc = $this->getDocumentByUrl($documentId);
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setCurrentDocument($doc);
             }
 
@@ -153,9 +153,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($this->requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
-                if ($doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
+                if ($doc !== NULL) {
                     $this->document->setCurrentDocument($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
@@ -212,7 +212,7 @@ 
      */
     protected function isDocMissing(): bool
     {
-        return $this->document === null || $this->document->getCurrentDocument() === null;
+        return $this->document === NULL || $this->document->getCurrentDocument() === NULL;
     }
 
     /**
@@ -241,7 +241,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -313,7 +313,7 @@ 
             if (isset($this->settings['multiViewType']) && $this->document->getCurrentDocument()->tableOfContents[0]['type'] === $this->settings['multiViewType']) {
                 $i = 0;
                 foreach ($this->documentArray as $document) {
-                    if ($document !== null) {
+                    if ($document !== NULL) {
                         $this->requestData['docPage'][$i] = MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i], 1, $document->numPages, 1);
                         $i++;
                     }
@@ -424,8 +424,8 @@ 
         };
 
         // Safely get the next and previous page numbers
-        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : null;
-        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : null;
+        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : NULL;
+        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : NULL;
 
         // 'startRecordNumber' is not required in GridView, only the variant for each loop is required
         // 'endRecordNumber' is not required in both views
@@ -470,11 +470,11 @@ 
      */
     private function getDocumentByUid(int $documentId)
     {
-        $doc = null;
+        $doc = NULL;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
         if ($this->document) {
-            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
+            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
         } else {
             $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
         }
@@ -493,13 +493,13 @@ 
      */
     protected function getDocumentByUrl(string $documentId)
     {
-        $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
+        $doc = AbstractDocument::getInstance($documentId, $this->settings, TRUE);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {
             $childDocuments = $doc->tableOfContents[0]['children'];
             $i = 0;
             foreach ($childDocuments as $document) {
-                $this->documentArray[] = AbstractDocument::getInstance($document['points'], $this->settings, true);
+                $this->documentArray[] = AbstractDocument::getInstance($document['points'], $this->settings, TRUE);
                 if (!isset($this->requestData['docPage'][$i]) && isset(explode('#', $document['points'])[1])) {
                     $initPage = explode('#', $document['points'])[1];
                     $this->requestData['docPage'][$i] = $initPage;
@@ -512,21 +512,21 @@ 
         if ($this->requestData['multipleSource'] && is_array($this->requestData['multipleSource'])) {
             $i = 0;
             foreach ($this->requestData['multipleSource'] as $location) {
-                $document = AbstractDocument::getInstance($location, $this->settings, true);
-                if ($document !== null) {
+                $document = AbstractDocument::getInstance($location, $this->settings, TRUE);
+                if ($document !== NULL) {
                     $this->documentArray['extra_' . $i] = $document;
                 }
                 $i++;
             }
         }
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             $this->document = GeneralUtility::makeInstance(Document::class);
 
             if ($doc->recordId) {
                 // find document from repository by recordId
                 $docFromRepository = $this->documentRepository->findOneByRecordId($doc->recordId);
-                if ($docFromRepository !== null) {
+                if ($docFromRepository !== NULL) {
                     $this->document = $docFromRepository;
                 }
             }

Classes/Controller/PageViewController.php

Braces +4 added lines, -8 removed lines

@@ -30,8 +30,7 @@ 
  *
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * @access protected
      * @var array Holds the controls to add to the map
@@ -256,8 +255,7 @@ 
      * @param $page
      * @return false|int|mixed|string|null
      */
-    public function convertMeasureOrPage($document, $measure = null, $page = null)
-    {
+    public function convertMeasureOrPage($document, $measure = null, $page = null) {
         $return = null;
         $measure2Page = array_column($document->musicalStructure, 'page');
         if ($measure) {
@@ -273,8 +271,7 @@ 
      * Action to add multiple mets sources (multi page view)
      * @return void
      */
-    public function addDocumentAction(FormAddDocument $formAddDocument)
-    {
+    public function addDocumentAction(FormAddDocument $formAddDocument) {
         if (GeneralUtility::isValidUrl($formAddDocument->getLocation())) {
             $nextMultipleSourceKey = 0;
             if ($this->requestData['multipleSource']) {
@@ -367,8 +364,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getScore(int $page, MetsDocument $specificDoc = null)
-    {
+    protected function getScore(int $page, MetsDocument $specificDoc = null) {
         $score = [];
         $loc = '';
         if ($specificDoc) {

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

@@ -174,7 +174,7 @@ 
             // convert either page or measure if requestData exists
             if ($this->requestData['docPage'][$i] && empty($this->requestData['docMeasure'][$i])) {
                 // convert document page information to measure count information
-                $this->requestData['docMeasure'][$i] = $this->convertMeasureOrPage($document, null, $this->requestData['docPage'][$i]);
+                $this->requestData['docMeasure'][$i] = $this->convertMeasureOrPage($document, NULL, $this->requestData['docPage'][$i]);
 
             } elseif ((empty($this->requestData['docPage'][$i]) || $this->requestData['docPage'][$i] === 1) && $this->requestData['docMeasure'][$i]) {
                 $this->requestData['docPage'][$i] = $this->convertMeasureOrPage($document, $this->requestData['docMeasure'][$i]);
@@ -256,9 +256,9 @@ 
      * @param $page
      * @return false|int|mixed|string|null
      */
-    public function convertMeasureOrPage($document, $measure = null, $page = null)
+    public function convertMeasureOrPage($document, $measure = NULL, $page = NULL)
     {
-        $return = null;
+        $return = NULL;
         $measure2Page = array_column($document->musicalStructure, 'page');
         if ($measure) {
             $return = $measure2Page[$measure];
@@ -303,7 +303,7 @@ 
      * @param int|null $docNumber
      * @return array
      */
-    protected function getMeasures(int $page, MetsDocument $specificDoc = null, $docNumber = null): array
+    protected function getMeasures(int $page, MetsDocument $specificDoc = NULL, $docNumber = NULL): array
     {
         if ($specificDoc) {
             $doc = $specificDoc;
@@ -367,7 +367,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getScore(int $page, MetsDocument $specificDoc = null)
+    protected function getScore(int $page, MetsDocument $specificDoc = NULL)
     {
         $score = [];
         $loc = '';
@@ -397,7 +397,7 @@ 
                     // Configure @action URL for form.
                     $uri = $this->uriBuilder->reset()
                         ->setTargetPageUid($this->pageUid)
-                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? true : false)
+                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? TRUE : FALSE)
                         ->setArguments(
                             [
                                 'eID' => 'tx_dlf_pageview_proxy',
@@ -466,7 +466,7 @@ 
             $jsViewer = 'tx_dlf_viewer = [];';
             $i = 0;
             foreach ($this->documentArray as $document) {
-                if ($document !== null) {
+                if ($document !== NULL) {
                     $docPage = $this->requestData['docPage'][$i];
                     $docImage = [];
                     $docFulltext = [];
@@ -480,7 +480,7 @@ 
                             $docPage = $measure2Page[$this->requestData['docMeasure'][$i]];
                         }
                     }
-                    if ($docPage == null) {
+                    if ($docPage == NULL) {
                         $docPage = 1;
                     }
                     $docImage[0] = $this->getImage($docPage, $document);
@@ -567,7 +567,7 @@ 
             if ($iiif instanceof ManifestInterface) {
                 $canvas = $iiif->getContainedResourceById($canvasId);
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
-                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
+                if ($canvas != NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     $annotationContainers = [];
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -577,11 +577,11 @@ 
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
                      */
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if (
                                     $annotation->getBody()->getFormat() == 'text/plain'
-                                    && $annotation->getBody()->getChars() != null
+                                    && $annotation->getBody()->getChars() != NULL
                                 ) {
                                     $annotationListData = [];
                                     $annotationListData['uri'] = $annotationContainer->getId();
@@ -618,7 +618,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage(int $page, MetsDocument $specificDoc = null): array
+    protected function getImage(int $page, MetsDocument $specificDoc = NULL): array
     {
         $image = [];
         // Get @USE value of METS fileGrp.

Spacing +20 added lines, -20 removed lines

@@ -181,18 +181,18 @@ 
             }
 
             $navigationArray[$i]['next'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
             ];
             $navigationArray[$i]['prev'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
             ];
 
             $navigateAllPageNext = array_merge(
                 $navigateAllPageNext,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
                 ]
             );
@@ -200,7 +200,7 @@ 
             $navigateAllPagePrev = array_merge(
                 $navigateAllPagePrev,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
                 ]
             );
@@ -208,7 +208,7 @@ 
             $navigateAllMeasureNext = array_merge(
                 $navigateAllMeasureNext,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ]
             );
@@ -216,19 +216,19 @@ 
             $navigateAllMeasurePrev = array_merge(
                 $navigateAllMeasurePrev,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ]
             );
 
             if ($document->numMeasures > 0) {
                 $navigationMeasureArray[$i]['next'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ];
 
                 $navigationMeasureArray[$i]['prev'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ];
             }
@@ -282,7 +282,7 @@ 
             }
             $params = array_merge(
                 ['tx_dlf' => $this->requestData],
-                ['tx_dlf[multipleSource][' . $nextMultipleSourceKey . ']' => $formAddDocument->getLocation()],
+                ['tx_dlf[multipleSource]['.$nextMultipleSourceKey.']' => $formAddDocument->getLocation()],
                 ['tx_dlf[multiview]' => 1]
             );
             $uriBuilder = $this->uriBuilder;
@@ -329,7 +329,7 @@ 
                             // build link for each measure
                             $params = [
                                 'tx_dlf' => $this->requestData,
-                                'tx_dlf[docMeasure][' . $docNumber . ']' => $i
+                                'tx_dlf[docMeasure]['.$docNumber.']' => $i
                             ];
                         } else {
                             // build link for each measure
@@ -413,7 +413,7 @@ 
         }
 
         if (empty($score)) {
-            $this->logger->notice('No score file found for page "' . $page . '" in fileGrps "' . $this->settings['fileGrpScore'] . '"');
+            $this->logger->notice('No score file found for page "'.$page.'" in fileGrps "'.$this->settings['fileGrpScore'].'"');
         }
         return $score;
     }
@@ -444,11 +444,11 @@ 
                 $fulltext['mimetype'] = $file['mimeType'];
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -508,7 +508,7 @@ 
                         'measureIdLinks' => $docMeasures['measureLinks']
                     ];
 
-                    $jsViewer .= 'tx_dlf_viewer[' . $i . '] = new dlfViewer(' . json_encode($viewer) . ');
+                    $jsViewer .= 'tx_dlf_viewer['.$i.'] = new dlfViewer('.json_encode($viewer).');
                             ';
                     $i++;
                 }
@@ -517,8 +517,8 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        ' . $jsViewer . '
-                        viewerCount = ' . ($i - 1) . ';
+                        ' . $jsViewer.'
+                        viewerCount = ' . ($i - 1).';
                     }
                 });';
         } else {
@@ -548,7 +548,7 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer) . ');
+                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer).');
                     }
                 });';
         }
@@ -644,7 +644,7 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
 
             } else {
@@ -664,12 +664,12 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
         }
         return $image;
     }

Classes/Controller/AnnotationController.php

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
  * @subpackage dlf
  * @access public
  */
-class AnnotationController extends AbstractController
-{
+class AnnotationController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->loadDocument();
 
         if (

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

@@ -33,8 +33,8 @@
         $this->loadDocument();
 
         if (
-            $this->document === null
-            || $this->document->getCurrentDocument() === null
+            $this->document === NULL
+            || $this->document->getCurrentDocument() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return;

Classes/ViewHelpers/IsArrayViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -18,10 +18,8 @@ 
 /**
  * Checks if the given subject is an array.
  */
-class IsArrayViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class IsArrayViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('subject', 'string', 'The subject');
     }
@@ -29,8 +27,7 @@ 
     /**
      * @return bool
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
+    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) {
         $subject = $arguments['subject'];
         if ($subject === null) {
             $subject = $renderChildrenClosure();

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

@@ -32,7 +32,7 @@
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $subject = $arguments['subject'];
-        if ($subject === null) {
+        if ($subject === NULL) {
             $subject = $renderChildrenClosure();
         }