Erikmitk / kitodo-presentation

Classes/Controller/ListViewController.php

Braces +1 added lines, -2 removed lines

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

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

@@ -91,15 +91,15 @@
         $currentPage = $this->requestData['page'] ?? 1;
 
         // 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);
 
         // get all indexed metadata fields
-        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
+        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(TRUE);
 
-        $solrResults = null;
+        $solrResults = NULL;
         $numResults = 0;
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
             $solrResults = $this->documentRepository->findSolrByCollections($collections, $this->settings, $this->searchParams, $listedMetadata, $indexedMetadata);

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
         // extract collection(s) from collection parameter
         $collections = [];
         if (is_array($this->searchParams) && array_key_exists('collection', $this->searchParams)) {
-            foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
+            foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 if (!empty($collectionEntry)) {
                     $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
                 }
@@ -116,7 +116,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);

Classes/Controller/NavigationController.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * Method to get the page select values and use them with cHash
      *

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getCurrentDocument()->numPages; $i++) {
             $orderLabel = $this->document->getCurrentDocument()->physicalStructureInfo[$this->document->getCurrentDocument()->physicalStructure[$i]]['orderlabel'];
-            $pageOptions[$i] = '[' . $i . ']' . ($orderLabel ? ' - ' . htmlspecialchars($orderLabel) : '');
+            $pageOptions[$i] = '['.$i.']'.($orderLabel ? ' - '.htmlspecialchars($orderLabel) : '');
         }
 
         $this->view->assign('pageOptions', $pageOptions);
@@ -122,7 +122,7 @@ 
                 $measureOptions = [];
                 $measurePages = [];
                 for ($i = 1; $i <= $this->document->getCurrentDocument()->numMeasures; $i++) {
-                    $measureOptions[$i] = '[' . $i . ']' . ($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructure[$i]['measureid']]['orderlabel'] ? ' - ' . htmlspecialchars($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructureInfo[$i]]['orderlabel']) : '');
+                    $measureOptions[$i] = '['.$i.']'.($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructure[$i]['measureid']]['orderlabel'] ? ' - '.htmlspecialchars($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructureInfo[$i]]['orderlabel']) : '');
                     $measurePages[$i] = $this->document->getCurrentDocument()->musicalStructure[$i]['page'];
                 }
 

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

@@ -35,7 +35,7 @@ 
      *
      * @return ResponseInterface the response
      */
