Erikmitk / kitodo-presentation

Classes/Controller/OaiPmhController.php

Spacing +11 added lines, -11 removed lines

@@ -250,10 +250,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;
     }
@@ -421,7 +421,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');
             }
@@ -504,7 +504,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;
@@ -610,9 +610,9 @@ 
             $resArray = $result->fetchAssociative();
             if ($resArray) {
                 if ($resArray['index_query'] != "") {
-                    $solrQuery .= '(' . $resArray['index_query'] . ')';
+                    $solrQuery .= '('.$resArray['index_query'].')';
                 } else {
-                    $solrQuery .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                    $solrQuery .= 'collection:'.'"'.$resArray['index_name'].'"';
                 }
             } else {
                 $this->error = 'noSetHierarchy';
@@ -624,7 +624,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->parameters['metadataPrefix']]['requiredFields'] as $required) {
-            $solrQuery .= ' NOT ' . $required . ':""';
+            $solrQuery .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solrQuery .= ' AND toplevel:true';
@@ -638,7 +638,7 @@ 
             return $documentSet;
         }
 
-        $solrQuery .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solrQuery .= ' AND timestamp:['.$from.' TO '.$until.']';
 
         $solr = Solr::getInstance($this->settings['solrcore']);
         if (!$solr->ready) {
@@ -729,7 +729,7 @@ 
      */
     private function getDate(string $dateType)
     {
-        return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ?: strptime($this->parameters[$dateType], '%Y-%m-%d');
+        return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ? : strptime($this->parameters[$dateType], '%Y-%m-%d');
     }
 
     /**
@@ -752,7 +752,7 @@ 
             $date['tm_mday'],
             $date['tm_year'] + 1900
         );
-        return date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . $end;
+        return date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).$end;
     }
 
     /**
@@ -865,7 +865,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 +20 added lines, -40 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  */
-class OaiPmhController extends AbstractController
-{
+class OaiPmhController extends AbstractController {
     /**
      * @access protected
      * @var TokenRepository
@@ -41,8 +40,7 @@ 
      *
      * @return void
      */
-    public function injectTokenRepository(TokenRepository $tokenRepository)
-    {
+    public function injectTokenRepository(TokenRepository $tokenRepository) {
         $this->tokenRepository = $tokenRepository;
     }
 
@@ -59,8 +57,7 @@ 
      *
      * @return void
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -77,8 +74,7 @@ 
      *
      * @return void
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -89,8 +85,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request->setFormat('xml');
     }
 
@@ -135,8 +130,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $this->tokenRepository->deleteExpiredTokens($this->settings['expired']);
     }
@@ -148,8 +142,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -179,8 +172,7 @@ 
      *
      * @return array The mapped metadata array
      */
-    private function getDublinCoreData(array $record)
-    {
+    private function getDublinCoreData(array $record) {
         $metadata = [];
 
         $metadata[] = ['dc:identifier' => $record['record_id']];
@@ -222,8 +214,7 @@ 
      *
      * @return void
      */
-    private function addDublinCoreData(&$metadata, $key, $value)
-    {
+    private function addDublinCoreData(&$metadata, $key, $value) {
         if (!empty($value)) {
             $metadata[] = [$key => $value];
         }
@@ -239,8 +230,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();
@@ -265,8 +255,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Get allowed GET and POST variables.
         $this->getUrlParams();
 
@@ -333,8 +322,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;
@@ -386,8 +374,7 @@ 
      *
      * @return void
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         $library = $this->libraryRepository->findByUid($this->settings['library']);
 
         $oaiIdentifyInfo = [];
@@ -436,8 +423,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.
@@ -491,8 +477,7 @@ 
      *
      * @return void
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // check for the optional "identifier" parameter
         if (isset($this->parameters['identifier'])) {
@@ -524,8 +509,7 @@ 
      *
      * @return void
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -580,8 +564,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;
 
@@ -727,8 +710,7 @@ 
      *
      * @return array|false
      */
-    private function getDate(string $dateType)
-    {
+    private function getDate(string $dateType) {
         return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ?: strptime($this->parameters[$dateType], '%Y-%m-%d');
     }
 
@@ -783,8 +765,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';
@@ -837,8 +818,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 +4 added lines, -4 removed lines

@@ -241,7 +241,7 @@ 
      */
     protected function getMetsData(array $record)
     {
-        $mets = null;
+        $mets = NULL;
         // Load METS file.
         $xml = new \DOMDocument();
         if ($xml->load($record['location'])) {
@@ -322,7 +322,7 @@ 
         } else {
             // No resumption token found or resumption token expired.
             $this->error = 'badResumptionToken';
-            return null;
+            return NULL;
         }
     }
 
@@ -583,7 +583,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);
 
@@ -844,7 +844,7 @@ 
         $currentCursor = $documentListSet['metadata']['cursor'];
 
         if (count($documentListSet['elements']) !== 0) {
-            $resumptionToken = uniqid('', false);
+            $resumptionToken = uniqid('', FALSE);
 
             $documentListSet['metadata']['cursor'] += $numShownDocuments;
 

Classes/Controller/StatisticsController.php

Braces +1 added lines, -2 removed lines

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

Classes/Controller/ListViewController.php

Spacing +2 added lines, -2 removed lines

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

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

@@ -94,12 +94,12 @@
         }
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
-        $solrResults = null;
+        $solrResults = NULL;
         $numResults = 0;
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
             $solrResults = $this->documentRepository->findSolrByCollections($collections, $this->settings, $this->searchParams, $listedMetadata);

Classes/Controller/PageGridController.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,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']);
     }

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
      *

Classes/Controller/MetadataController.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
         }
         // @phpstan-ignore-next-line
         if (!$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;
         }
         ksort($metadata);
@@ -173,7 +173,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);
                         }));
                     }
