Erikmitk / kitodo-presentation

Classes/Task/ReindexTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class ReindexTask extends BaseTask
-{
-    public function execute()
-    {
+class ReindexTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         if ($this->dryRun) {
             $inputArray['--dry-run'] = true;

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

@@ -29,7 +29,7 @@ 
     {
         $inputArray = [];
         if ($this->dryRun) {
-            $inputArray['--dry-run'] = true;
+            $inputArray['--dry-run'] = TRUE;
         }
         if (count($this->coll)) {
             $inputArray['-c'] = implode(',', $this->coll);
@@ -40,10 +40,10 @@ 
             $inputArray['-o'] = $this->owner;
         }
         if ($this->all) {
-            $inputArray['--all'] = true;
+            $inputArray['--all'] = TRUE;
         }
         if (!empty($this->softCommit)) {
-            $inputArray['--softCommit'] = true;
+            $inputArray['--softCommit'] = TRUE;
         }
 
         $reindexCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\ReindexCommand::class);

Classes/Task/BaseAdditionalFieldProvider.php

Braces +4 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
  *
  * @access public
  */
-class BaseAdditionalFieldProvider implements AdditionalFieldProviderInterface
-{
+class BaseAdditionalFieldProvider implements AdditionalFieldProviderInterface {
     /**
      * Gets additional fields to render in the form to add/edit a task
      *
@@ -39,8 +38,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) {
         return [];
     }
 
@@ -51,8 +49,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
      */
-    public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule)
-    {
+    public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule) {
         $fieldsValid = true;
 
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_tasks.xlf');
@@ -130,8 +127,7 @@ 
      * @param BaseTask $task Reference to the scheduler backend module
      * @return void
      */
-    public function saveAdditionalFields(array $submittedData, AbstractTask $task)
-    {
+    public function saveAdditionalFields(array $submittedData, AbstractTask $task) {
         /** @var BaseTask $task */
         $task->setDryRun(!empty($submittedData['dryRun']));
         if (isset($submittedData['doc'])) {

Spacing +17 added lines, -17 removed lines

@@ -62,7 +62,7 @@ 
 
         if (isset($submittedData['doc']) && empty($submittedData['doc'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.doc').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -73,7 +73,7 @@ 
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.pid').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -100,7 +100,7 @@ 
 
         if ((isset($submittedData['lib']) && (int) $submittedData['lib'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.lib').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -111,7 +111,7 @@ 
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.solr').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -192,8 +192,8 @@ 
     protected function getDryRunField(bool $dryRun): array
     {
         $fieldName = 'dryRun';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($dryRun ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($dryRun ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.dryRun',
@@ -215,15 +215,15 @@ 
     protected function getSolrField(int $solr, int $pid = null): array
     {
         $fieldName = 'solr';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $allSolrCores = $this->getSolrCores($pid);
         $options = [];
         $options[] = '<option value="-1"></option>';
         foreach ($allSolrCores as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . ($solr == $uid ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.($solr == $uid ? 'selected' : '').' >'.$label.'</option>';
         };
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.solr',
@@ -244,7 +244,7 @@ 
     protected function getPidField(int $pid): array
     {
         $fieldName = 'pid';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class);
         $pages = $pageRepository->getTree(0);
@@ -252,11 +252,11 @@ 
         $options = [];
         foreach ($pages['_children'] as $page) {
             if ($page['doktype'] == 254) {
-                $options[] = '<option value="' . $page['uid'] . '" ' . ($pid == $page['uid'] ? 'selected' : '') . ' >' . $page['title'] . '</option>';
+                $options[] = '<option value="'.$page['uid'].'" '.($pid == $page['uid'] ? 'selected' : '').' >'.$page['title'].'</option>';
             }
         }
 
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.pid',
@@ -277,8 +277,8 @@ 
     protected function getOwnerField(string $owner): array
     {
         $fieldName = 'owner';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $owner . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$owner.'" >';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.owner',
@@ -312,7 +312,7 @@ 
         $result = $queryBuilder->execute();
 
         while ($record = $result->fetchAssociative()) {
-            $solrCores[$record['label'] . ' (' . $record['index_name'] . ')'] = $record['uid'];
+            $solrCores[$record['label'].' ('.$record['index_name'].')'] = $record['uid'];
         }
 
         return $solrCores;
@@ -330,8 +330,8 @@ 
     protected function getSoftCommitField(bool $softCommit): array
     {
         $fieldName = 'softCommit';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($softCommit ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($softCommit ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.softCommit',

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

@@ -53,7 +53,7 @@ 
      */
     public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule)
     {
-        $fieldsValid = true;
+        $fieldsValid = TRUE;
 
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_tasks.xlf');
 
@@ -65,10 +65,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) {
@@ -76,10 +76,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if (!isset($submittedData['commit']) && !isset($submittedData['optimize']) && !isset($submittedData['pid']) && ($submittedData['class'] != 'Kitodo\Dlf\Task\SuggestBuildTask')) {
@@ -87,10 +87,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.commitOrOptimize'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if (!$submittedData['uid']) {
@@ -103,10 +103,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
@@ -114,10 +114,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
 
         if (((isset($submittedData['coll']) && isset($submittedData['all'])) || (!isset($submittedData['coll']) && !isset($submittedData['all'])))
@@ -126,10 +126,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.collOrAll'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
         return $fieldsValid;
     }
@@ -212,7 +212,7 @@ 
      *
      * @return array additional field solr dropdown
      */
-    protected function getSolrField(int $solr, int $pid = null): array
+    protected function getSolrField(int $solr, int $pid = NULL): array
     {
         $fieldName = 'solr';
         $fieldId = 'task_' . $fieldName;
@@ -296,14 +296,14 @@ 
      *
      * @return array Array of valid Solr cores
      */
-    private function getSolrCores(int $pid = null): array
+    private function getSolrCores(int $pid = NULL): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_solrcores');
 
         $solrCores = [];
         $result = $queryBuilder->select('uid', 'label', 'index_name')
             ->from('tx_dlf_solrcores');
-        if ($pid !== null) {
+        if ($pid !== NULL) {
             $queryBuilder->where(
                 $queryBuilder->expr()
                     ->eq('pid', $queryBuilder->createNamedParameter((int) $pid, Connection::PARAM_INT))

Classes/Task/HarvestTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class HarvestTask extends BaseTask
-{
-    public function execute()
-    {
+class HarvestTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         if ($this->dryRun) {
             $inputArray['--dry-run'] = true;

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

@@ -29,7 +29,7 @@ 
     {
         $inputArray = [];
         if ($this->dryRun) {
-            $inputArray['--dry-run'] = true;
+            $inputArray['--dry-run'] = TRUE;
         }
         $inputArray['-l'] = $this->lib;
         $inputArray['-p'] = $this->pid;
@@ -44,7 +44,7 @@ 
             $inputArray['--set'] = $this->set;
         }
         if (!empty($this->softCommit)) {
-            $inputArray['--softCommit'] = true;
+            $inputArray['--softCommit'] = TRUE;
         }
 
         $harvestCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\HarvestCommand::class);

Classes/Task/IndexTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class IndexTask extends BaseTask
-{
-    public function execute()
-    {
+class IndexTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         if ($this->dryRun) {
             $inputArray['--dry-run'] = true;

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

@@ -29,7 +29,7 @@ 
     {
         $inputArray = [];
         if ($this->dryRun) {
-            $inputArray['--dry-run'] = true;
+            $inputArray['--dry-run'] = TRUE;
         }
         $inputArray['-d'] = $this->doc;
         $inputArray['-p'] = $this->pid;
@@ -38,7 +38,7 @@ 
             $inputArray['-o'] = $this->owner;
         }
         if (!empty($this->softCommit)) {
-            $inputArray['--softCommit'] = true;
+            $inputArray['--softCommit'] = TRUE;
         }
 
         $indexCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\IndexCommand::class);

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;
     }