Erikmitk / kitodo-presentation

Classes/Controller/BasketController.php

Spacing +26 added lines, -26 removed lines

@@ -133,7 +133,7 @@ 
                 foreach ($this->requestData['selected'] as $docValue) {
                     if ($docValue['id']) {
                         $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                         $this->redirectToUri($pdfUrl);
                     }
                 }
@@ -200,7 +200,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);
         }
@@ -292,12 +292,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;
@@ -353,7 +353,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)) {
@@ -364,15 +364,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 {
@@ -445,12 +445,12 @@ 
             if ($piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $this->document->getCurrentDocument()->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)) {
@@ -471,14 +471,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() {
        });
       });
@@ -516,12 +516,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]);
@@ -554,7 +554,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
@@ -562,7 +562,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData((int) $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;
@@ -573,7 +573,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.
@@ -600,7 +600,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
@@ -631,7 +631,7 @@ 
         foreach ($this->requestData['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -649,7 +649,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData((int) $explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -666,12 +666,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);

Braces +2 added lines, -4 removed lines

@@ -33,8 +33,7 @@ 
  *
  * @access public
  */
-class BasketController extends AbstractController
-{
+class BasketController extends AbstractController {
     /**
      * @access protected
      * @var BasketRepository
@@ -328,8 +327,7 @@ 
      *
      * @return array|false download url or false
      */
-    protected function getDocumentData(int $id, array $data)
-    {
+    protected function getDocumentData(int $id, array $data) {
         // get document instance to load further information
         $this->loadDocument((int) $id);
         if (isset($this->document)) {

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

@@ -190,7 +190,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);
 
@@ -253,7 +253,7 @@ 
         }
 
         // session does not exist
-        if ($basket === null) {
+        if ($basket === NULL) {
             // create new basket in db
             $basket = GeneralUtility::makeInstance(Basket::class);
             $basket->setSessionId($userSession->getIdentifier());
@@ -388,7 +388,7 @@ 
                 'record_id' => $this->document->getRecordId(),
             ];
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -410,7 +410,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'],
@@ -433,7 +433,7 @@ 
             $this->loadDocument((int) $documentItem['id']);
             if ($this->isDocMissing()) {
                 // Quit without doing anything if required variables are not set.
-                return null;
+                return NULL;
             }
             // set endpage for toc and subentry based on logid
             if (($piVars['addToBasket'] == 'subentry') or ($piVars['addToBasket'] == 'toc')) {
@@ -487,7 +487,7 @@ 
             }
 
             $basket->setDocIds(json_encode($items));
-            if ($basket->getUid() === null) {
+            if ($basket->getUid() === NULL) {
                 $this->basketRepository->add($basket);
             } else {
                 $this->basketRepository->update($basket);

Classes/Controller/CollectionController.php

Spacing +5 added lines, -5 removed lines

@@ -167,7 +167,7 @@ 
             $simplePagination = new SimplePagination($solrPaginator);
 
             $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-            $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+            $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -219,20 +219,20 @@ 
         foreach ($collections as $collection) {
             $solr_query = '';
             if ($collection->getIndexSearch() != '') {
-                $solr_query .= '(' . $collection->getIndexSearch() . ')';
+                $solr_query .= '('.$collection->getIndexSearch().')';
             } else {
-                $solr_query .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
+                $solr_query .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
             }
 
             // virtual collection might yield documents, that are not toplevel true or partof anything
             if ($collection->getIndexSearch()) {
                 $params['query'] = $solr_query;
             } else {
-                $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true';
+                $params['query'] = $solr_query.' AND partof:0 AND toplevel:true';
             }
             $partOfNothing = $solr->searchRaw($params);
 
-            $params['query'] = $solr_query . ' AND NOT partof:0 AND toplevel:true';
+            $params['query'] = $solr_query.' AND NOT partof:0 AND toplevel:true';
             $partOfSomething = $solr->searchRaw($params);
 
             $collectionInfo = [];

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
  *
  * @access public
  */
-class CollectionController extends AbstractController
-{
+class CollectionController extends AbstractController {
     /**
      * @access protected
      * @var CollectionRepository

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

@@ -98,7 +98,7 @@ 
         }
 
         if (count($collections) == 1 && empty($this->settings['dont_show_single']) && is_array($collections)) {
-            $this->forward('show', null, null, ['collection' => array_pop($collections)]);
+            $this->forward('show', NULL, NULL, ['collection' => array_pop($collections)]);
         }
 
         $processedCollections = $this->processCollections($collections, $solr);
@@ -140,7 +140,7 @@ 
         $searchParams['collection'] = $collection;
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid'])) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $searchParams,
                     'page' => $currentPage
@@ -149,13 +149,13 @@ 
         }
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all documents of given collection
-        $solrResults = null;
+        $solrResults = NULL;
         if (is_array($searchParams) && !empty($searchParams)) {
             $solrResults = $this->documentRepository->findSolrByCollection($collection, $this->settings, $searchParams, $listedMetadata);
 
@@ -191,13 +191,13 @@ 
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 
-        $collection = null;
+        $collection = NULL;
         if ($searchParams['collection']['__identity'] && MathUtility::canBeInterpretedAsInteger($searchParams['collection']['__identity'])) {
             $collection = $this->collectionRepository->findByUid($searchParams['collection']['__identity']);
         }
 
         // output is done by show action
-        $this->forward('show', null, null, ['searchParameter' => $searchParams, 'collection' => $collection]);
+        $this->forward('show', NULL, NULL, ['searchParameter' => $searchParams, 'collection' => $collection]);
 
     }
 

Classes/Controller/Backend/NewTenantController.php

Spacing +13 added lines, -13 removed lines

@@ -182,7 +182,7 @@ 
     public function addFormatAction(): void
     {
         // 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
@@ -224,7 +224,7 @@ 
     public function addMetadataAction(): void
     {
         // 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;
 
@@ -236,7 +236,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']);
@@ -272,8 +272,8 @@ 
                     $translatedRecord = GeneralUtility::makeInstance(Metadata::class);
                     $translatedRecord->setL18nParent($newRecord);
                     $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId());
-                    $translatedRecord->setLabel($this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
-                    $translatedRecord->setIndexName($indexName . "_" . $siteLanguage->getLanguageId());
+                    $translatedRecord->setLabel($this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
+                    $translatedRecord->setIndexName($indexName."_".$siteLanguage->getLanguageId());
                     $translatedRecord->setWrap($newRecord->getWrap());
 
                     $this->metadataRepository->add($translatedRecord);
@@ -310,7 +310,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('');
             if (!empty($indexName)) {
                 $newRecord->setIndexName($indexName);
@@ -340,7 +340,7 @@ 
     public function addStructureAction(): void
     {
         // 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;
 
@@ -351,7 +351,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']);
@@ -365,7 +365,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);
@@ -421,15 +421,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);
 
@@ -469,7 +469,7 @@ 
         } elseif (isset($langArray['default'][$index][0]['target'])) {
             return $langArray['default'][$index][0]['target'];
         } else {
-            return 'Missing translation for ' . $index;
+            return 'Missing translation for '.$index;
         }
     }
 }

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
  *
  * @access public
  */
-class NewTenantController extends AbstractController
-{
+class NewTenantController extends AbstractController {
     /**
      * @access protected
      * @var int

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

@@ -189,11 +189,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']);
@@ -201,12 +201,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();
         }
@@ -226,14 +226,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));
@@ -254,7 +254,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']);
@@ -281,12 +281,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();
         }
@@ -303,12 +303,12 @@ 
      */
     public function addSolrCoreAction(): void
     {
-        $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('');
@@ -317,12 +317,12 @@ 
 
                 $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();
         }
@@ -342,14 +342,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);
@@ -371,12 +371,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/Controller/View3DController.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
  *
  * @access public
  */
-class View3DController extends AbstractController
-{
+class View3DController extends AbstractController {
     /**
      * @access public
      *

Classes/Controller/SearchController.php

Spacing +16 added lines, -16 removed lines

@@ -117,7 +117,7 @@ 
         $listRequestData = GeneralUtility::_GPmerged('tx_dlf_listview');
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
-            $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']);
+            $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
             $listViewSearch = true;
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
         }
@@ -178,7 +178,7 @@ 
                 $simplePagination = new SimplePagination($solrPaginator);
 
                 $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-                $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+                $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
             }
 
             $this->view->assign('documents', !empty($solrResults) ? $solrResults : []);
@@ -203,7 +203,7 @@ 
 
         // Add uHash parameter to suggest parameter to make a basic protection of this form.
         if ($this->settings['suggest']) {
-            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'));
+            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'));
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -224,7 +224,7 @@ 
         // Get facets from plugin configuration.
         $facets = [];
         foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
         $this->view->assign('facetsMenu', $this->makeFacetsMenuArray($facets));
@@ -260,13 +260,13 @@ 
         $searchParams = $this->searchParams;
         if (
             (!empty($searchParams['fulltext']))
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
             $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1];
             // Search in fulltext field if applicable. Query must not be empty!
             if (!empty($searchParams['query'])) {
-                $search['query'] = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
+                $search['query'] = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')';
             }
         } else {
             // Retain given search field if valid.
@@ -283,7 +283,7 @@ 
         // add filter query for date search
         if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
             // combine dateFrom and dateTo into filterquery as range search
-            $search['params']['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
+            $search['params']['filterquery'][]['query'] = '{!join from='.$fields['uid'].' to='.$fields['uid'].'}'.$fields['date'].':['.$this->searchParams['dateFrom'].' TO '.$this->searchParams['dateTo'].']';
         }
 
         // Add extended search query.
@@ -301,9 +301,9 @@ 
                         in_array($searchParams['extOperator'][$i], $allowedOperators)
                     ) {
                         if (!empty($search['query'])) {
-                            $search['query'] .= ' ' . $searchParams['extOperator'][$i] . ' ';
+                            $search['query'] .= ' '.$searchParams['extOperator'][$i].' ';
                         }
-                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')';
+                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')';
                     }
                 }
             }
@@ -392,24 +392,24 @@ 
             foreach ($collections as $collectionEntry) {
                 // check for virtual collections query string
                 if ($collectionEntry->getIndexSearch()) {
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '('.$collectionEntry->getIndexSearch().')' : ' OR ('.$collectionEntry->getIndexSearch().')';
                 } else {
-                    $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
+                    $collectionsQueryString .= empty($collectionsQueryString) ? '"'.$collectionEntry->getIndexName().'"' : ' OR "'.$collectionEntry->getIndexName().'"';
                 }
             }
 
             // distinguish between simple collection browsing and actual searching within the collection(s)
             if (!empty($collectionsQueryString)) {
                 if (empty($query)) {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)';
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.') AND toplevel:true AND partof:0)';
                 } else {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))';
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.'))';
                 }
             }
 
             // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separately
             if (!empty($virtualCollectionsQueryString)) {
-                $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
+                $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')';
             }
 
             // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those
@@ -439,7 +439,7 @@ 
         $entryArray['doNotLinkIt'] = 0;
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
         if ($index !== false) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
@@ -453,7 +453,7 @@ 
             }
         } else {
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
             $entryArray['ITEM_STATE'] = 'NO';
         }
         $entryArray['queryColumn'] = $queryColumn;

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
  *
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @access protected
      * @var CollectionRepository

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

@@ -90,7 +90,7 @@ 
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // output is done by main action
-        $this->forward('main', null, null, ['searchParameter' => $this->searchParams]);
+        $this->forward('main', NULL, NULL, ['searchParameter' => $this->searchParams]);
     }
 
     /**
@@ -104,7 +104,7 @@ 
      */
     public function mainAction(): void
     {
-        $listViewSearch = false;
+        $listViewSearch = FALSE;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
             $this->logger->warning('Incomplete plugin configuration');
@@ -118,7 +118,7 @@ 
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
             $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']);
-            $listViewSearch = true;
+            $listViewSearch = TRUE;
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
         }
 
@@ -146,7 +146,7 @@ 
             $this->redirect(
                 'main',
                 'ListView',
-                null,
+                NULL,
                 [
                     'searchParameter' => $this->searchParams,
                     'page' => $currentPage
@@ -158,12 +158,12 @@ 
         // An empty form will be shown.
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
             // get all sortable metadata records
-            $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+            $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
             // get all metadata records to be shown in results
-            $listedMetadata = $this->metadataRepository->findByIsListed(true);
+            $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
-            $solrResults = null;
+            $solrResults = NULL;
             $numResults = 0;
             // Do not execute the Solr search if used together with ListView plugin.
             if (!$listViewSearch) {
@@ -223,7 +223,7 @@ 
 
         // Get facets from plugin configuration.
         $facets = [];
-        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
+        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], TRUE) as $facet) {
             $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
@@ -380,7 +380,7 @@ 
     {
         // if collections are given, we prepare the collections query string
         // extract collections from collection parameter
-        $collections = null;
+        $collections = NULL;
         if ($this->searchParams['collection']) {
             foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
@@ -440,7 +440,7 @@ 
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
         $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
-        if ($index !== false) {
+        if ($index !== FALSE) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
             $queryColumn = array_values($queryColumn);
@@ -448,7 +448,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -559,7 +559,7 @@ 
         }
 
         // Get field selector options.
-        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], true);
+        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], TRUE);
 
         $slotCountArray = [];
         for ($i = 0; $i < $this->settings['extendedSlotCount']; $i++) {

Classes/Format/AudioVideoMD.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $metadata['video_duration'] = [$videoDuration];
         }
 
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
 
         if ($useExternalApis) {
             // TODO?

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  *
  * @access public
  */
-class AudioVideoMD implements MetadataInterface
-{
+class AudioVideoMD implements MetadataInterface {
     /**
      * Extract some essential AudioMD/VideoMD metadata.
      *

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

@@ -38,7 +38,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = false): void
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = FALSE): void
     {
         $xml->registerXPathNamespace('audiomd', 'http://www.loc.gov/audioMD/');
         $xml->registerXPathNamespace('videomd', 'http://www.loc.gov/videoMD/');

Classes/Format/Alto.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
             }
             return ' ';
         }
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     private function getCoordinates(\SimpleXMLElement $attributes): string
     {
-        return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
+        return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT'];
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -147,8 +147,7 @@
      *
      * @param \SimpleXMLElement &$xml: The XML to register the namespace for
      */
-    private function registerAltoNamespace(\SimpleXMLElement &$xml)
-    {
+    private function registerAltoNamespace(\SimpleXMLElement &$xml) {
         $namespace = $xml->getDocNamespaces();
 
         if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {

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

@@ -151,11 +151,11 @@
     {
         $namespace = $xml->getDocNamespaces();
 
-        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {
+        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, true)) {
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v3#');
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, true)) {
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v4#');
         }
     }

Classes/Format/Mods.php

Spacing +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
         if (!empty($name)) {
             $this->metadata['author'][$i] = [
                 'name' => $name,
-                'url' => 'https://orcid.org/' . $orcidId
+                'url' => 'https://orcid.org/'.$orcidId
             ];
         } else {
             //fallback into display form
@@ -177,7 +177,7 @@ 
         }
         // Append "valueURI" to name using Unicode unit separator.
         if (isset($authors[$i]['valueURI'])) {
-            $this->metadata['author'][$i] .= pack('C', 31) . (string) $authors[$i]['valueURI'];
+            $this->metadata['author'][$i] .= pack('C', 31).(string) $authors[$i]['valueURI'];
         }
     }
 
@@ -242,7 +242,7 @@ 
         if (!empty($name)) {
             $this->metadata['holder'][$i] = [
                 'name' => $name,
-                'url' => 'http://viaf.org/viaf/' . $viafId
+                'url' => 'http://viaf.org/viaf/'.$viafId
             ];
         } else {
             //fallback into display form
@@ -265,7 +265,7 @@ 
         $this->getHolderFromXmlDisplayForm($holders, $i);
         // Append "valueURI" to name using Unicode unit separator.
         if (isset($holders[$i]['valueURI'])) {
-            $this->metadata['holder'][$i] .= pack('C', 31) . (string) $holders[$i]['valueURI'];
+            $this->metadata['holder'][$i] .= pack('C', 31).(string) $holders[$i]['valueURI'];
         }
     }
 

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class Mods implements MetadataInterface
-{
+class Mods implements MetadataInterface {
     /**
      * @access private
      * @var \SimpleXMLElement The metadata XML

Classes/Format/TeiHeader.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class TeiHeader implements MetadataInterface
-{
+class TeiHeader implements MetadataInterface {
     /**
      * This extracts the essential TEIHDR metadata from XML
      *

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

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