-    public function pageSelectAction(PageSelectForm $pageSelectForm = null): ResponseInterface
+    public function pageSelectAction(PageSelectForm $pageSelectForm = NULL): ResponseInterface
     {
         if ($pageSelectForm) {
             $uri = $this->uriBuilder->reset()
@@ -116,7 +116,7 @@ 
         // prepare feature array for fluid
         $features = [];
         foreach (explode(',', $this->settings['features']) as $feature) {
-            $features[$feature] = true;
+            $features[$feature] = TRUE;
         }
         $this->view->assign('features', $features);
 

Classes/Controller/PageGridController.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  *
  * @access public
  */
-class PageGridController extends AbstractController
-{
+class PageGridController extends AbstractController {
     /**
      * The main method of the plugin
      *

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $pageGridPagination = new PageGridPagination($pageGridPaginator);
 
         $pagination = $this->buildSimplePagination($pageGridPagination, $pageGridPaginator);
-        $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $pageGridPaginator ]);
+        $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $pageGridPaginator]);
 
         $this->view->assign('docUid', $this->requestData['id']);
 

Classes/Controller/MetadataController.php

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
  *
  * @access public
  */
-class MetadataController extends AbstractController
-{
+class MetadataController extends AbstractController {
     /**
      * @access private
      * @var AbstractDocument

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

@@ -155,7 +155,7 @@ 
     protected function printMetadata(array $metadata): void
     {
         if ($this->useOriginalIiifManifestMetadata) {
-            $this->view->assign('useIiif', true);
+            $this->view->assign('useIiif', TRUE);
             $this->view->assign('iiifData', $this->buildIiifData($metadata));
         } else {
             // findBySettings also sorts entries by the `sorting` field
@@ -245,9 +245,9 @@ 
         if (IRI::isAbsoluteIri($value) && ($scheme == 'http' || $scheme == 'https')) {
             //TODO: should really label be converted to empty string if equal to value?
             $label = $value == $label ? '' : $label;
-            $buildUrl = true;
+            $buildUrl = TRUE;
         } else {
-            $buildUrl = false;
+            $buildUrl = FALSE;
         }
 
         return [
@@ -388,7 +388,7 @@ 
     private function parseParentTitle(int $i, $value, array &$metadata) : void
     {
         if (empty(implode('', $value)) && $this->settings['getTitle'] && $this->document->getPartof()) {
-            $superiorTitle = AbstractDocument::getTitle($this->document->getPartof(), true);
+            $superiorTitle = AbstractDocument::getTitle($this->document->getPartof(), TRUE);
             if (!empty($superiorTitle)) {
                 $metadata[$i]['title'] = ['[' . $superiorTitle . ']'];
             }

Spacing +3 added lines, -3 removed lines

@@ -131,7 +131,7 @@ 
         }
 
         if (empty(array_filter($metadata))) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->document->getUid());
+            $this->logger->warning('No metadata found for document with UID '.$this->document->getUid());
             return $this->htmlResponse();
         }
         ksort($metadata);
@@ -184,7 +184,7 @@ 
                     $this->parseMetadata($i, $name, $value, $metadata);
 
                     if (is_array($metadata[$i][$name])) {
-                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function ($metadataValue) {
+                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue) {
                             return !empty($metadataValue);
                         }));
                     }
@@ -401,7 +401,7 @@ 
         if (empty(implode('', $value)) && $this->settings['getTitle'] && $this->document->getPartof()) {
             $superiorTitle = AbstractDocument::getTitle($this->document->getPartof(), true);
             if (!empty($superiorTitle)) {
-                $metadata[$i]['title'] = ['[' . $superiorTitle . ']'];
+                $metadata[$i]['title'] = ['['.$superiorTitle.']'];
             }
         }
     }

Classes/Controller/TableOfContentsController.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  *
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *

Spacing +5 added lines, -5 removed lines

@@ -161,7 +161,7 @@ 
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
         }
         return $entryArray;
     }
@@ -338,16 +338,16 @@ 
                     $title = '';
                     foreach ($fields as $field) {
                         if ($field == 'type') {
-                            $title .= $this->getTranslatedType($entry['type']) . ' ';
+                            $title .= $this->getTranslatedType($entry['type']).' ';
                         } else {
-                            $title .= $entry[$field] . ' ';
+                            $title .= $entry[$field].' ';
                         }
                     }
                     return trim($title);
                 }
             }
         }
-        return $label ?: $orderLabel;
+        return $label ? : $orderLabel;
     }
 
     /**
@@ -382,7 +382,7 @@ 
     {
         usort(
             $menu[0]['_SUB_MENU'],
-            function ($firstElement, $secondElement) {
+            function($firstElement, $secondElement) {
                 if (!empty($firstElement['orderlabel'])) {
                     return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
                 }

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

@@ -72,12 +72,12 @@ 
             $this->getAllLogicalUnits();
             // Go through table of contents and create all menu entries.
             foreach ($this->document->getCurrentDocument()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, true);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
             }
         } else {
             // Go through table of contents and create top-level menu entries.
             foreach ($this->document->getCurrentDocument()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, false);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
             }
             // Build table of contents from database.
             $result = $this->documentRepository->getTableOfContentsFromDb($this->document->getUid(), $this->document->getPid(), $this->settings);
@@ -97,7 +97,7 @@ 
                         'pagination' => '',
                         'targetUid' => $resArray['uid']
                     ];
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
                 }
             }
         }
@@ -115,7 +115,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    private function getMenuEntry(array $entry, bool $recursive = false): array
+    private function getMenuEntry(array $entry, bool $recursive = FALSE): array
     {
         $entry = $this->resolveMenuEntry($entry);
 
@@ -131,7 +131,7 @@ 
         $entryArray['doNotLinkIt'] = 1;
         $entryArray['ITEM_STATE'] = 'NO';
 
-        $this->buildMenuLinks($entryArray, $entry['id'], $entry['points'] ?? null, $entry['targetUid'] ?? null);
+        $this->buildMenuLinks($entryArray, $entry['id'], $entry['points'] ?? NULL, $entry['targetUid'] ?? NULL);
 
         // Set "ITEM_STATE" to "CUR" if this entry points to current page.
         if (in_array($entry['id'], $this->activeEntries)) {
@@ -139,7 +139,7 @@ 
         }
         // Build sub-menu if available and called recursively.
         if (
-            $recursive === true
+            $recursive === TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:
@@ -157,7 +157,7 @@ 
                     if (in_array($child['id'], $this->activeEntries)) {
                         $entryArray['ITEM_STATE'] = 'ACT';
                     }
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.

Classes/Controller/FeedsController.php

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,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 (
@@ -95,12 +95,12 @@ 
                 ) {
                     $superiorTitle = AbstractDocument::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)) {
@@ -108,13 +108,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 +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class FeedsController extends AbstractController
-{
+class FeedsController extends AbstractController {
 
     /**
      * @access protected

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

@@ -85,7 +85,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) {
 
@@ -94,7 +94,7 @@ 
                 if ((empty($document->getTitle()) || !empty($this->settings['prependSuperiorTitle']))
                     && !empty($document->getPartof())
                 ) {
-                    $superiorTitle = AbstractDocument::getTitle($document->getPartof(), true);
+                    $superiorTitle = AbstractDocument::getTitle($document->getPartof(), TRUE);
                     if (!empty($superiorTitle)) {
                         $title .= '[' . $superiorTitle . ']';
                     }

Classes/Controller/CalendarController.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  *
  * @access public
  */
-class CalendarController extends AbstractController
-{
+class CalendarController extends AbstractController {
     /**
      * @access protected
      * @var StructureRepository

Spacing +11 added lines, -11 removed lines

@@ -136,8 +136,8 @@ 
         $this->view->assign('calendarData', $calendarData);
         $this->view->assign('documentId', $this->document->getUid());
         $this->view->assign('yearLinkTitle', $yearLinkTitle);
-        $this->view->assign('parentDocumentId', $this->document->getPartof() ?: $this->document->getCurrentDocument()->tableOfContents[0]['points']);
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getCurrentDocument()->tableOfContents[0]['points']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
 
         return $this->htmlResponse();
     }
@@ -224,7 +224,7 @@ 
         }
 
         $this->view->assign('documentId', $this->document->getUid());
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
 
         return $this->htmlResponse();
     }
@@ -245,7 +245,7 @@ 
     protected function getCalendarYear(array &$calendarData, array $calendarIssuesByMonth, int $year, int $firstMonth = 1, int $lastMonth = 12): void
     {
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
-            $key = $year . '-' . $i;
+            $key = $year.'-'.$i;
 
             $calendarData[$key] = [
                 'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
@@ -255,16 +255,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[$key]['week'][$j] = [
                     'DAYMON' => ['dayValue' => '&nbsp;'],
@@ -277,7 +277,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
@@ -348,7 +348,7 @@ 
      */
     private function fillCalendar(array &$calendarData, int $currentDayTime, string $dayLinks, array $dayLinkDiv, int $firstDayOfWeek, int $k): void
     {
-        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
             case '0':
                 $this->fillDay($calendarData, $currentDayTime, 'DAYSUN', $dayLinks, $dayLinkDiv);
                 break;
@@ -452,7 +452,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $issuesByYear[$_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.
@@ -495,7 +495,7 @@ 
             foreach ($year['children'] as $month) {
                 foreach ($month['children'] as $day) {
                     foreach ($day['children'] as $issue) {
-                        $title = $issue['label'] ?: $issue['orderlabel'];
+                        $title = $issue['label'] ? : $issue['orderlabel'];
                         if (strtotime($title) !== false) {
                             $title = strftime('%x', strtotime($title));
                         }

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

@@ -83,9 +83,9 @@ 
         switch ($type) {
             case 'newspaper':
             case 'ephemera':
-                return $this->redirect('years', null, null, $this->requestData);
+                return $this->redirect('years', NULL, NULL, $this->requestData);
             case 'year':
-                return $this->redirect('calendar', null, null, $this->requestData);
+                return $this->redirect('calendar', NULL, NULL, $this->requestData);
             case 'issue':
             default:
                 break;
@@ -446,7 +446,7 @@ 
 
         foreach ($this->getIssues() as $issue) {
             $dateTimestamp = strtotime($issue['year']);
-            if ($dateTimestamp !== false) {
+            if ($dateTimestamp !== FALSE) {
                 $_year = date('Y', $dateTimestamp);
                 $_month = date('n', $dateTimestamp);
                 $_day = date('j', $dateTimestamp);
@@ -496,7 +496,7 @@ 
                 foreach ($month['children'] as $day) {
                     foreach ($day['children'] as $issue) {
                         $title = $issue['label'] ?: $issue['orderlabel'];
-                        if (strtotime($title) !== false) {
+                        if (strtotime($title) !== FALSE) {
                             $title = strftime('%x', strtotime($title));
                         }
 
@@ -529,7 +529,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));
                 }
             }

Classes/Controller/BasketController.php

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

Spacing +26 added lines, -26 removed lines

@@ -134,7 +134,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);
                     }
                 }
@@ -201,7 +201,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);
         }
@@ -290,12 +290,12 @@ 
 
         $docData = $this->getDocumentData((int) $id, $data);
 
-        $entryKey = $id . '_' . $startPage;
+        $entryKey = $id.'_'.$startPage;
         if (!empty($startX)) {
-            $entryKey .= '_' . $startX;
+            $entryKey .= '_'.$startX;
         }
         if (!empty($endX)) {
-            $entryKey .= '_' . $endX;
+            $entryKey .= '_'.$endX;
         }
 
         $entry = [
@@ -354,7 +354,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)) {
@@ -365,15 +365,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 {
@@ -446,12 +446,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)) {
@@ -472,14 +472,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() {
        });
       });
@@ -517,12 +517,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]);
@@ -555,7 +555,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
@@ -563,7 +563,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;
@@ -574,7 +574,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.
@@ -601,7 +601,7 @@ 
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
         $newActionLog->setFileName($pdfUrl);
         $newActionLog->setCountPages($numberOfPages);
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
 
         if ($this->isUserLoggedIn()) {
             // internal user
@@ -630,7 +630,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'];
             }
         }
@@ -648,7 +648,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'];
                 }
             }
@@ -665,12 +665,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);

Classes/Controller/CollectionController.php

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

Spacing +5 added lines, -5 removed lines

@@ -168,7 +168,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);
@@ -220,9 +220,9 @@ 
         foreach ($collections as $collection) {
             $solrQuery = '';
             if ($collection->getIndexSearch() != '') {
-                $solrQuery .= '(' . $collection->getIndexSearch() . ')';
+                $solrQuery .= '('.$collection->getIndexSearch().')';
             } else {
-                $solrQuery .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
+                $solrQuery .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
             }
 
             // We only care about the UID and partOf in the results and want them sorted
@@ -236,11 +236,11 @@ 
             if ($collection->getIndexSearch()) {
                 $params['query'] = $solrQuery;
             } else {
-                $params['query'] = $solrQuery . ' AND partof:0 AND toplevel:true';
+                $params['query'] = $solrQuery.' AND partof:0 AND toplevel:true';
             }
             $partOfNothing = $solr->searchRaw($params);
 
-            $params['query'] = $solrQuery . ' AND NOT partof:0 AND toplevel:true';
+            $params['query'] = $solrQuery.' AND NOT partof:0 AND toplevel:true';
             $partOfSomething = $solr->searchRaw($params);
 
             $collectionInfo = [];

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

@@ -97,7 +97,7 @@ 
         }
 
         if (count($collections) == 1 && empty($this->settings['dont_show_single']) && is_array($collections)) {
-            return $this->redirect('show', null, null, ['collection' => array_pop($collections)]);
+            return $this->redirect('show', NULL, NULL, ['collection' => array_pop($collections)]);
         }
 
         $processedCollections = $this->processCollections($collections, $solr);
@@ -142,7 +142,7 @@ 
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid'])) {
             return $this->redirect(
-                'main', 'ListView', null,
+                'main', 'ListView', NULL,
                 [
                     'searchParameter' => $searchParams,
                     'page' => $currentPage
@@ -151,16 +151,16 @@ 
         }
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         // get all indexed metadata fields
-        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
+        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(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, $indexedMetadata);
 
@@ -198,13 +198,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
-        return $this->redirect('show', null, null, ['searchParameter' => $searchParams, 'collection' => $collection]);
+        return $this->redirect('show', NULL, NULL, ['searchParameter' => $searchParams, 'collection' => $collection]);
     }
 
     /**