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 +2 added lines, -2 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,7 +40,7 @@ 
             $inputArray['-o'] = $this->owner;
         }
         if ($this->all) {
-            $inputArray['--all'] = true;
+            $inputArray['--all'] = TRUE;
         }
 
         $reindexCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\ReindexCommand::class);

Classes/Task/BaseAdditionalFieldProvider.php

Spacing +14 added lines, -14 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) || !isset($submittedData['pid'])) {
             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,
@@ -89,7 +89,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,
@@ -100,7 +100,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,
@@ -178,8 +178,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',
@@ -201,15 +201,15 @@ 
     protected function getSolrField(int $solr, int $pid): 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',
@@ -230,7 +230,7 @@ 
     protected function getPidField(int $pid): array
     {
         $fieldName = 'pid';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class);
         $pages = $pageRepository->getTree(0);
@@ -238,11 +238,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',
@@ -263,8 +263,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',

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'])) {

Upper-Lower-Casing +11 added lines, -11 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) || !isset($submittedData['pid'])) {
@@ -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 (!$submittedData['uid']) {
@@ -92,10 +92,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
@@ -103,10 +103,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if (((isset($submittedData['coll']) && isset($submittedData['all'])) || (!isset($submittedData['coll']) && !isset($submittedData['all'])))
@@ -115,10 +115,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.collOrAll'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
         return $fieldsValid;
     }

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

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

Classes/Task/BaseTask.php

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
  *
  * @access public
  */
-class BaseTask extends AbstractTask
-{
+class BaseTask extends AbstractTask {
 
     /**
      * @access protected
@@ -92,8 +91,7 @@ 
      */
     protected string $set = '';
 
-    public function execute()
-    {
+    public function execute() {
         return true;
     }
 

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

@@ -30,7 +30,7 @@ 
      * @access protected
      * @var bool
      */
-    protected bool $dryRun = false;
+    protected bool $dryRun = FALSE;
 
     /**
      * @access protected
@@ -72,7 +72,7 @@ 
      * @access protected
      * @var bool
      */
-    protected bool $all = false;
+    protected bool $all = FALSE;
 
     /**
      * @access protected
@@ -94,7 +94,7 @@ 
 
     public function execute()
     {
-        return true;
+        return TRUE;
     }
 
     /**
@@ -318,7 +318,7 @@ 
                 $message,
                 '',
                 $severity == FlashMessage::ERROR ? FlashMessage::ERROR : FlashMessage::OK,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
         }

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

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

ext_localconf.php

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

@@ -97,7 +97,7 @@
     'additionalFields' => \Kitodo\Dlf\Task\HarvestAdditionalFieldProvider::class,
 ];
 // Register AJAX eID handlers.
-if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['general']['enableInternalProxy'] ?? false) {
+if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['general']['enableInternalProxy'] ?? FALSE) {
     $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
 }
 // Use Caching Framework for Solr queries

Spacing +9 added lines, -9 removed lines

@@ -66,14 +66,14 @@ 
 $_EXTKEY = 'dlf';
 // Register tools for toolbox plugin.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = [];
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_scoretool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.scoretool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltexttool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.annotationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltextdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagedownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagemanipulationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.pdfdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.searchindocumenttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_scoretool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.scoretool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltexttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.annotationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.fulltextdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagedownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.imagemanipulationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.pdfdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:tx_dlf_toolbox.searchindocumenttool';
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
@@ -99,7 +99,7 @@ 
 ];
 // Register AJAX eID handlers.
 if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['general']['enableInternalProxy'] ?? false) {
-    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
+    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class.'::main';
 }
 // Use Caching Framework for Solr queries
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] ??= [];

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