@@ -390,7 +390,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.']'];
             }
         }
     }

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 . ']'];
             }

Classes/Controller/TableOfContentsController.php

Spacing +5 added lines, -5 removed lines

@@ -197,7 +197,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;
     }
@@ -309,9 +309,9 @@ 
                     $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].' ';
                         }
                     }
         
@@ -319,7 +319,7 @@ 
                 }
             }
         }
-        return $entry['label'] ?: $entry['orderlabel'];
+        return $entry['label'] ? : $entry['orderlabel'];
     }
 
     /**
@@ -352,7 +352,7 @@ 
      */
     private function sortSubMenu(array &$menu): void
     {
-        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement) {
+        usort($menu[0]['_SUB_MENU'], function($firstElement, $secondElement) {
             if (!empty($firstElement['orderlabel'])) {
                 return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
             }

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
      *

Upper-Lower-Casing +6 added lines, -6 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);
 
@@ -175,7 +175,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:
@@ -193,7 +193,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

@@ -84,7 +84,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) {
 
@@ -93,7 +93,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/ToolboxController.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
                         $this->renderToolByName('renderSearchInDocumentTool');
                         break;
                     default:
-                        $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.');
+                        $this->logger->warning('Incorrect tool configuration: "'.$this->settings['tools'].'". Tool "'.$tool.'" does not exist.');
                 }
             }
         }
@@ -262,7 +262,7 @@ 
                 }
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $image;
@@ -346,7 +346,7 @@ 
             empty($firstPageLink)
             && empty($secondPageLink)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
 
         if (!empty($firstPageLink)) {
@@ -384,7 +384,7 @@ 
             }
         }
         if (empty($workLink)) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
         return $workLink;
     }

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
 
     /**
      * @access private

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

@@ -117,7 +117,7 @@ 
     private function renderToolByName(string $tool): void
     {
         $this->$tool();
-        $this->view->assign($tool, true);
+        $this->view->assign($tool, TRUE);
     }
 
     /**
@@ -139,12 +139,12 @@ 
 
         $annotationContainers = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['annotationContainers'];
         if (
-            $annotationContainers != null
+            $annotationContainers != NULL
             && count($annotationContainers) > 0
         ) {
-            $this->view->assign('annotationTool', true);
+            $this->view->assign('annotationTool', TRUE);
         } else {
-            $this->view->assign('annotationTool', false);
+            $this->view->assign('annotationTool', FALSE);
         }
     }
 
@@ -193,10 +193,10 @@ 
         $this->setPage();
 
         if (!$this->isFullTextEmpty()) {
-            $this->view->assign('fulltext', true);
+            $this->view->assign('fulltext', TRUE);
             $this->view->assign('activateFullTextInitially', MathUtility::forceIntegerInRange($this->settings['activateFullTextInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('fulltext', false);
+            $this->view->assign('fulltext', FALSE);
         }
     }
 
@@ -281,7 +281,7 @@ 
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
-        $this->view->assign('imageManipulation', true);
+        $this->view->assign('imageManipulation', TRUE);
         $this->view->assign('parentContainer', $parentContainer);
     }
 
@@ -444,7 +444,7 @@ 
     {
         $id = $this->document->getUid();
 
-        if ($id !== null && $id > 0) {
+        if ($id !== NULL && $id > 0) {
             // we found the document uid
             return (string) $id;
         } else {

Classes/Controller/PageViewController.php

Spacing +11 added lines, -11 removed lines

@@ -119,11 +119,11 @@ 
                 $fulltext['mimetype'] = $file['mimeType'];
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -141,13 +141,13 @@ 
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->settings['elementId'] . '",
-                        progressElementId: "' . $this->settings['progressElementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->settings['elementId'].'",
+                        progressElementId: "' . $this->settings['progressElementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });';
@@ -240,11 +240,11 @@ 
                 }
                 break;
             } else {
-                $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpImages'].'"');
         }
         return $image;
     }

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  *
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * @access protected
      * @var array Holds the controls to add to the map

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

@@ -170,7 +170,7 @@ 
             if ($iiif instanceof ManifestInterface) {
                 $canvas = $iiif->getContainedResourceById($canvasId);
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
-                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
+                if ($canvas != NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     $annotationContainers = [];
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -180,11 +180,11 @@ 
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
                      */
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if (
                                     $annotation->getBody()->getFormat() == 'text/plain'
-                                    && $annotation->getBody()->getChars() != null
+                                    && $annotation->getBody()->getChars() != NULL
                                 ) {
                                     $annotationListData = [];
                                     $annotationListData['uri'] = $annotationContainer->getId();