Erikmitk / kitodo-presentation

Classes/Domain/Model/Annotation.php

Braces +18 added lines, -36 removed lines

@@ -12,8 +12,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-class Annotation
-{
+class Annotation {
     /**
      * The complete data of the annotation
      *
@@ -30,8 +29,7 @@ 
     /**
      * @param array $data
      */
-    public function __construct($data)
-    {
+    public function __construct($data) {
         $this->data = $data;
     }
 
@@ -40,8 +38,7 @@ 
      *
      * @return array
      */
-    public function getRawData()
-    {
+    public function getRawData() {
         return $this->data;
     }
 
@@ -50,8 +47,7 @@ 
      *
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->data['id'] ?? '';
     }
 
@@ -60,8 +56,7 @@ 
      *
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->data['title'] ?? '';
     }
 
@@ -70,8 +65,7 @@ 
      *
      * @return array
      */
-    public function getBody()
-    {
+    public function getBody() {
         $body = $this->data['body'] ?? '';
 
         if (is_array($body)) {
@@ -85,8 +79,7 @@ 
      * Gets the name of the annotation creator
      * @return string
      */
-    public function getCreatorName()
-    {
+    public function getCreatorName() {
         return $this->data['creator']['displayName'] ?? '';
     }
 
@@ -94,8 +87,7 @@ 
      * Gets the creation date of the annotation
      * @return string
      */
-    public function getCreated()
-    {
+    public function getCreated() {
         return $this->data['created'] ?? '';
     }
 
@@ -103,8 +95,7 @@ 
      * Gets the modification date of the annotation
      * @return string
      */
-    public function getModified()
-    {
+    public function getModified() {
         return $this->data['modified'] ?? '';
     }
 
@@ -113,8 +104,7 @@ 
      *
      * @return AnnotationTarget[]
      */
-    public function getTargets()
-    {
+    public function getTargets() {
         if (is_string($this->data['target'])) {
             return [new AnnotationTarget($this->data['target'])];
         }
@@ -133,8 +123,7 @@ 
      * @param array $targetPages
      * @return void
      */
-    public function setTargetPages($targetPages)
-    {
+    public function setTargetPages($targetPages) {
         $this->targetPages = $targetPages;
     }
 
@@ -143,8 +132,7 @@ 
      *
      * @return array
      */
-    public function getTargetPages()
-    {
+    public function getTargetPages() {
         return $this->targetPages;
     }
 
@@ -153,8 +141,7 @@ 
      *
      * @return array
      */
-    public function getPageNumbers()
-    {
+    public function getPageNumbers() {
         $pages = [];
         if (is_array($this->targetPages)) {
             foreach ($this->targetPages as $target) {
@@ -170,8 +157,7 @@ 
      *
      * @return array
      */
-    public function getPageTargets()
-    {
+    public function getPageTargets() {
         $pageTargets = [];
         if (is_array($this->targetPages)) {
             foreach ($this->targetPages as $target) {
@@ -189,8 +175,7 @@ 
      *
      * @return array
      */
-    public function getPageAudioRanges()
-    {
+    public function getPageAudioRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -209,8 +194,7 @@ 
      *
      * @return array
      */
-    public function getPageScoreRanges()
-    {
+    public function getPageScoreRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -229,8 +213,7 @@ 
      *
      * @return array
      */
-    public function getPageFacsimileRanges()
-    {
+    public function getPageFacsimileRanges() {
         $ranges = [];
         if (is_array($this->getPageTargets())) {
             foreach ($this->getPageTargets() as $pageNumber => $targets) {
@@ -250,8 +233,7 @@ 
      *
      * @return bool
      */
-    public function isVerovioRelevant()
-    {
+    public function isVerovioRelevant() {
         foreach ($this->targetPages as $target) {
             if (array_key_exists('verovioRelevant', $target) && $target['verovioRelevant']) {
                     return true;

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

@@ -254,10 +254,10 @@
     {
         foreach ($this->targetPages as $target) {
             if (array_key_exists('verovioRelevant', $target) && $target['verovioRelevant']) {
-                    return true;
+                    return TRUE;
             }
         }
 
-        return false;
+        return FALSE;
     }
 }

Classes/Domain/Model/MetadataFormat.php

Braces +6 added lines, -12 removed lines

@@ -30,8 +30,7 @@ 
  *
  * @access public
  */
-class MetadataFormat extends AbstractEntity
-{
+class MetadataFormat extends AbstractEntity {
     /**
      * @access protected
      * @var int UID of the ``tx_dlf_metadata`` that is encoded by this metadata entry.
@@ -76,14 +75,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->subentries = new ObjectStorage();
     }
 
@@ -151,8 +148,7 @@ 
         $this->xpathSorting = $xpathSorting;
     }
 
-    public function getSubentries()
-    {
+    public function getSubentries() {
         return $this->subentries;
     }
 
@@ -168,8 +164,7 @@ 
      *
      * @return void
      */
-    public function addSubentry(MetadataSubentry $subentry)
-    {
+    public function addSubentry(MetadataSubentry $subentry) {
         $this->subentries->attach($subentry);
     }
 
@@ -180,8 +175,7 @@ 
      *
      * @return void
      */
-    public function removeSubentry(MetadataSubentry $subentryToRemove)
-    {
+    public function removeSubentry(MetadataSubentry $subentryToRemove) {
         $this->subentries->detach($subentryToRemove);
     }
 

Classes/Controller/ToolboxController.php

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
  *
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
 
     /**
      * @access private
@@ -208,8 +207,7 @@ 
      *
      * @return void
      */
-    public function renderScoreTool()
-    {
+    public function renderScoreTool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['files']['fileGrpScore'])

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
                         $this->renderToolByName('renderScoreTool');
                         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.');
                 }
             }
         }
@@ -318,7 +318,7 @@ 
                 $file['url'] = $this->currentDocument->getDownloadLocation($fileId);
                 $file['mimetype'] = $this->currentDocument->getFileMimeType($fileId);
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $file;
@@ -426,7 +426,7 @@ 
             empty($firstPageLink)
             && empty($secondPageLink)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
 
         if (!empty($firstPageLink)) {
@@ -464,7 +464,7 @@ 
             }
         }
         if (empty($workLink)) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
         return $workLink;
     }

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

@@ -127,7 +127,7 @@ 
     private function renderToolByName(string $tool): void
     {
         $this->$tool();
-        $this->view->assign($tool, true);
+        $this->view->assign($tool, TRUE);
     }
 
     /**
@@ -175,12 +175,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);
         }
     }
 
@@ -229,10 +229,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);
         }
     }
 
@@ -264,10 +264,10 @@ 
             }
         }
         if (!empty($scoreFile)) {
-            $this->view->assign('score', true);
+            $this->view->assign('score', TRUE);
             $this->view->assign('activateScoreInitially', MathUtility::forceIntegerInRange($this->settings['activateScoreInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('score', false);
+            $this->view->assign('score', FALSE);
         }
     }
 
@@ -347,7 +347,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);
     }
 
@@ -534,7 +534,7 @@ 
     {
         $id = $this->document->getUid();
 
-        if ($id !== null && $id > 0) {
+        if ($id !== NULL && $id > 0) {
             // we found the document uid
             return (string) $id;
         } else {
@@ -591,10 +591,10 @@ 
             if (isset($this->requestData['page'])) {
                 $files = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['files'];
                 if (!empty($files[$fileGrpFulltext])) {
-                    return false;
+                    return FALSE;
                 }
             }
         }
-        return true;
+        return TRUE;
     }
 }

Classes/ViewHelpers/IsArrayViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -18,10 +18,8 @@ 
 /**
  * Checks if the given subject is an array.
  */
-class IsArrayViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class IsArrayViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('subject', 'string', 'The subject');
     }
@@ -29,8 +27,7 @@ 
     /**
      * @return bool
      */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
+    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) {
         $subject = $arguments['subject'];
         if ($subject === null) {
             $subject = $renderChildrenClosure();

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

@@ -32,7 +32,7 @@
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
         $subject = $arguments['subject'];
-        if ($subject === null) {
+        if ($subject === NULL) {
             $subject = $renderChildrenClosure();
         }
 

Classes/ViewHelpers/IsInArrayViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -13,10 +13,8 @@ 
 
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-class IsInArrayViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class IsInArrayViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('needle', 'mixed', 'The searched value', true);
         $this->registerArgument('haystack', 'array', 'The array', true);
@@ -27,8 +25,7 @@ 
      *
      * @return bool
      */
-    public function render()
-    {
+    public function render() {
         $needle = $this->arguments['needle'];
         $haystack = $this->arguments['haystack'];
 

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

@@ -18,8 +18,8 @@
     public function initializeArguments()
     {
         parent::initializeArguments();
-        $this->registerArgument('needle', 'mixed', 'The searched value', true);
-        $this->registerArgument('haystack', 'array', 'The array', true);
+        $this->registerArgument('needle', 'mixed', 'The searched value', TRUE);
+        $this->registerArgument('haystack', 'array', 'The array', TRUE);
     }
 
     /**

Classes/ViewHelpers/ImplodeViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -13,10 +13,8 @@ 
 
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-class ImplodeViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class ImplodeViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('value', 'array', 'The array to be imploded', true);
         $this->registerArgument('delimiter', 'string', 'The delimiter ', true);
@@ -27,8 +25,7 @@ 
      *
      * @return string
      */
-    public function render()
-    {
+    public function render() {
         $value = $this->arguments['value'];
         $delimiter = $this->arguments['delimiter'];
 

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

@@ -18,8 +18,8 @@
     public function initializeArguments()
     {
         parent::initializeArguments();
-        $this->registerArgument('value', 'array', 'The array to be imploded', true);
-        $this->registerArgument('delimiter', 'string', 'The delimiter ', true);
+        $this->registerArgument('value', 'array', 'The array to be imploded', TRUE);
+        $this->registerArgument('delimiter', 'string', 'The delimiter ', TRUE);
     }
 
     /**

Classes/Common/AnnotationRequest.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function __construct($apiUrl)
     {
-        $this->apiUrl =  trim($apiUrl, "/ ");
+        $this->apiUrl = trim($apiUrl, "/ ");
     }
 
 
@@ -59,7 +59,7 @@ 
     {
         $annotations = [];
 
-        $annotationData = $this->requestAnnotions($this->apiUrl . '?target=' . urlencode($id . '/*'));
+        $annotationData = $this->requestAnnotions($this->apiUrl.'?target='.urlencode($id.'/*'));
 
         if (array_key_exists('first', $annotationData)) {
             $annotationPageData = $annotationData['first'];

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-class AnnotationRequest
-{
+class AnnotationRequest {
     /**
      * @var string
      */
@@ -22,8 +21,7 @@ 
     /**
      * @param string $apiUrl The url of the annotation server api.
      */
-    public function __construct($apiUrl)
-    {
+    public function __construct($apiUrl) {
         $this->apiUrl =  trim($apiUrl, "/ ");
     }
 
@@ -55,8 +53,7 @@ 
      * @param string $id Document id (purl)
      * @return array
      */
-    public function getAll($id)
-    {
+    public function getAll($id) {
         $annotations = [];
 
         $annotationData = $this->requestAnnotions($this->apiUrl . '?target=' . urlencode($id . '/*'));

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

@@ -39,7 +39,7 @@
         $jsonld = Helper::getUrl($url);
 
         if ($jsonld) {
-            $annotationData = json_decode($jsonld, true);
+            $annotationData = json_decode($jsonld, TRUE);
 
             if ($annotationData) {
                 return $annotationData;

Classes/Common/MetsDocument.php

Braces +8 added lines, -16 removed lines

@@ -72,8 +72,7 @@ 
  * @property-read SimpleXMLElement $mets this holds the XML file's METS part as SimpleXMLElement object
  * @property-read string $parentHref URL of the parent document (determined via mptr element), or empty string if none is available
  */
-final class MetsDocument extends AbstractDocument
-{
+final class MetsDocument extends AbstractDocument {
     /**
      * @access protected
      * @var string[] Subsections / tags that may occur within `<mets:amdSec>`
@@ -286,8 +285,7 @@ 
     /**
      * This gets the measure beginning of a page
      */
-    public function getPageBeginning($pageId, $fileId)
-    {
+    public function getPageBeginning($pageId, $fileId) {
         $mets = $this->mets
             ->xpath(
                 './mets:structMap[@TYPE="PHYSICAL"]' .
@@ -482,8 +480,7 @@ 
      *
      * @return ?string thumbnail or null if not found
      */
-    private function getThumbnail(string $id = '')
-    {
+    private function getThumbnail(string $id = '') {
         // Load plugin configuration.
         $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');
         $fileGrpsThumb = GeneralUtility::trimExplode(',', $extConf['fileGrpThumbs']);
@@ -624,8 +621,7 @@ 
      * @param DOMNode $parentNode
      * @return array|false
      */
-    private function getSubentries($allSubentries, string $parentIndex, DOMNode $parentNode)
-    {
+    private function getSubentries($allSubentries, string $parentIndex, DOMNode $parentNode) {
         $domXPath = new DOMXPath($parentNode->ownerDocument);
         $this->registerNamespaces($domXPath);
         $theseSubentries = [];
@@ -655,8 +651,7 @@ 
      * @param $subentry
      * @return array
      */
-    private function getSubentryValue($values, $subentry)
-    {
+    private function getSubentryValue($values, $subentry) {
         $theseSubentries = [];
         if (
             ($values instanceof DOMNodeList
@@ -906,8 +901,7 @@ 
      *
      * @return bool true if extraction successful, false otherwise
      */
-    private function extractMetadataIfTypeSupported(string $dmdId, string $mdSectionType, array &$metadata)
-    {
+    private function extractMetadataIfTypeSupported(string $dmdId, string $mdSectionType, array &$metadata) {
         // Is this metadata format supported?
         if (!empty($this->formats[$this->mdSec[$dmdId]['type']])) {
             if (!empty($this->formats[$this->mdSec[$dmdId]['type']]['class'])) {
@@ -939,8 +933,7 @@ 
      *
      * @return array additional metadata data queried from database
      */
-    private function getAdditionalMetadataFromDatabase(int $cPid, string $dmdId)
-    {
+    private function getAdditionalMetadataFromDatabase(int $cPid, string $dmdId) {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_metadata');
         // Get hidden records, too.
@@ -1131,8 +1124,7 @@ 
     /**
      * @see AbstractDocument::getStructureDepth()
      */
-    public function getStructureDepth(string $logId)
-    {
+    public function getStructureDepth(string $logId) {
         $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);

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

@@ -109,7 +109,7 @@ 
      *
      * @see MetsDocument::$mdSec
      */
-    protected bool $mdSecLoaded = false;
+    protected bool $mdSecLoaded = FALSE;
 
     /**
      * @access protected
@@ -131,7 +131,7 @@ 
      *
      * @see $fileGrps
      */
-    protected bool $fileGrpsLoaded = false;
+    protected bool $fileGrpsLoaded = FALSE;
 
     /**
      * @access protected
@@ -174,7 +174,7 @@ 
      * @var bool
      * @access protected
      */
-    protected bool $musicalStructureLoaded = false;
+    protected bool $musicalStructureLoaded = FALSE;
 
     /**
      * The holds the total number of measures
@@ -240,7 +240,7 @@ 
                 return $service->getImageUrl();
             }
         } elseif ($file['mimeType'] === 'application/vnd.netfpx') {
-            $baseURL = $file['location'] . (strpos($file['location'], '?') === false ? '?' : '');
+            $baseURL = $file['location'] . (strpos($file['location'], '?') === FALSE ? '?' : '');
             // TODO CVT is an optional IIP server capability; in theory, capabilities should be determined in the object request with '&obj=IIP-server'
             return $baseURL . '&CVT=jpeg';
         }
@@ -263,7 +263,7 @@ 
             $this->fileInfos[$id]['mimeType'] = $this->getFileMimeType($id);
         }
 
-        return $this->fileInfos[$id] ?? null;
+        return $this->fileInfos[$id] ?? NULL;
     }
 
     /**
@@ -319,7 +319,7 @@ 
     /**
      * @see AbstractDocument::getLogicalStructure()
      */
-    public function getLogicalStructure(string $id, bool $recursive = false): array
+    public function getLogicalStructure(string $id, bool $recursive = FALSE): array
     {
         $details = [];
         // Is the requested logical unit already loaded?
@@ -360,7 +360,7 @@ 
      *
      * @return array Array of the element's id, label, type and physical page indexes/mptr link
      */
-    protected function getLogicalStructureInfo(SimpleXMLElement $structure, bool $recursive = false): array
+    protected function getLogicalStructureInfo(SimpleXMLElement $structure, bool $recursive = FALSE): array
     {
         $attributes = $structure->attributes();
 
@@ -378,7 +378,7 @@ 
             'pagination' => '',
             'type' => isset($attributes['TYPE']) ? (string) $attributes['TYPE'] : '',
             'description' => '',
-            'thumbnailId' => null,
+            'thumbnailId' => NULL,
             'files' => [],
         ];
 
@@ -413,7 +413,7 @@ 
             $details['children'] = [];
             foreach ($structure->children('http://www.loc.gov/METS/')->div as $child) {
                 // Repeat for all children.
-                $details['children'][] = $this->getLogicalStructureInfo($child, true);
+                $details['children'][] = $this->getLogicalStructureInfo($child, TRUE);
             }
         }
         return $details;
@@ -459,7 +459,7 @@ 
             && array_key_exists($details['id'], $this->smLinks['l2p'])
         ) {
             // Link logical structure to the first corresponding physical page/track.
-            $details['points'] = max((int) array_search($this->smLinks['l2p'][$details['id']][0], $this->physicalStructure, true), 1);
+            $details['points'] = max((int) array_search($this->smLinks['l2p'][$details['id']][0], $this->physicalStructure, TRUE), 1);
             $details['thumbnailId'] = $this->getThumbnail();
             // Get page/track number of the first page/track related to this structure element.
             $details['pagination'] = $this->physicalStructureInfo[$this->smLinks['l2p'][$details['id']][0]]['orderlabel'];
@@ -468,7 +468,7 @@ 
             $details['points'] = 1;
             $details['thumbnailId'] = $this->getThumbnail();
         }
-        if ($details['thumbnailId'] === null) {
+        if ($details['thumbnailId'] === NULL) {
             unset($details['thumbnailId']);
         }
     }
@@ -488,14 +488,14 @@ 
         $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');
         $fileGrpsThumb = GeneralUtility::trimExplode(',', $extConf['fileGrpThumbs']);
 
-        $thumbnail = null;
+        $thumbnail = NULL;
 
         while ($fileGrpThumb = array_shift($fileGrpsThumb)) {
             if (empty($id)) {
-                $thumbnail = $this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb] ?? null;
+                $thumbnail = $this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb] ?? NULL;
             } else {
-                $parentId = $this->smLinks['l2p'][$id][0] ?? null;
-                $thumbnail = $this->physicalStructureInfo[$parentId]['files'][$fileGrpThumb] ?? null;
+                $parentId = $this->smLinks['l2p'][$id][0] ?? NULL;
+                $thumbnail = $this->physicalStructureInfo[$parentId]['files'][$fileGrpThumb] ?? NULL;
             }
 
             if (!empty($thumbnail)) {
@@ -645,7 +645,7 @@ 
             }
         }
         if (empty($theseSubentries)) {
-            return false;
+            return FALSE;
         }
         return $theseSubentries;
     }
@@ -716,13 +716,13 @@ 
     private function extractAndProcessMetadata(string $dmdId, string $mdSectionType, array &$metadata, int $cPid, array $metadataSections): bool
     {
         if ($this->hasMetadataSection($metadataSections, $mdSectionType, 'dmdSec')) {
-            return true;
+            return TRUE;
         }
 
         $metadataExtracted = $this->extractMetadataIfTypeSupported($dmdId, $mdSectionType, $metadata);
 
         if (!$metadataExtracted) {
-            return false;
+            return FALSE;
         }
 
         $additionalMetadata = $this->getAdditionalMetadataFromDatabase($cPid, $dmdId);
@@ -733,7 +733,7 @@ 
 
         $this->processAdditionalMetadata($additionalMetadata, $domXPath, $domNode, $metadata);
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -917,7 +917,7 @@ 
                     $obj = GeneralUtility::makeInstance($class);
                     if ($obj instanceof MetadataInterface) {
                         $obj->extractMetadata($this->mdSec[$dmdId]['xml'], $metadata, GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'general')['useExternalApisForMetadata']);
-                        return true;
+                        return TRUE;
                     }
                 } else {
                     $this->logger->warning('Invalid class/method "' . $class . '->extractMetadata()" for metadata format "' . $this->mdSec[$dmdId]['type'] . '"');
@@ -926,7 +926,7 @@ 
         } else {
             $this->logger->notice('Unsupported metadata format "' . $this->mdSec[$dmdId]['type'] . '" in ' . $mdSectionType . ' with @ID "' . $dmdId . '"');
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -1172,16 +1172,16 @@ 
     protected function loadLocation(string $location): bool
     {
         $fileResource = Helper::getUrl($location);
-        if ($fileResource !== false) {
+        if ($fileResource !== FALSE) {
             $xml = Helper::getXmlFileAsString($fileResource);
             // Set some basic properties.
-            if ($xml !== false) {
+            if ($xml !== FALSE) {
                 $this->xml = $xml;
-                return true;
+                return TRUE;
             }
         }
         $this->logger->error('Could not load XML file from "' . $location . '"');
-        return false;
+        return FALSE;
     }
 
     /**
@@ -1203,9 +1203,9 @@ 
 
         if ($preloadedDocument instanceof SimpleXMLElement) {
             $this->xml = $preloadedDocument;
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -1231,7 +1231,7 @@ 
             foreach ($this->mets->xpath('./mets:dmdSec') as $dmdSecTag) {
                 $dmdSec = $this->processMdSec($dmdSecTag);
 
-                if ($dmdSec !== null) {
+                if ($dmdSec !== NULL) {
                     $this->mdSec[$dmdSec['id']] = $dmdSec;
                     $this->dmdSec[$dmdSec['id']] = $dmdSec;
                 }
@@ -1248,7 +1248,7 @@ 
                     // TODO: Should we check that the format may occur within this type (e.g., to ignore VIDEOMD within rightsMD)?
                     $mdSec = $this->processMdSec($mdSecTag);
 
-                    if ($mdSec !== null) {
+                    if ($mdSec !== NULL) {
                         $this->mdSec[$mdSec['id']] = $mdSec;
 
                         $childIds[] = $mdSec['id'];
@@ -1261,7 +1261,7 @@ 
                 }
             }
 
-            $this->mdSecLoaded = true;
+            $this->mdSecLoaded = TRUE;
         }
         return $this->mdSec;
     }
@@ -1292,7 +1292,7 @@ 
     {
         $mdId = (string) $element->attributes()->ID;
         if (empty($mdId)) {
-            return null;
+            return NULL;
         }
 
         $this->registerNamespaces($element);
@@ -1310,7 +1310,7 @@ 
         }
 
         if (empty($xml)) {
-            return null;
+            return NULL;
         }
 
         $this->registerNamespaces($xml[0]);
@@ -1376,9 +1376,9 @@ 
                 !empty($extConf['fileGrpFulltext'])
                 && array_intersect(GeneralUtility::trimExplode(',', $extConf['fileGrpFulltext']), $this->fileGrps) !== []
             ) {
-                $this->hasFulltext = true;
+                $this->hasFulltext = TRUE;
             }
-            $this->fileGrpsLoaded = true;
+            $this->fileGrpsLoaded = TRUE;
         }
         return $this->fileGrps;
     }
@@ -1439,7 +1439,7 @@ 
 
                 $this->physicalStructure = $this->getPhysicalElements($elementNodes, $fileUse);
             }
-            $this->physicalStructureLoaded = true;
+            $this->physicalStructureLoaded = TRUE;
 
         }
 
@@ -1552,7 +1552,7 @@ 
                     $this->smLinks['p2l'][(string) $smLink->attributes('http://www.w3.org/1999/xlink')->to][] = (string) $smLink->attributes('http://www.w3.org/1999/xlink')->from;
                 }
             }
-            $this->smLinksLoaded = true;
+            $this->smLinksLoaded = TRUE;
         }
         return $this->smLinks;
     }
@@ -1560,7 +1560,7 @@ 
     /**
      * @see AbstractDocument::magicGetThumbnail()
      */
-    protected function magicGetThumbnail(bool $forceReload = false): string
+    protected function magicGetThumbnail(bool $forceReload = FALSE): string
     {
         if (
             !$this->thumbnailLoaded
@@ -1570,14 +1570,14 @@ 
             $cPid = $this->cPid ?: $this->pid;
             if (!$cPid) {
                 $this->logger->error('Invalid PID ' . $cPid . ' for structure definitions');
-                $this->thumbnailLoaded = true;
+                $this->thumbnailLoaded = TRUE;
                 return $this->thumbnail;
             }
             // Load extension configuration.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');
             if (empty($extConf['fileGrpThumbs'])) {
                 $this->logger->warning('No fileGrp for thumbnails specified');
-                $this->thumbnailLoaded = true;
+                $this->thumbnailLoaded = TRUE;
                 return $this->thumbnail;
             }
             $strctId = $this->magicGetToplevelId();
@@ -1631,7 +1631,7 @@ 
             } else {
                 $this->logger->error('No structure of type "' . $metadata['type'][0] . '" found in database');
             }
-            $this->thumbnailLoaded = true;
+            $this->thumbnailLoaded = TRUE;
         }
         return $this->thumbnail;
     }
@@ -1709,8 +1709,8 @@ 
     public function __toString(): string
     {
         $xml = new DOMDocument('1.0', 'utf-8');
-        $xml->appendChild($xml->importNode(dom_import_simplexml($this->mets), true));
-        $xml->formatOutput = true;
+        $xml->appendChild($xml->importNode(dom_import_simplexml($this->mets), TRUE));
+        $xml->formatOutput = TRUE;
         return $xml->saveXML();
     }
 
@@ -1725,7 +1725,7 @@ 
     public function __wakeup(): void
     {
         $xml = Helper::getXmlFileAsString($this->asXML);
-        if ($xml !== false) {
+        if ($xml !== FALSE) {
             $this->asXML = '';
             $this->xml = $xml;
             // Rebuild the unserializable properties.
@@ -1848,7 +1848,7 @@ 
                 }
 
             }
-            $this->musicalStructureLoaded = true;
+            $this->musicalStructureLoaded = TRUE;
         }
 
         return $this->musicalStructure;

Spacing +35 added lines, -35 removed lines

@@ -230,7 +230,7 @@ 
     {
         $file = $this->getFileInfo($id);
         if ($file['mimeType'] === 'application/vnd.kitodo.iiif') {
-            $file['location'] = (strrpos($file['location'], 'info.json') === strlen($file['location']) - 9) ? $file['location'] : (strrpos($file['location'], '/') === strlen($file['location']) ? $file['location'] . 'info.json' : $file['location'] . '/info.json');
+            $file['location'] = (strrpos($file['location'], 'info.json') === strlen($file['location']) - 9) ? $file['location'] : (strrpos($file['location'], '/') === strlen($file['location']) ? $file['location'].'info.json' : $file['location'].'/info.json');
             $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'iiif');
             IiifHelper::setUrlReader(IiifUrlReader::getInstance());
             IiifHelper::setMaxThumbnailHeight($conf['thumbnailHeight']);
@@ -240,9 +240,9 @@ 
                 return $service->getImageUrl();
             }
         } elseif ($file['mimeType'] === 'application/vnd.netfpx') {
-            $baseURL = $file['location'] . (strpos($file['location'], '?') === false ? '?' : '');
+            $baseURL = $file['location'].(strpos($file['location'], '?') === false ? '?' : '');
             // TODO CVT is an optional IIP server capability; in theory, capabilities should be determined in the object request with '&obj=IIP-server'
-            return $baseURL . '&CVT=jpeg';
+            return $baseURL.'&CVT=jpeg';
         }
         return $file['location'];
     }
@@ -271,14 +271,14 @@ 
      */
     public function getFileLocation(string $id): string
     {
-        $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/mets:FLocat[@LOCTYPE="URL"]');
+        $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]');
         if (
             !empty($id)
             && !empty($location)
         ) {
             return (string) $location[0]->attributes('http://www.w3.org/1999/xlink')->href;
         } else {
-            $this->logger->warning('There is no file node with @ID "' . $id . '"');
+            $this->logger->warning('There is no file node with @ID "'.$id.'"');
             return '';
         }
     }
@@ -290,9 +290,9 @@ 
     {
         $mets = $this->mets
             ->xpath(
-                './mets:structMap[@TYPE="PHYSICAL"]' .
-                '//mets:div[@ID="' .  $pageId .  '"]' .
-                '/mets:fptr[@FILEID="' .  $fileId .  '"]' .
+                './mets:structMap[@TYPE="PHYSICAL"]'.
+                '//mets:div[@ID="'.$pageId.'"]'.
+                '/mets:fptr[@FILEID="'.$fileId.'"]'.
                 '/mets:area/@BEGIN'
             );
         return empty($mets) ? '' : $mets[0]->__toString();
@@ -304,14 +304,14 @@ 
      */
     public function getFileMimeType(string $id): string
     {
-        $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/@MIMETYPE');
+        $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/@MIMETYPE');
         if (
             !empty($id)
             && !empty($mimetype)
         ) {
             return (string) $mimetype[0];
         } else {
-            $this->logger->warning('There is no file node with @ID "' . $id . '" or no MIME type specified');
+            $this->logger->warning('There is no file node with @ID "'.$id.'" or no MIME type specified');
             return '';
         }
     }
@@ -331,7 +331,7 @@ 
             return $this->logicalUnits[$id];
         } elseif (!empty($id)) {
             // Get specified logical unit.
-            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]');
+            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]');
         } else {
             // Get all logical units at top level.
             $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
@@ -546,7 +546,7 @@ 
         $cPid = max($cPid, 0);
         if ($cPid == 0 && ($this->cPid || $this->pid)) {
             // Retain current PID.
-            $cPid = $this->cPid ?: $this->pid;
+            $cPid = $this->cPid ? : $this->pid;
         }
         return $cPid;
     }
@@ -615,7 +615,7 @@ 
         if (isset($this->fileInfos[$id]) || in_array('dmdSec', $metadataSections)) {
             return $metadata;
         } else {
-            $this->logger->warning('No supported descriptive metadata found for logical structure with @ID "' . $id . '"');
+            $this->logger->warning('No supported descriptive metadata found for logical structure with @ID "'.$id.'"');
             return [];
         }
     }
@@ -694,7 +694,7 @@ 
         if (!empty($this->logicalUnits[$id])) {
             return [$this->logicalUnits[$id]['type']];
         } else {
-            $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]/@TYPE');
+            $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
             if (!empty($struct)) {
                 return [(string) $struct[0]];
             }
@@ -851,17 +851,17 @@ 
             if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])) {
                 $values = $domXPath->evaluate($resArray['xpath_sorting'], $domNode);
                 if ($values instanceof DOMNodeList && $values->length > 0) {
-                    $metadata[$indexName . '_sorting'][0] = trim((string) $values->item(0)->nodeValue);
+                    $metadata[$indexName.'_sorting'][0] = trim((string) $values->item(0)->nodeValue);
                 } elseif (!($values instanceof DOMNodeList)) {
-                    $metadata[$indexName . '_sorting'][0] = trim((string) $values);
+                    $metadata[$indexName.'_sorting'][0] = trim((string) $values);
                 }
             }
-            if (empty($metadata[$indexName . '_sorting'][0])) {
+            if (empty($metadata[$indexName.'_sorting'][0])) {
                 if (is_array($currentMetadata)) {
                     $sortingValue = implode(',', array_column($currentMetadata, 0));
-                    $metadata[$indexName . '_sorting'][0] = $sortingValue;
+                    $metadata[$indexName.'_sorting'][0] = $sortingValue;
                 } else {
-                    $metadata[$indexName . '_sorting'][0] = $currentMetadata;
+                    $metadata[$indexName.'_sorting'][0] = $currentMetadata;
                 }
             }
         }
@@ -922,11 +922,11 @@ 
                         return true;
                     }
                 } else {
-                    $this->logger->warning('Invalid class/method "' . $class . '->extractMetadata()" for metadata format "' . $this->mdSec[$dmdId]['type'] . '"');
+                    $this->logger->warning('Invalid class/method "'.$class.'->extractMetadata()" for metadata format "'.$this->mdSec[$dmdId]['type'].'"');
                 }
             }
         } else {
-            $this->logger->notice('Unsupported metadata format "' . $this->mdSec[$dmdId]['type'] . '" in ' . $mdSectionType . ' with @ID "' . $dmdId . '"');
+            $this->logger->notice('Unsupported metadata format "'.$this->mdSec[$dmdId]['type'].'" in '.$mdSectionType.' with @ID "'.$dmdId.'"');
         }
         return false;
     }
@@ -1079,7 +1079,7 @@ 
             $dmdIds = $this->logicalUnits[$id]['dmdId'] ?? '';
             $admIds = $this->logicalUnits[$id]['admId'] ?? '';
         } else {
-            $mdSec = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]')[0];
+            $mdSec = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]')[0];
             if ($mdSec) {
                 $dmdIds = (string) $mdSec->attributes()->DMDID;
                 $admIds = (string) $mdSec->attributes()->ADMID;
@@ -1109,7 +1109,7 @@ 
 
         return array_filter(
             $allMdIds,
-            function ($element) {
+            function($element) {
                 return !empty($element);
             }
         );
@@ -1135,7 +1135,7 @@ 
      */
     public function getStructureDepth(string $logId)
     {
-        $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
+        $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);
         } else {
@@ -1159,9 +1159,9 @@ 
             $this->registerNamespaces($this->mets);
         } else {
             if (!empty($location)) {
-                $this->logger->error('No METS part found in document with location "' . $location . '".');
+                $this->logger->error('No METS part found in document with location "'.$location.'".');
             } elseif (!empty($this->recordId)) {
-                $this->logger->error('No METS part found in document with recordId "' . $this->recordId . '".');
+                $this->logger->error('No METS part found in document with recordId "'.$this->recordId.'".');
             } else {
                 $this->logger->error('No METS part found in current document.');
             }
@@ -1182,7 +1182,7 @@ 
                 return true;
             }
         }
-        $this->logger->error('Could not load XML file from "' . $location . '"');
+        $this->logger->error('Could not load XML file from "'.$location.'"');
         return false;
     }
 
@@ -1305,10 +1305,10 @@ 
 
         if (!empty($mdType) && !empty($this->formats[(string) $mdType[0]])) {
             $type = (string) $mdType[0];
-            $xml = $element->xpath('./mets:mdWrap[@MDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
+            $xml = $element->xpath('./mets:mdWrap[@MDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
         } elseif (!empty($otherMdType) && !empty($this->formats[(string) $otherMdType[0]])) {
             $type = (string) $otherMdType[0];
-            $xml = $element->xpath('./mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
+            $xml = $element->xpath('./mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
         }
 
         if (empty($xml)) {
@@ -1513,7 +1513,7 @@ 
             // Get track info with begin and extent time for later assignment with musical
             if ((string) $elementNode['TYPE'] === 'track') {
                 foreach ($elementNode->children('http://www.loc.gov/METS/')->fptr as $fptr) {
-                    if (isset($fptr->area) &&  ((string) $fptr->area->attributes()->BETYPE === 'TIME')) {
+                    if (isset($fptr->area) && ((string) $fptr->area->attributes()->BETYPE === 'TIME')) {
                         // Check if file has valid @USE attribute.
                         if (!empty($fileUse[(string) $fptr->area->attributes()->FILEID])) {
                             $this->physicalStructureInfo[$elements[(int) $elementNode['ORDER']]]['tracks'][$fileUse[(string) $fptr->area->attributes()->FILEID]] = [
@@ -1567,9 +1567,9 @@ 
             || $forceReload
         ) {
             // Retain current PID.
-            $cPid = $this->cPid ?: $this->pid;
+            $cPid = $this->cPid ? : $this->pid;
             if (!$cPid) {
-                $this->logger->error('Invalid PID ' . $cPid . ' for structure definitions');
+                $this->logger->error('Invalid PID '.$cPid.' for structure definitions');
                 $this->thumbnailLoaded = true;
                 return $this->thumbnail;
             }
@@ -1606,7 +1606,7 @@ 
                 if (!empty($resArray['thumbnail'])) {
                     $strctType = Helper::getIndexNameFromUid($resArray['thumbnail'], 'tx_dlf_structures', $cPid);
                     // Check if this document has a structure element of the desired type.
-                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="' . $strctType . '"]/@ID');
+                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="'.$strctType.'"]/@ID');
                     if (!empty($strctIds)) {
                         $strctId = (string) $strctIds[0];
                     }
@@ -1629,7 +1629,7 @@ 
                     }
                 }
             } else {
-                $this->logger->error('No structure of type "' . $metadata['type'][0] . '" found in database');
+                $this->logger->error('No structure of type "'.$metadata['type'][0].'" found in database');
             }
             $this->thumbnailLoaded = true;
         }
@@ -1675,7 +1675,7 @@ 
     {
         if (empty($this->parentHref)) {
             // Get the closest ancestor of the current document which has a MPTR child.
-            $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $this->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
+            $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$this->toplevelId.'"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
             if (!empty($parentMptr)) {
                 $this->parentHref = (string) $parentMptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
             }

Classes/Common/DocumentAnnotation.php

Indentation +3 added lines, -3 removed lines

@@ -130,11 +130,11 @@
                             );
                         }
                     } elseif ($annotationTarget->getObjectId()) {
-                         $objectTargetPages = [];
+                            $objectTargetPages = [];
                         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physInfo) {
-                             $order = $physInfo['order'];
+                                $order = $physInfo['order'];
                             if ($order) {
-                                 $objectTargetPages[] = $order;
+                                    $objectTargetPages[] = $order;
                             }
                         }
                         if ($objectTargetPages) {

Spacing +11 added lines, -11 removed lines

@@ -108,8 +108,8 @@ 
                                     ];
                                 } else {
                                     $this->logger->warning(
-                                        ' No target pages found! Annotation: "' . $annotation->getId() . '", '
-                                        . 'Target: "' . $annotationTarget->getUrl() . '"'
+                                        ' No target pages found! Annotation: "'.$annotation->getId().'", '
+                                        . 'Target: "'.$annotationTarget->getUrl().'"'
                                     );
                                 }
                             }
@@ -125,8 +125,8 @@ 
                             ];
                         } else {
                             $this->logger->warning(
-                                ' No target pages found! Annotation: "' . $annotation->getId() . '", '
-                                . 'Target: "' . $annotationTarget->getUrl() . '"'
+                                ' No target pages found! Annotation: "'.$annotation->getId().'", '
+                                . 'Target: "'.$annotationTarget->getUrl().'"'
                             );
                         }
                     } elseif ($annotationTarget->getObjectId()) {
@@ -145,14 +145,14 @@ 
                         }
                     } else {
                         $this->logger->warning(
-                            ' No target pages found! Annotation: "' . $annotation->getId() . '", '
-                            . 'Target: "' . $annotationTarget->getUrl() . '"'
+                            ' No target pages found! Annotation: "'.$annotation->getId().'", '
+                            . 'Target: "'.$annotationTarget->getUrl().'"'
                         );
                     }
                 } else {
                     $this->logger->warning(
-                        'Invalid target! Annotation: "' . $annotation->getId() . '", '
-                        . 'Target: "' . $annotationTarget->getUrl() . '"'
+                        'Invalid target! Annotation: "'.$annotation->getId().'", '
+                        . 'Target: "'.$annotationTarget->getUrl().'"'
                     );
                 }
             }
@@ -267,10 +267,10 @@ 
                 $intervalTo = \DateTime::createFromFormat('U.u', $to);
             }
             foreach ($tracks as $index => $track) {
-                $begin = new DateTime("1970-01-01 " . $track['begin']);
-                $extent = new DateTime("1970-01-01 " . $track['extent']);
+                $begin = new DateTime("1970-01-01 ".$track['begin']);
+                $extent = new DateTime("1970-01-01 ".$track['extent']);
                 $diff = (new DateTime("1970-01-01 00:00:00"))->diff($extent);
-                $end = (new DateTime("1970-01-01 " . $track['begin']))->add($diff);
+                $end = (new DateTime("1970-01-01 ".$track['begin']))->add($diff);
                 if (
                     !(
                         $intervalFrom < $end && (

Braces +11 added lines, -22 removed lines

@@ -28,8 +28,7 @@ 
  *
  * @access public
  */
-class DocumentAnnotation
-{
+class DocumentAnnotation {
     /**
      * @var null|DocumentAnnotation
      */
@@ -55,8 +54,7 @@ 
      * @param array $annotationData
      * @param Document $document
      */
-    private function __construct($annotationData, $document)
-    {
+    private function __construct($annotationData, $document) {
         $this->annotationData = $annotationData;
         $this->document = $document;
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
@@ -67,8 +65,7 @@ 
      *
      * @return Annotation[]|array
      */
-    public function getAnnotations()
-    {
+    public function getAnnotations() {
         if (empty($this->annotationData)) {
             return [];
         }
@@ -168,8 +165,7 @@ 
      * @param string $logicalId
      * @return array
      */
-    protected function getPagesByLogicalId($logicalId)
-    {
+    protected function getPagesByLogicalId($logicalId) {
         $pages = [];
         if (
             array_key_exists('l2p', $this->document->getCurrentDocument()->smLinks) &&
@@ -193,8 +189,7 @@ 
      * @param string $physicalId
      * @return array
      */
-    protected function getPagesByPhysicalId($physicalId)
-    {
+    protected function getPagesByPhysicalId($physicalId) {
         $pages = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             $order = $physicalInfo['order'];
@@ -217,8 +212,7 @@ 
      * @param string $fileId
      * @return array
      */
-    protected function getPagesByFileId($fileId)
-    {
+    protected function getPagesByFileId($fileId) {
         $pages = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             if (
@@ -243,8 +237,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getAudioPagesByFileId($fileId, $range = null)
-    {
+    protected function getAudioPagesByFileId($fileId, $range = null) {
         $tracks = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             if (array_key_exists('tracks', $physicalInfo) && is_array($physicalInfo['tracks'])) {
@@ -299,8 +292,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getMeasurePagesByFileId($fileId, $range = null)
-    {
+    protected function getMeasurePagesByFileId($fileId, $range = null) {
         // Get all measures referencing the fileid
         $measures = [];
         // Get the related page numbers
@@ -355,8 +347,7 @@ 
      *
      * @return array
      */
-    public function getVerovioRelevantAnnotations()
-    {
+    public function getVerovioRelevantAnnotations() {
         $annotations = [];
         /** @var Annotation $annotation */
         foreach ($this->getAnnotations() as $annotation) {
@@ -373,8 +364,7 @@ 
      * @param Document $document
      * @return array
      */
-    protected static function loadData($document)
-    {
+    protected static function loadData($document) {
         $annotationData = [];
         $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
         $apiBaseUrl = $conf['annotationServerUrl'];
@@ -393,8 +383,7 @@ 
      * @return DocumentAnnotation|null
      *
      */
-    public static function getInstance($document)
-    {
+    public static function getInstance($document) {
         if (self::$instance == null) {
             $annotationData = self::loadData($document);
             self::$instance = new DocumentAnnotation($annotationData, $document);

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

@@ -90,7 +90,7 @@ 
                                     $targetPages[] = [
                                         'target' => $annotationTarget,
                                         'pages' => $meiTargetPages,
-                                        'verovioRelevant' => true
+                                        'verovioRelevant' => TRUE
                                     ];
                                 } elseif (
                                     $audioTargetPages = $this->getAudioPagesByFileId(
@@ -243,7 +243,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getAudioPagesByFileId($fileId, $range = null)
+    protected function getAudioPagesByFileId($fileId, $range = NULL)
     {
         $tracks = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
@@ -261,7 +261,7 @@ 
             $from = sprintf('%02.6f', (empty($from) ? "0" : $from));
             $intervalFrom = \DateTime::createFromFormat('U.u', $from);
             if (empty($to)) {
-                $intervalTo = null;
+                $intervalTo = NULL;
             } else {
                 $to = sprintf('%02.6f', $to);
                 $intervalTo = \DateTime::createFromFormat('U.u', $to);
@@ -274,7 +274,7 @@ 
                 if (
                     !(
                         $intervalFrom < $end && (
-                            $intervalTo === null || $intervalTo > $begin
+                            $intervalTo === NULL || $intervalTo > $begin
                         )
                     )
                 ) {
@@ -285,7 +285,7 @@ 
         // Get the related page numbers
         $trackPages = [];
         foreach ($tracks as $track) {
-            if ($track['order'] !== null) {
+            if ($track['order'] !== NULL) {
                 $trackPages[] = $track['order'];
             }
         }
@@ -299,7 +299,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getMeasurePagesByFileId($fileId, $range = null)
+    protected function getMeasurePagesByFileId($fileId, $range = NULL)
     {
         // Get all measures referencing the fileid
         $measures = [];
@@ -395,7 +395,7 @@ 
      */
     public static function getInstance($document)
     {
-        if (self::$instance == null) {
+        if (self::$instance == NULL) {
             $annotationData = self::loadData($document);
             self::$instance = new DocumentAnnotation($annotationData, $document);
         }