Erikmitk / kitodo-presentation

Classes/Domain/Repository/MailRepository.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 class MailRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
 
-    public function findAllWithPid($pid)
-    {
+    public function findAllWithPid($pid) {
         /** @var Typo3QuerySettings $querySettings */
         $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
 

Classes/Domain/Model/Metadata.php

Braces +5 added lines, -10 removed lines

@@ -109,14 +109,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->format = new ObjectStorage();
     }
 
@@ -187,8 +185,7 @@ 
     /**
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\MetadataFormat> $format
      */
-    public function getFormat()
-    {
+    public function getFormat() {
         return $this->format;
     }
 
@@ -207,8 +204,7 @@ 
      *
      * @return void
      */
-    public function addFormat(MetadataFormat $format)
-    {
+    public function addFormat(MetadataFormat $format) {
         $this->format->attach($format);
     }
 
@@ -219,8 +215,7 @@ 
      *
      * @return void
      */
-    public function removeFormat(MetadataFormat $formatToRemove)
-    {
+    public function removeFormat(MetadataFormat $formatToRemove) {
         $this->format->detach($formatToRemove);
     }
 

Classes/Controller/BasketController.php

Spacing +26 added lines, -26 removed lines

@@ -109,7 +109,7 @@ 
                 foreach ($this->requestData['selected'] as $docValue) {
                     if ($docValue['id']) {
                         $docData = $this->getDocumentData($docValue['id'], $docValue);
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                         $this->redirectToUri($pdfUrl);
                     }
                 }
@@ -172,7 +172,7 @@ 
         if ($allMails->count() > 0) {
             $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf'));
             foreach ($allMails as $mail) {
-                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')';
+                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')';
             }
             $this->view->assign('mailSelect', $mailSelect);
         }
@@ -256,12 +256,12 @@ 
 
         $entryArray['BASKETDATA'] = $docData;
 
-        $entryKey = $id . '_' . $startpage;
+        $entryKey = $id.'_'.$startpage;
         if (!empty($startX)) {
-            $entryKey .= '_' . $startX;
+            $entryKey .= '_'.$startX;
         }
         if (!empty($endX)) {
-            $entryKey .= '_' . $endX;
+            $entryKey .= '_'.$endX;
         }
 
         $entryArray['id'] = $id;
@@ -312,7 +312,7 @@ 
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams);
 
-            $downloadUrl = $this->settings['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->settings['pdfgenerate'].$urlParams;
 
             $title = $this->document->getTitle();
             if (empty($title)) {
@@ -323,15 +323,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' ';
+                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'];
             } else {
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -407,12 +407,12 @@ 
             if ($_piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $this->document->getDoc()->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -431,14 +431,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams;
                 if ($this->settings['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -476,12 +476,12 @@ 
         }
         foreach ($_piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (!empty($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (!empty($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -514,7 +514,7 @@ 
 
         $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst();
 
-        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n";
+        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->settings['pdfdownload'];
         // prepare links
@@ -522,7 +522,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData($explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -533,7 +533,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php');
         // Hook for getting a customized mail body.
@@ -560,7 +560,7 @@ 
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
         $newActionLog->setFileName($pdfUrl);
         $newActionLog->setCountPages($numberOfPages);
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
 
         if ($GLOBALS["TSFE"]->loginUser) {
             // internal user
@@ -592,7 +592,7 @@ 
         foreach ($this->requestData['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -610,7 +610,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -627,12 +627,12 @@ 
             // internal user
             $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']);
             $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']);
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         } else {
             // external user
             $actionLog->setUserId(0);
             $actionLog->setName('n/a');
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         }
         // add action to protocol
         $this->actionLogRepository->add($actionLog);

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

@@ -162,7 +162,7 @@ 
 
         $countDocs = 0;
         if ($basket->getDocIds()) {
-            $countDocs = count(json_decode($basket->getDocIds(), true));
+            $countDocs = count(json_decode($basket->getDocIds(), TRUE));
         }
         $this->view->assign('countDocs', $countDocs);
 
@@ -212,13 +212,13 @@ 
             $basket = $this->basketRepository->findOneByFeUserId((int) $GLOBALS['TSFE']->fe_user->user['uid']);
         } else {
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
+            $GLOBALS['TSFE']->fe_user->sesData_change = TRUE;
             $GLOBALS['TSFE']->fe_user->storeSessionData();
 
             $basket = $this->basketRepository->findOneBySessionId($sessionId);
         }
         // session does not exist
-        if ($basket === null) {
+        if ($basket === NULL) {
             // create new basket in db
             $basket = GeneralUtility::makeInstance(Basket::class);
             $basket->setSessionId($sessionId);
@@ -347,7 +347,7 @@ 
                 'record_id' => $this->document->getRecordId(),
             ];
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -369,7 +369,7 @@ 
         } else {
             $page = (int) $_piVars['startpage'];
         }
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+        if ($page != NULL || $_piVars['addToBasket'] == 'list') {
             $documentItem = [
                 'id' => (int) $_piVars['id'],
                 'startpage' => (int) $_piVars['startpage'],
@@ -391,8 +391,8 @@ 
             // get document instance to load further information
             $this->loadDocument(['id' => $documentItem['id']]);
             if (
-                $this->document === null
-                || $this->document->getDoc() === null
+                $this->document === NULL
+                || $this->document->getDoc() === NULL
             ) {
                 // Quit without doing anything if required variables are not set.
                 return;
@@ -447,7 +447,7 @@ 
             }
 
             $basket->setDocIds(json_encode($items));
-            if ($basket->getUid() === null) {
+            if ($basket->getUid() === NULL) {
                 $this->basketRepository->add($basket);
             } else {
                 $this->basketRepository->update($basket);

Braces +15 added lines, -30 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class BasketController extends AbstractController
-{
+class BasketController extends AbstractController {
     /**
      * @var BasketRepository
      */
@@ -41,8 +40,7 @@ 
     /**
      * @param BasketRepository $basketRepository
      */
-    public function injectBasketRepository(BasketRepository $basketRepository)
-    {
+    public function injectBasketRepository(BasketRepository $basketRepository) {
         $this->basketRepository = $basketRepository;
     }
 
@@ -54,8 +52,7 @@ 
     /**
      * @param MailRepository $mailRepository
      */
-    public function injectMailRepository(MailRepository $mailRepository)
-    {
+    public function injectMailRepository(MailRepository $mailRepository) {
         $this->mailRepository = $mailRepository;
     }
 
@@ -67,8 +64,7 @@ 
     /**
      * @param PrinterRepository $printerRepository
      */
-    public function injectPrinterRepository(PrinterRepository $printerRepository)
-    {
+    public function injectPrinterRepository(PrinterRepository $printerRepository) {
         $this->printerRepository = $printerRepository;
     }
 
@@ -80,8 +76,7 @@ 
     /**
      * @param ActionLogRepository $actionLogRepository
      */
-    public function injectActionLogRepository(ActionLogRepository $actionLogRepository)
-    {
+    public function injectActionLogRepository(ActionLogRepository $actionLogRepository) {
         $this->actionLogRepository = $actionLogRepository;
     }
 
@@ -90,8 +85,7 @@ 
      *
      * @return void
      */
-    public function basketAction()
-    {
+    public function basketAction() {
         $basket = $this->getBasketData();
 
         // action remove from basket
@@ -137,8 +131,7 @@ 
      *
      * @return void
      */
-    public function addAction()
-    {
+    public function addAction() {
         $basket = $this->getBasketData();
 
         if (
@@ -156,8 +149,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $basket = $this->getBasketData();
 
         $countDocs = 0;
@@ -203,8 +195,7 @@ 
      *
      * @return Basket The found data from user session.
      */
-    protected function getBasketData()
-    {
+    protected function getBasketData() {
         // get user session
         $sessionId = $GLOBALS['TSFE']->fe_user->id;
 
@@ -238,8 +229,7 @@ 
      *
      * @return string One basket entry
      */
-    protected function getEntry($data)
-    {
+    protected function getEntry($data) {
         if (is_object($data)) {
             $data = get_object_vars($data);
         }
@@ -291,8 +281,7 @@ 
      *
      * @return mixed download url or false
      */
-    protected function getDocumentData($id, $data)
-    {
+    protected function getDocumentData($id, $data) {
         // get document instance to load further information
         $this->loadDocument(['id' => $id]);
         if ($this->document) {
@@ -360,8 +349,7 @@ 
      *
      * @return array Basket data and JavaScript output
      */
-    protected function addToBasket($_piVars, $basket)
-    {
+    protected function addToBasket($_piVars, $basket) {
         $output = '';
 
         if (!$_piVars['startpage']) {
@@ -468,8 +456,7 @@ 
      *
      * @return Basket basket
      */
-    protected function removeFromBasket($_piVars, $basket)
-    {
+    protected function removeFromBasket($_piVars, $basket) {
         if (!empty($basket->getDocIds())) {
             $items = json_decode($basket->getDocIds());
             $items = get_object_vars($items);
@@ -507,8 +494,7 @@ 
      *
      * @return void
      */
-    protected function sendMail()
-    {
+    protected function sendMail() {
         // send mail
         $mailId = $this->requestData['mail_action'];
 
@@ -585,8 +571,7 @@ 
      *
      * @return void
      */
-    protected function printDocument($basket)
-    {
+    protected function printDocument($basket) {
         $pdfUrl = $this->settings['pdfprint'];
         $numberOfPages = 0;
         foreach ($this->requestData['selected'] as $docId => $docValue) {

Classes/Format/TeiHeader.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
     }
 }

Classes/Controller/Backend/NewTenantController.php

Spacing +11 added lines, -11 removed lines

@@ -158,7 +158,7 @@ 
     public function addFormatAction()
     {
         // Include formats definition file.
-        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
+        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php');
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK);
         // tx_dlf_formats are stored on PID = 0
@@ -196,7 +196,7 @@ 
     public function addMetadataAction()
     {
         // Include metadata definition file.
-        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
+        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php');
 
         $doPersist = false;
 
@@ -208,7 +208,7 @@ 
             if ($this->metadataRepository->findOneByIndexName($indexName) === null) {
 
                 $newRecord = GeneralUtility::makeInstance(Metadata::class);
-                $newRecord->setLabel($this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
+                $newRecord->setLabel($this->getLLL('metadata.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
                 $newRecord->setIndexName($indexName);
                 $newRecord->setDefaultValue($values['default_value']);
                 $newRecord->setWrap($values['wrap'] ? : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']);
@@ -243,7 +243,7 @@ 
                     $translatedRecord = GeneralUtility::makeInstance(Metadata::class);
                     $translatedRecord->setL18nParent($newRecord);
                     $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId());
-                    $translatedRecord->setLabel($this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
+                    $translatedRecord->setLabel($this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
                     $translatedRecord->setIndexName($indexName);
                     $translatedRecord->setWrap($newRecord->getWrap());
 
@@ -277,7 +277,7 @@ 
 
         if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
-            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
+            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels).' (PID '.$this->pid.')');
             $indexName = Solr::createCore('');
             $newRecord->setIndexName($indexName);
 
@@ -301,7 +301,7 @@ 
     public function addStructureAction()
     {
         // Include structure definition file.
-        $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
+        $structureDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php');
 
         $doPersist = false;
 
@@ -312,7 +312,7 @@ 
             // if default format record is not found, add it to the repository
             if ($this->structureRepository->findOneByIndexName($indexName) === null) {
                 $newRecord = GeneralUtility::makeInstance(Structure::class);
-                $newRecord->setLabel($this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
+                $newRecord->setLabel($this->getLLL('structure.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
                 $newRecord->setIndexName($indexName);
                 $newRecord->setToplevel($values['toplevel']);
                 $newRecord->setOaiName($values['oai_name']);
@@ -326,7 +326,7 @@ 
                     $translatedRecord = GeneralUtility::makeInstance(Structure::class);
                     $translatedRecord->setL18nParent($newRecord);
                     $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId());
-                    $translatedRecord->setLabel($this->getLLL('structure.' . $indexName, $siteLanguage->getTypo3Language(), $structLabels));
+                    $translatedRecord->setLabel($this->getLLL('structure.'.$indexName, $siteLanguage->getTypo3Language(), $structLabels));
                     $translatedRecord->setIndexName($indexName);
 
                     $this->structureRepository->add($translatedRecord);
@@ -378,15 +378,15 @@ 
             $this->forward('error');
         }
 
-        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
+        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php');
         $recordInfos['formats']['numCurrent'] = $this->formatRepository->countAll();
         $recordInfos['formats']['numDefault'] = count($formatsDefaults);
 
-        $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
+        $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php');
         $recordInfos['structures']['numCurrent'] = $this->structureRepository->countByPid($this->pid);
         $recordInfos['structures']['numDefault'] = count($structuresDefaults);
 
-        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
+        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php');
         $recordInfos['metadata']['numCurrent'] = $this->metadataRepository->countByPid($this->pid);
         $recordInfos['metadata']['numDefault'] = count($metadataDefaults);
 

Braces +14 added lines, -28 removed lines

@@ -44,8 +44,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NewTenantController extends AbstractController
-{
+class NewTenantController extends AbstractController {
     /**
      * @var int
      */
@@ -85,8 +84,7 @@ 
     /**
      * @param FormatRepository $formatRepository
      */
-    public function injectFormatRepository(FormatRepository $formatRepository)
-    {
+    public function injectFormatRepository(FormatRepository $formatRepository) {
         $this->formatRepository = $formatRepository;
     }
 
@@ -98,8 +96,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -111,8 +108,7 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
@@ -124,8 +120,7 @@ 
     /**
      * @param SolrCoreRepository $solrCoreRepository
      */
-    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository)
-    {
+    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository) {
         $this->solrCoreRepository = $solrCoreRepository;
     }
 
@@ -133,8 +128,7 @@ 
      * Initialization for all actions
      *
      */
-    protected function initializeAction()
-    {
+    protected function initializeAction() {
         $this->pid = (int) GeneralUtility::_GP('id');
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK);
@@ -155,8 +149,7 @@ 
     /**
      * Action adding formats records
      */
-    public function addFormatAction()
-    {
+    public function addFormatAction() {
         // Include formats definition file.
         $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
 
@@ -193,8 +186,7 @@ 
     /**
      * Action adding metadata records
      */
-    public function addMetadataAction()
-    {
+    public function addMetadataAction() {
         // Include metadata definition file.
         $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
 
@@ -268,8 +260,7 @@ 
     /**
      * Action adding Solr core records
      */
-    public function addSolrCoreAction()
-    {
+    public function addSolrCoreAction() {
         $doPersist = false;
 
         // load language file in own array
@@ -298,8 +289,7 @@ 
     /**
      * Action adding structure records
      */
-    public function addStructureAction()
-    {
+    public function addStructureAction() {
         // Include structure definition file.
         $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
 
@@ -351,8 +341,7 @@ 
      * @param ViewInterface $view
      * @return void
      */
-    protected function initializeView(ViewInterface $view)
-    {
+    protected function initializeView(ViewInterface $view) {
         /** @var BackendTemplateView $view */
         parent::initializeView($view);
         if ($this->actionMethodName == 'indexAction') {
@@ -370,8 +359,7 @@ 
      * @access public
      *
      */
-    public function indexAction()
-    {
+    public function indexAction() {
         $recordInfos = [];
 
         if ($this->pageInfo['doktype'] != 254) {
@@ -401,8 +389,7 @@ 
      * @access public
      *
      */
-    public function errorAction()
-    {
+    public function errorAction() {
     }
 
     /**
@@ -414,8 +401,7 @@ 
      *
      * @access public
      */
-    protected function getLLL($index, $lang, $langArray)
-    {
+    protected function getLLL($index, $lang, $langArray) {
         if (isset($langArray[$lang][$index][0]['target'])) {
             return $langArray[$lang][$index][0]['target'];
         } else {

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

@@ -165,11 +165,11 @@ 
         $frameworkConfiguration['persistence']['storagePid'] = 0;
         $this->configurationManager->setConfiguration($frameworkConfiguration);
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         foreach ($formatsDefaults as $type => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->formatRepository->findOneByType($type) === null) {
+            if ($this->formatRepository->findOneByType($type) === NULL) {
                 $newRecord = GeneralUtility::makeInstance(Format::class);
                 $newRecord->setType($type);
                 $newRecord->setRoot($values['root']);
@@ -177,12 +177,12 @@ 
                 $newRecord->setClass($values['class']);
                 $this->formatRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -198,14 +198,14 @@ 
         // Include metadata definition file.
         $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $metadataLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_metadata.xlf', $this->siteLanguages[0]->getTypo3Language());
 
         foreach ($metadataDefaults as $indexName => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->metadataRepository->findOneByIndexName($indexName) === null) {
+            if ($this->metadataRepository->findOneByIndexName($indexName) === NULL) {
 
                 $newRecord = GeneralUtility::makeInstance(Metadata::class);
                 $newRecord->setLabel($this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
@@ -225,7 +225,7 @@ 
                     foreach ($values['format'] as $format) {
                         $formatRecord = $this->formatRepository->findOneByRoot($format['format_root']);
                         // If formatRecord is null, we cannot create a MetadataFormat record.
-                        if ($formatRecord !== null) {
+                        if ($formatRecord !== NULL) {
                             $newMetadataFormat = GeneralUtility::makeInstance(MetadataFormat::class);
                             $newMetadataFormat->setEncoded($formatRecord->getUid());
                             $newMetadataFormat->setXpath($format['xpath']);
@@ -252,12 +252,12 @@ 
 
                 $this->metadataRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -270,12 +270,12 @@ 
      */
     public function addSolrCoreAction()
     {
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $beLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_be.xlf', $this->siteLanguages[0]->getTypo3Language());
 
-        if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
+        if ($this->solrCoreRepository->findOneByPid($this->pid) === NULL) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
             $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
             $indexName = Solr::createCore('');
@@ -283,11 +283,11 @@ 
 
             $this->solrCoreRepository->add($newRecord);
 
-            $doPersist = true;
+            $doPersist = TRUE;
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -303,14 +303,14 @@ 
         // Include structure definition file.
         $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $structLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_structure.xlf', $this->siteLanguages[0]->getTypo3Language());
 
         foreach ($structureDefaults as $indexName => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->structureRepository->findOneByIndexName($indexName) === null) {
+            if ($this->structureRepository->findOneByIndexName($indexName) === NULL) {
                 $newRecord = GeneralUtility::makeInstance(Structure::class);
                 $newRecord->setLabel($this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
                 $newRecord->setIndexName($indexName);
@@ -332,12 +332,12 @@ 
                     $this->structureRepository->add($translatedRecord);
                 }
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }

Classes/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      */
     private function getQuery($fields, $parameters)
     {
-        return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
+        return $fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$fields['uid'].':'.$this->getUid($parameters['uid']);
     }
 
     /**

Braces +4 added lines, -8 removed lines

@@ -28,16 +28,14 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchInDocument
-{
+class SearchInDocument {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface JSON response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [
             'documents' => [],
             'numFound' => 0
@@ -118,8 +116,7 @@ 
      *
      * @return string SOLR query
      */
-    private function getQuery($fields, $parameters)
-    {
+    private function getQuery($fields, $parameters) {
         return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
     }
 
@@ -133,8 +130,7 @@ 
      *
      * @return int|string uid of the document
      */
-    private function getUid($uid)
-    {
+    private function getUid($uid) {
         return is_numeric($uid) ? intval($uid) : $uid;
     }
 }

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

@@ -44,7 +44,7 @@
         ];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();
-        if ($parameters === null) {
+        if ($parameters === NULL) {
             throw new \InvalidArgumentException('No parameters passed!', 1632322297);
         }
         $encrypted = (string) $parameters['encrypted'];

Classes/Eid/PageViewProxy.php

Braces +3 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewProxy
-{
+class PageViewProxy {
     /**
      * @var RequestFactory
      */
@@ -46,8 +45,7 @@ 
      */
     protected $extConf;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
     }
@@ -173,8 +171,7 @@ 
      * @param ServerRequestInterface $request
      * @return ResponseInterface
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         switch ($request->getMethod()) {
             case 'OPTIONS':
                 return $this->handleOptions($request);

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

@@ -140,11 +140,11 @@
                 // For performance, don't download content up-front. Rather, we'll
                 // download and upload simultaneously.
                 // https://docs.guzzlephp.org/en/6.5/request-options.html#stream
-                'stream' => true,
+                'stream' => TRUE,
 
                 // Don't throw exceptions when a non-success status code is
                 // received. We handle these manually.
-                'http_errors' => false,
+                'http_errors' => FALSE,
             ]);
         } catch (\Exception $e) {
             return new JsonResponse(['message' => 'Could not fetch resource of given URL.'], 500);

Classes/Eid/SearchSuggest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

Braces +2 added lines, -4 removed lines

@@ -30,16 +30,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchSuggest
-{
+class SearchSuggest {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();

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

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === FALSE) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -65,22 +65,22 @@
 $_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) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
+$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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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/Labels.xml: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;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class;
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class . '::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class.'::main';
 if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['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
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {

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

@@ -79,7 +79,7 @@
 // Register AJAX eID handlers.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class . '::main';
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class . '::main';
-if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? false) {
+if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['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