Erikmitk / kitodo-presentation

Classes/ViewHelpers/MetadataWrapVariableViewHelper.php

Braces +2 added lines, -4 removed lines

@@ -35,13 +35,11 @@
  *     {typoscript -> kitodo:metadataWrapVariable(name: 'wrapInfo')}
  *
  */
-class MetadataWrapVariableViewHelper extends AbstractViewHelper
-{
+class MetadataWrapVariableViewHelper extends AbstractViewHelper {
     /**
      * @return void
      */
-    public function initializeArguments()
-    {
+    public function initializeArguments() {
         $this->registerArgument('name', 'string', 'Name of variable to create', true);
     }
 

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

@@ -42,7 +42,7 @@
      */
     public function initializeArguments()
     {
-        $this->registerArgument('name', 'string', 'Name of variable to create', true);
+        $this->registerArgument('name', 'string', 'Name of variable to create', TRUE);
     }
 
     /**

Classes/Controller/FeedsController.php

Spacing +6 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
         if ($library) {
             $feedMeta['copyright'] = $library->getLabel();
         } else {
-            $this->logger->error('Failed to fetch label of selected library with "' . $this->settings['library'] . '"');
+            $this->logger->error('Failed to fetch label of selected library with "'.$this->settings['library'].'"');
         }
 
         if (
@@ -91,12 +91,12 @@ 
                 ) {
                     $superiorTitle = Doc::getTitle($document->getPartof(), true);
                     if (!empty($superiorTitle)) {
-                        $title .= '[' . $superiorTitle . ']';
+                        $title .= '['.$superiorTitle.']';
                     }
                 }
                 // Get title of document.
                 if (!empty($document->getTitle())) {
-                    $title .= ' ' . $document->getTitle();
+                    $title .= ' '.$document->getTitle();
                 }
                 // Set default title if empty.
                 if (empty($title)) {
@@ -104,13 +104,13 @@ 
                 }
                 // Append volume information.
                 if (!empty($document->getVolume())) {
-                    $title .= ', ' . LocalizationUtility::translate('volume', 'dlf') . ' ' . $document->getVolume();
+                    $title .= ', '.LocalizationUtility::translate('volume', 'dlf').' '.$document->getVolume();
                 }
                 // Is this document new or updated?
                 if ($document->getCrdate() == $document->getTstamp()) {
-                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf').' '.trim($title);
                 } else {
-                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf').' '.trim($title);
                 }
 
                 $document->setTitle($title);

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class FeedsController extends AbstractController
-{
+class FeedsController extends AbstractController {
 
     /**
      * @var LibraryRepository
@@ -36,8 +35,7 @@ 
     /**
      * @param LibraryRepository $libraryRepository
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -46,8 +44,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request->setFormat('xml');
     }
 
@@ -56,8 +53,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // access to GET parameter tx_dlf_feeds['collection']
         $requestData = $this->request->getArguments();
 

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

@@ -80,7 +80,7 @@ 
             || GeneralUtility::inList($this->settings['collections'], $requestData['collection'])
         ) {
 
-            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $requestData['collection'], true), $this->settings['limit']);
+            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $requestData['collection'], TRUE), $this->settings['limit']);
 
             foreach ($documents as $document) {
 
@@ -89,7 +89,7 @@ 
                 if ((empty($document->getTitle()) || !empty($this->settings['prependSuperiorTitle']))
                     && !empty($document->getPartof())
                 ) {
-                    $superiorTitle = Doc::getTitle($document->getPartof(), true);
+                    $superiorTitle = Doc::getTitle($document->getPartof(), TRUE);
                     if (!empty($superiorTitle)) {
                         $title .= '[' . $superiorTitle . ']';
                     }

Classes/Controller/OaiPmhController.php

Spacing +11 added lines, -11 removed lines

@@ -243,10 +243,10 @@ 
             if ($root->item(0) instanceof \DOMNode) {
                 $mets = $xml->saveXML($root->item(0));
             } else {
-                $this->logger->error('No METS part found in document with location "' . $record['location'] . '"');
+                $this->logger->error('No METS part found in document with location "'.$record['location'].'"');
             }
         } else {
-            $this->logger->error('Could not load XML file from "' . $record['location'] . '"');
+            $this->logger->error('Could not load XML file from "'.$record['location'].'"');
         }
         return $mets;
     }
@@ -412,7 +412,7 @@ 
             $pageSettings = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
             $storagePid = $pageSettings["plugin."]["tx_dlf."]["persistence."]["storagePid"];
             if ($storagePid > 0) {
-                $this->logger->notice('No records found with PID ' . $storagePid);
+                $this->logger->notice('No records found with PID '.$storagePid);
             } else {
                 $this->logger->notice('No records found');
             }
@@ -495,7 +495,7 @@ 
             if (!empty($resArray)) {
                 // check, if all required fields are available for a given identifier
                 foreach ($details['requiredFields'] as $required) {
-                    $methodName = 'get' . GeneralUtility::underscoredToUpperCamelCase($required);
+                    $methodName = 'get'.GeneralUtility::underscoredToUpperCamelCase($required);
                     if (empty($resArray->$methodName())) {
                         // Skip metadata formats whose requirements are not met.
                         continue 2;
@@ -600,9 +600,9 @@ 
 
             if ($resArray = $result->fetch()) {
                 if ($resArray['index_query'] != "") {
-                    $solr_query .= '(' . $resArray['index_query'] . ')';
+                    $solr_query .= '('.$resArray['index_query'].')';
                 } else {
-                    $solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                    $solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
                 }
             } else {
                 $this->error = 'noSetHierarchy';
@@ -614,7 +614,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->parameters['metadataPrefix']]['requiredFields'] as $required) {
-            $solr_query .= ' NOT ' . $required . ':""';
+            $solr_query .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solr_query .= ' AND toplevel:true';
@@ -628,7 +628,7 @@ 
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'],
                     $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.000Z';
+                $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
             } else {
                 $this->error = 'badArgument';
                 return;
@@ -644,7 +644,7 @@ 
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'],
                     $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
+                $until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
                 if ($from != "*" && $from > $until) {
                     $this->error = 'badArgument';
                 }
@@ -661,7 +661,7 @@ 
                 $this->error = 'badArgument';
             }
         }
-        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
         $documentSet = [];
         $solr = Solr::getInstance($this->settings['solrcore']);
         if (!$solr->ready) {
@@ -780,7 +780,7 @@ 
         $resumptionTokenInfo['cursor'] = $currentCursor;
         $resumptionTokenInfo['completeListSize'] = $documentListSet['metadata']['completeListSize'];
         $expireDateTime = new \DateTime();
-        $expireDateTime->add(new \DateInterval('PT' . $this->settings['expired'] . 'S'));
+        $expireDateTime->add(new \DateInterval('PT'.$this->settings['expired'].'S'));
         $resumptionTokenInfo['expired'] = $expireDateTime;
 
         $omitResumptionToken = $currentCursor === 0 && $numShownDocuments >= $documentListSet['metadata']['completeListSize'];

Braces +19 added lines, -38 removed lines

@@ -27,8 +27,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class OaiPmhController extends AbstractController
-{
+class OaiPmhController extends AbstractController {
     /**
      * @var TokenRepository
      */
@@ -37,8 +36,7 @@ 
     /**
      * @param TokenRepository $tokenRepository
      */
-    public function injectTokenRepository(TokenRepository $tokenRepository)
-    {
+    public function injectTokenRepository(TokenRepository $tokenRepository) {
         $this->tokenRepository = $tokenRepository;
     }
 
@@ -50,8 +48,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -63,8 +60,7 @@ 
     /**
      * @param LibraryRepository $libraryRepository
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -73,8 +69,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request->setFormat('xml');
     }
 
@@ -122,8 +117,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $this->tokenRepository->deleteExpiredTokens($this->settings['expired']);
     }
@@ -135,8 +129,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -166,8 +159,7 @@ 
      *
      * @return array $metadata: The mapped metadata array
      */
-    protected function getDcData(array $record)
-    {
+    protected function getDcData(array $record) {
         $metadata = [];
 
         $metadata[] = ['dc:identifier' => $record['record_id']];
@@ -232,8 +224,7 @@ 
      *
      * @return string: The fetched METS XML
      */
-    protected function getMetsData(array $record)
-    {
+    protected function getMetsData(array $record) {
         $mets = null;
         // Load METS file.
         $xml = new \DOMDocument();
@@ -256,8 +247,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Get allowed GET and POST variables.
         $this->getUrlParams();
 
@@ -324,8 +314,7 @@ 
      *
      * @return void
      */
-    protected function verbGetRecord()
-    {
+    protected function verbGetRecord() {
         if (count($this->parameters) !== 3 || empty($this->parameters['metadataPrefix']) || empty($this->parameters['identifier'])) {
             $this->error = 'badArgument';
             return;
@@ -377,8 +366,7 @@ 
      *
      * @return void
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         $library = $this->libraryRepository->findByUid($this->settings['library']);
 
         $oaiIdentifyInfo = [];
@@ -427,8 +415,7 @@ 
      *
      * @return void
      */
-    protected function verbListIdentifiers()
-    {
+    protected function verbListIdentifiers() {
         // If we have a resumption token we can continue our work
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -482,8 +469,7 @@ 
      *
      * @return void
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // check for the optional "identifier" parameter
         if (isset($this->parameters['identifier'])) {
@@ -515,8 +501,7 @@ 
      *
      * @return void
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -571,8 +556,7 @@ 
      *
      * @return void
      */
-    protected function verbListSets()
-    {
+    protected function verbListSets() {
         // It is required to set a oai_name inside the collection record to be shown in oai-pmh plugin.
         $this->settings['hideEmptyOaiNames'] = true;
 
@@ -588,8 +572,7 @@ 
      *
      * @return array|null Array of matching records
      */
-    protected function fetchDocumentUIDs()
-    {
+    protected function fetchDocumentUIDs() {
         $solr_query = '';
         // Check "set" for valid value.
         if (!empty($this->parameters['set'])) {
@@ -698,8 +681,7 @@ 
      *
      * @return array of enriched records
      */
-    protected function generateOutputForDocumentList(array $documentListSet)
-    {
+    protected function generateOutputForDocumentList(array $documentListSet) {
         $documentsToProcess = array_splice($documentListSet['elements'], 0, (int) $this->settings['limit']);
         if (empty($documentsToProcess)) {
             $this->error = 'noRecordsMatch';
@@ -752,8 +734,7 @@ 
      *
      * @return void
      */
-    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments)
-    {
+    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments) {
         // The cursor specifies how many elements have already been returned in previous requests
         // See http://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl
         $currentCursor = $documentListSet['metadata']['cursor'];

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

@@ -234,7 +234,7 @@ 
      */
     protected function getMetsData(array $record)
     {
-        $mets = null;
+        $mets = NULL;
         // Load METS file.
         $xml = new \DOMDocument();
         if ($xml->load($record['location'])) {
@@ -313,7 +313,7 @@ 
         } else {
             // No resumption token found or resumption token expired.
             $this->error = 'badResumptionToken';
-            return null;
+            return NULL;
         }
     }
 
@@ -574,7 +574,7 @@ 
     protected function verbListSets()
     {
         // It is required to set a oai_name inside the collection record to be shown in oai-pmh plugin.
-        $this->settings['hideEmptyOaiNames'] = true;
+        $this->settings['hideEmptyOaiNames'] = TRUE;
 
         $oaiSets = $this->collectionRepository->findCollectionsBySettings($this->settings);
 
@@ -606,7 +606,7 @@ 
                 }
             } else {
                 $this->error = 'noSetHierarchy';
-                return null;
+                return NULL;
             }
         } else {
             // If no set is specified we have to query for all collections
@@ -759,7 +759,7 @@ 
         $currentCursor = $documentListSet['metadata']['cursor'];
 
         if (count($documentListSet['elements']) !== 0) {
-            $resumptionToken = uniqid('', false);
+            $resumptionToken = uniqid('', FALSE);
 
             $documentListSet['metadata']['cursor'] += $numShownDocuments;
 

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($this->scriptRelPath);
         // 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);

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

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 doesnt exists
-        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);

Classes/Controller/AbstractController.php

Spacing +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
                 if ($this->document) {
                     $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$this->settings['storagePid'].'" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
@@ -143,7 +143,7 @@ 
 
                     $this->document->setLocation($requestData['id']);
                 } else {
-                    $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
+                    $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading');
                 }
             }
 
@@ -160,11 +160,11 @@ 
                 if ($this->document !== null && $doc !== null) {
                     $this->document->setDoc($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$requestData['id'].'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 

Braces +6 added lines, -12 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -44,8 +43,7 @@ 
     /**
      * @param DocumentRepository $documentRepository
      */
-    public function injectDocumentRepository(DocumentRepository $documentRepository)
-    {
+    public function injectDocumentRepository(DocumentRepository $documentRepository) {
         $this->documentRepository = $documentRepository;
     }
 
@@ -85,8 +83,7 @@ 
      * @access protected
      * @return void
      */
-    protected function initialize()
-    {
+    protected function initialize() {
         $this->requestData = GeneralUtility::_GPmerged('tx_dlf');
         if (empty($this->requestData['page'])) {
             $this->requestData['page'] = 1;
@@ -112,8 +109,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData)
-    {
+    protected function loadDocument($requestData) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
@@ -186,8 +182,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -201,8 +196,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 }

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

@@ -117,26 +117,26 @@ 
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
-            $doc = null;
+            $doc = NULL;
 
             if (MathUtility::canBeInterpretedAsInteger($requestData['id'])) {
                 // find document from repository by uid
                 $this->document = $this->documentRepository->findOneByIdAndSettings((int) $requestData['id']);
                 if ($this->document) {
-                    $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
+                    $doc = Doc::getInstance($this->document->getLocation(), $this->settings, TRUE);
                 } else {
                     $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
-                $doc = Doc::getInstance($requestData['id'], $this->settings, true);
+                $doc = Doc::getInstance($requestData['id'], $this->settings, TRUE);
 
-                if ($doc !== null) {
+                if ($doc !== NULL) {
                     if ($doc->recordId) {
                         $this->document = $this->documentRepository->findOneByRecordId($doc->recordId);
                     }
 
-                    if ($this->document === null) {
+                    if ($this->document === NULL) {
                         // create new dummy Document object
                         $this->document = GeneralUtility::makeInstance(Document::class);
                     }
@@ -147,7 +147,7 @@ 
                 }
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setDoc($doc);
             }
 
@@ -155,9 +155,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
-                if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = Doc::getInstance($this->document->getLocation(), $this->settings, TRUE);
+                if ($this->document !== NULL && $doc !== NULL) {
                     $this->document->setDoc($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
@@ -191,7 +191,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
-        return null;
+        return NULL;
     }
 
     /**

Classes/Controller/CalendarController.php

Spacing +6 added lines, -6 removed lines

@@ -148,7 +148,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $calendarIssuesByYear[$_year][$_month][$_day][] = $issue;
             } else {
-                $this->logger->warning('Document with UID ' . $issue['uid'] . 'has no valid date of publication');
+                $this->logger->warning('Document with UID '.$issue['uid'].'has no valid date of publication');
             }
         }
         // Sort by years.
@@ -271,16 +271,16 @@ 
                 'DAYFRI_NAME' => strftime('%a', strtotime('last Friday')),
                 'DAYSAT_NAME' => strftime('%a', strtotime('last Saturday')),
                 'DAYSUN_NAME' => strftime('%a', strtotime('last Sunday')),
-                'MONTHNAME'  => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
+                'MONTHNAME'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
                 'CALYEAR' => ($i == $firstMonth) ? $year : ''
             ];
 
-            $firstOfMonth = strtotime($year . '-' . $i . '-1');
+            $firstOfMonth = strtotime($year.'-'.$i.'-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
                 $calendarData[$i]['week'][$j] = [
                     'DAYMON' => ['dayValue' => '&nbsp;'],
@@ -293,7 +293,7 @@ 
                 ];
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
                     if (
                         $currentDayTime >= $firstOfMonth
                         && $currentDayTime <= $lastOfMonth
@@ -324,7 +324,7 @@ 
                             }
                             $dayLinkDiv = $dayLinksText;
                         }
-                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
                             case '0':
                                 $calendarData[$i]['week'][$j]['DAYSUN']['dayValue'] = strftime('%d', $currentDayTime);
                                 if ((int) $dayLinks === (int) date('j', $currentDayTime)) {

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class CalendarController extends AbstractController
-{
+class CalendarController extends AbstractController {
     /**
      * @var StructureRepository
      */
@@ -36,8 +35,7 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
@@ -54,8 +52,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Set initial document (anchor or year file) if configured.
         if (empty($this->requestData['id']) && !empty($this->settings['initialDocument'])) {
             $this->requestData['id'] = $this->settings['initialDocument'];
@@ -100,8 +97,7 @@ 
      *
      * @return void
      */
-    public function calendarAction()
-    {
+    public function calendarAction() {
         // access arguments passed by the mainAction()
         $mainrequestData = $this->request->getArguments();
 
@@ -204,8 +200,7 @@ 
      *
      * @return void
      */
-    public function yearsAction()
-    {
+    public function yearsAction() {
         // access arguments passed by the mainAction()
         $mainrequestData = $this->request->getArguments();
 
@@ -259,8 +254,7 @@ 
      *
      * @return string Content for template subpart
      */
-    protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12)
-    {
+    protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12) {
         $calendarData = [];
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
             $calendarData[$i] = [

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

@@ -63,7 +63,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return;
         }
@@ -78,10 +78,10 @@ 
         switch ($type) {
             case 'newspaper':
             case 'ephemera':
-                $this->forward('years', null, null, $this->requestData);
+                $this->forward('years', NULL, NULL, $this->requestData);
                 break;
             case 'year':
-                $this->forward('calendar', null, null, $this->requestData);
+                $this->forward('calendar', NULL, NULL, $this->requestData);
                 break;
             case 'issue':
             default:
@@ -110,7 +110,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return;
         }
@@ -127,7 +127,7 @@ 
                 $title = $document->getTitle();
             } else {
                 $title = !empty($document->getMetsLabel()) ? $document->getMetsLabel() : $document->getMetsOrderlabel();
-                if (strtotime($title) !== false) {
+                if (strtotime($title) !== FALSE) {
                     $title = strftime('%x', strtotime($title));
                 }
             }
@@ -142,7 +142,7 @@ 
         $calendarIssuesByYear = [];
         foreach ($issues as $issue) {
             $dateTimestamp = strtotime($issue['year']);
-            if ($dateTimestamp !== false) {
+            if ($dateTimestamp !== FALSE) {
                 $_year = date('Y', $dateTimestamp);
                 $_month = date('n', $dateTimestamp);
                 $_day = date('j', $dateTimestamp);
@@ -214,7 +214,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return;
         }

Classes/Controller/StatisticsController.php

Spacing +2 added lines, -2 removed lines

@@ -34,13 +34,13 @@
         $countVolumes = $this->documentRepository->countAllVolumes($this->settings);
 
         // Set replacements.
-        $args['###TITLES###'] = $countTitles . ' ' . htmlspecialchars(
+        $args['###TITLES###'] = $countTitles.' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($countTitles > 1 ? 'titles' : 'title'), 'dlf'
             )
         );
 
-        $args['###VOLUMES###'] = $countVolumes . ' ' . htmlspecialchars(
+        $args['###VOLUMES###'] = $countVolumes.' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($countTitles > 1 ? 'volumes' : 'volume'), 'dlf'
             )

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
  * @subpackage dlf
  * @access public
  */
-class StatisticsController extends AbstractController
-{
+class StatisticsController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $countTitles = $this->documentRepository->countAllTitles($this->settings);
         $countVolumes = $this->documentRepository->countAllVolumes($this->settings);
 

Classes/Controller/SearchController.php

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

@@ -77,7 +77,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]);
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     public function mainAction()
     {
-        $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');
@@ -103,7 +103,7 @@ 
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
             $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
-            $listViewSearch = true;
+            $listViewSearch = TRUE;
         }
 
         // Pagination of Results: Pass the currentPage to the fluid template to calculate current index of search result.
@@ -114,7 +114,7 @@ 
 
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid']) && !empty($this->searchParams) && !$listViewSearch) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $this->searchParams,
                     'widgetPage' => $widgetPage
@@ -125,15 +125,15 @@ 
         // If no search has been executed, no variables habe to be prepared. 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 = [];
             // Do not execute the Solr search if used together with ListView plugin.
             if (!$listViewSearch) {
-                $solrResults = $this->documentRepository->findSolrByCollection(null, $this->settings, $this->searchParams, $listedMetadata);
+                $solrResults = $this->documentRepository->findSolrByCollection(NULL, $this->settings, $this->searchParams, $listedMetadata);
             }
 
             $documents = $solrResults['documents'] ? : [];
@@ -181,7 +181,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']);
         }
 
@@ -379,7 +379,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);
@@ -387,7 +387,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -418,7 +418,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++) {

Spacing +8 added lines, -8 removed lines

@@ -161,7 +161,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);
@@ -184,7 +184,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));
@@ -226,13 +226,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($this->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.
@@ -256,9 +256,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]).')';
                     }
                 }
             }
@@ -383,7 +383,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]);
@@ -397,7 +397,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 +9 added lines, -18 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -42,8 +41,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -55,8 +53,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -71,8 +68,7 @@ 
      *
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         // if search was triggered, get search parameters from POST variables
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
@@ -87,8 +83,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $listViewSearch = false;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
@@ -174,8 +169,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Quit without doing anything if no facets are configured.
         if (empty($this->settings['facets']) && empty($this->settings['facetCollections'])) {
             return '';
@@ -200,8 +194,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($facets)
-    {
+    public function makeFacetsMenuArray($facets) {
         $menuArray = [];
         // Set default value for facet search.
         $search = [
@@ -360,8 +353,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -412,8 +404,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         // Quit without doing anything if no fields for extended search are selected.
         if (
             empty($this->settings['extendedSlotCount'])

Classes/Controller/CollectionController.php

Spacing +4 added lines, -4 removed lines

@@ -96,14 +96,14 @@
         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()).'")';
             }
-            $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true';
+            $params['query'] = $solr_query.' AND partof:0 AND toplevel:true';
             $partOfNothing = $solr->search_raw($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->search_raw($params);
             // Titles are all documents that are "root" elements i.e. partof == 0
             $collectionInfo['titles'] = [];

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class CollectionController extends AbstractController
-{
+class CollectionController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -62,8 +59,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $solr = Solr::getInstance($this->settings['solrcore']);
 
         if (!$solr->ready) {
@@ -146,8 +142,7 @@ 
      *
      * @return void
      */
-    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection)
-    {
+    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection) {
         $searchParams = $this->getParametersSafely('searchParameter');
 
         // Instaniate the Solr. Without Solr present, we can't do anything.
@@ -199,8 +194,7 @@ 
      *
      * @return void
      */
-    public function showSortedAction()
-    {
+    public function showSortedAction() {
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 

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

@@ -87,7 +87,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 = [];
@@ -166,7 +166,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,
                     'widgetPage' => $widgetPage
@@ -175,10 +175,10 @@ 
         }
 
         // 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
         $documents = $this->documentRepository->findSolrByCollection($collection, $this->settings, $searchParams, $listedMetadata);
@@ -204,13 +204,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]);
 
     }
 }