Erikmitk / kitodo-presentation

Tests/Unit/Validation/DOMDocumentValidationStackTest.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
  *
  * @access public
  */
-class DOMDocumentValidationStackTest extends UnitTestCase
-{
+class DOMDocumentValidationStackTest extends UnitTestCase {
     public function setUp(): void
     {
         parent::setUp();

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

@@ -34,7 +34,7 @@
     public function setUp(): void
     {
         parent::setUp();
-        $this->resetSingletonInstances = true;
+        $this->resetSingletonInstances = TRUE;
     }
 
     public function testValueTypeException(): void

Tests/Unit/Validation/XmlSchemesValidatorTest.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
  *
  * @access public
  */
-class XmlSchemesValidatorTest extends UnitTestCase
-{
+class XmlSchemesValidatorTest extends UnitTestCase {
     const METS = <<<METS
         <mets:mets
             xmlns:mets="http://www.loc.gov/METS/"

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

@@ -70,7 +70,7 @@
     public function setUp(): void
     {
         parent::setUp();
-        $this->resetSingletonInstances = true;
+        $this->resetSingletonInstances = TRUE;
     }
 
     public function testValidation(): void

Classes/Controller/AbstractController.php

Spacing +10 added lines, -10 removed lines

@@ -164,11 +164,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 
@@ -265,7 +265,7 @@ 
             && !MathUtility::canBeInterpretedAsInteger($this->requestData['id'])
             && !GeneralUtility::isValidUrl($this->requestData['id'])
         ) {
-            $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading');
+            $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading');
             unset($this->requestData['id']);
         }
 
@@ -325,7 +325,7 @@ 
     {
         if (!array_key_exists($setting, $this->settings) || empty($this->settings[$setting])) {
             $this->settings[$setting] = $value;
-            $this->logger->warning('Setting "' . $setting . '" not set, using default value "' . $value . '". Probably FlexForm for controller "' . get_class($this) . '" is not read.');
+            $this->logger->warning('Setting "'.$setting.'" not set, using default value "'.$value.'". Probably FlexForm for controller "'.get_class($this).'" is not read.');
         } else {
             $this->settings[$setting] = (int) $this->settings[$setting];
         }
@@ -410,7 +410,7 @@ 
         $pages = [];
         $pagesSect = [];
         $aRange = [];
-        $nRange = 5;    // ToDo: should be made configurable
+        $nRange = 5; // ToDo: should be made configurable
 
         // lower limit of the range
         $nBottom = $currentPageNumber - $nRange;
@@ -425,7 +425,7 @@ 
 
         // check whether the first screen page is > 1, if yes then points must be added
         if ($aRange[0] > 1) {
-            array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']);
+            array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']);
         };
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
@@ -468,7 +468,7 @@ 
 
                 // Check if screen page is in range
                 if (in_array($i, $aRange)) {
-                    array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]);
+                    array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]);
                 };
             };
         };
@@ -534,7 +534,7 @@ 
             // fix for count(): Argument #1 ($value) must be of type Countable|array, null given
             $this->documentArray[] = $doc;
         } else {
-            $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
 
         return $doc;
@@ -572,7 +572,7 @@ 
             foreach ($this->requestData['multipleSource'] as $location) {
                 $document = AbstractDocument::getInstance($location, $this->settings, true);
                 if ($document !== null) {
-                    $this->documentArray['extra_' . $i] = $document;
+                    $this->documentArray['extra_'.$i] = $document;
                 }
                 $i++;
             }
@@ -596,7 +596,7 @@ 
 
             $this->document->setLocation($documentId);
         } else {
-            $this->logger->error('Invalid location given "' . $documentId . '" for document loading');
+            $this->logger->error('Invalid location given "'.$documentId.'" for document loading');
         }
 
         return $doc;

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

@@ -62,7 +62,7 @@ 
      * @access protected
      * @var Document|null This holds the current document
      */
-    protected ?Document $document = null;
+    protected ?Document $document = NULL;
 
     /**
      * @access protected
@@ -143,7 +143,7 @@ 
         // Try to get document format from database
         if (!empty($documentId)) {
 
-            $doc = null;
+            $doc = NULL;
 
             if (MathUtility::canBeInterpretedAsInteger($documentId)) {
                 $doc = $this->getDocumentByUid($documentId);
@@ -151,7 +151,7 @@ 
                 $doc = $this->getDocumentByUrl($documentId);
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setCurrentDocument($doc);
             }
 
@@ -159,9 +159,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($this->requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
-                if ($doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
+                if ($doc !== NULL) {
                     $this->document->setCurrentDocument($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
@@ -218,7 +218,7 @@ 
      */
     protected function isDocMissing(): bool
     {
-        return $this->document === null || $this->document->getCurrentDocument() === null;
+        return $this->document === NULL || $this->document->getCurrentDocument() === NULL;
     }
 
     /**
@@ -247,7 +247,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -368,7 +368,7 @@ 
             if (isset($this->settings['multiViewType']) && $this->document->getCurrentDocument()->tableOfContents[0]['type'] === $this->settings['multiViewType']) {
                 $i = 0;
                 foreach ($this->documentArray as $document) {
-                    if ($document !== null) {
+                    if ($document !== NULL) {
                         $this->requestData['docPage'][$i] = MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i], 1, $document->numPages, 1);
                         $i++;
                     }
@@ -479,8 +479,8 @@ 
         };
 
         // Safely get the next and previous page numbers
-        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : null;
-        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : null;
+        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : NULL;
+        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : NULL;
 
         // 'startRecordNumber' is not required in GridView, only the variant for each loop is required
         // 'endRecordNumber' is not required in both views
@@ -526,11 +526,11 @@ 
     private function getDocumentByUid(int $documentId)
     {
         // TODO: implement multiView as it is in getDocumentByUrl
-        $doc = null;
+        $doc = NULL;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
         if ($this->document) {
-            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
+            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
             // fix for count(): Argument #1 ($value) must be of type Countable|array, null given
             $this->documentArray[] = $doc;
         } else {
@@ -551,13 +551,13 @@ 
      */
     protected function getDocumentByUrl(string $documentId)
     {
-        $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
+        $doc = AbstractDocument::getInstance($documentId, $this->settings, TRUE);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {
             $childDocuments = $doc->tableOfContents[0]['children'];
             $i = 0;
             foreach ($childDocuments as $document) {
-                $this->documentArray[] = AbstractDocument::getInstance($document['points'], $this->settings, true);
+                $this->documentArray[] = AbstractDocument::getInstance($document['points'], $this->settings, TRUE);
                 if (!isset($this->requestData['docPage'][$i]) && isset(explode('#', $document['points'])[1])) {
                     $initPage = explode('#', $document['points'])[1];
                     $this->requestData['docPage'][$i] = $initPage;
@@ -570,21 +570,21 @@ 
         if ($this->requestData['multipleSource'] && is_array($this->requestData['multipleSource'])) {
             $i = 0;
             foreach ($this->requestData['multipleSource'] as $location) {
-                $document = AbstractDocument::getInstance($location, $this->settings, true);
-                if ($document !== null) {
+                $document = AbstractDocument::getInstance($location, $this->settings, TRUE);
+                if ($document !== NULL) {
                     $this->documentArray['extra_' . $i] = $document;
                 }
                 $i++;
             }
         }
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             $this->document = GeneralUtility::makeInstance(Document::class);
 
             if ($doc->recordId) {
                 // find document from repository by recordId
                 $docFromRepository = $this->documentRepository->findOneByRecordId($doc->recordId);
-                if ($docFromRepository !== null) {
+                if ($docFromRepository !== NULL) {
                     $this->document = $docFromRepository;
                 }
             }

Braces +8 added lines, -10 removed lines

@@ -39,8 +39,7 @@ 
  *
  * @abstract
  */
-abstract class AbstractController extends ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -248,8 +247,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely(string $parameterName)
-    {
+    protected function getParametersSafely(string $parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -444,7 +442,8 @@ 
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
             // detect which pagination is active: ListView or GridView
-            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {  // ListView
+            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {
+// ListView
                 $lastStartRecordNumberGrid = $i; // save last $startRecordNumber for LastPage button
 
                 $pages[$i] = [
@@ -457,7 +456,8 @@ 
                 if (in_array($i, $aRange)) {
                     array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $i]);
                 };
-            } else { // GridView
+            } else {
+// GridView
                 // to calculate the values for generation the links for the pagination pages
                 /** @var \Kitodo\Dlf\Pagination\PageGridPaginator $paginator */
                 $itemsPerPage = $paginator->getPublicItemsPerPage();
@@ -537,8 +537,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUid(int $documentId)
-    {
+    private function getDocumentByUid(int $documentId) {
         // TODO: implement multiView as it is in getDocumentByUrl
         $doc = null;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
@@ -563,8 +562,7 @@ 
      *
      * @return AbstractDocument
      */
-    protected function getDocumentByUrl(string $documentId)
-    {
+    protected function getDocumentByUrl(string $documentId) {
         $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {

Classes/Validation/AbstractDlfValidator.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     public function validate($value): Result
     {
         if (!$value instanceof $this->valueClassName) {
-            $this->logger->debug('Value must be an instance of ' . $this->valueClassName . '.');
+            $this->logger->debug('Value must be an instance of '.$this->valueClassName.'.');
             throw new InvalidArgumentException('Type of value is not valid.', 1723126505626);
         }
         return parent::validate($value);

Braces +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
  *
  * @access public
  */
-abstract class AbstractDlfValidator extends AbstractValidator
-{
+abstract class AbstractDlfValidator extends AbstractValidator {
     use LoggerAwareTrait;
 
     protected string $valueClassName;
@@ -38,8 +37,7 @@ 
     /**
      * @param $valueClassName string The class name of the value
      */
-    public function __construct(string $valueClassName)
-    {
+    public function __construct(string $valueClassName) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->valueClassName = $valueClassName;
     }

Classes/Controller/AnnotationController.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  * @subpackage dlf
  * @access public
  */
-class AnnotationController extends AbstractController
-{
+class AnnotationController extends AbstractController {
     /**
      * The main method of the plugin
      *

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

@@ -34,8 +34,8 @@
         $this->loadDocument();
 
         if (
-            $this->document === null
-            || $this->document->getCurrentDocument() === null
+            $this->document === NULL
+            || $this->document->getCurrentDocument() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
         } else {

Classes/Controller/PageViewController.php

Braces +3 added lines, -6 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * @access protected
      * @var array Holds the controls to add to the map
@@ -258,8 +257,7 @@ 
      * @param $page
      * @return false|int|mixed|string|null
      */
-    public function convertMeasureOrPage($document, $measure = null, $page = null)
-    {
+    public function convertMeasureOrPage($document, $measure = null, $page = null) {
         $return = null;
         $measure2Page = array_column($document->musicalStructure, 'page');
         if ($measure) {
@@ -370,8 +368,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getScore(int $page, MetsDocument $specificDoc = null)
-    {
+    protected function getScore(int $page, MetsDocument $specificDoc = null) {
         $score = [];
         $loc = '';
         if ($specificDoc) {

Spacing +19 added lines, -19 removed lines

@@ -184,18 +184,18 @@ 
             }
 
             $navigationArray[$i]['next'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
             ];
             $navigationArray[$i]['prev'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
             ];
 
             $navigateAllPageNext = array_merge(
                 $navigateAllPageNext,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
                 ]
             );
@@ -203,7 +203,7 @@ 
             $navigateAllPagePrev = array_merge(
                 $navigateAllPagePrev,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
                 ]
             );
@@ -211,7 +211,7 @@ 
             $navigateAllMeasureNext = array_merge(
                 $navigateAllMeasureNext,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ]
             );
@@ -219,19 +219,19 @@ 
             $navigateAllMeasurePrev = array_merge(
                 $navigateAllMeasurePrev,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ]
             );
 
             if ($document->numMeasures > 0) {
                 $navigationMeasureArray[$i]['next'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ];
 
                 $navigationMeasureArray[$i]['prev'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ];
             }
@@ -285,7 +285,7 @@ 
             }
             $params = array_merge(
                 ['tx_dlf' => $this->requestData],
-                ['tx_dlf[multipleSource][' . $nextMultipleSourceKey . ']' => $formAddDocument->getLocation()],
+                ['tx_dlf[multipleSource]['.$nextMultipleSourceKey.']' => $formAddDocument->getLocation()],
                 ['tx_dlf[multiview]' => 1]
             );
             $uriBuilder = $this->uriBuilder;
@@ -333,7 +333,7 @@ 
                             // build link for each measure
                             $params = [
                                 'tx_dlf' => $this->requestData,
-                                'tx_dlf[docMeasure][' . $docNumber . ']' => $i
+                                'tx_dlf[docMeasure]['.$docNumber.']' => $i
                             ];
                         } else {
                             // build link for each measure
@@ -417,7 +417,7 @@ 
         }
 
         if (empty($score)) {
-            $this->logger->notice('No score file found for page "' . $page . '" in fileGrps "' . ($this->settings['fileGrpScore'] ?? '') . '"');
+            $this->logger->notice('No score file found for page "'.$page.'" in fileGrps "'.($this->settings['fileGrpScore'] ?? '').'"');
         }
         return $score;
     }
@@ -448,11 +448,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['files']['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -512,7 +512,7 @@ 
                         'measureIdLinks' => $docMeasures['measureLinks']
                     ];
 
-                    $jsViewer .= 'tx_dlf_viewer[' . $i . '] = new dlfViewer(' . json_encode($viewer) . ');
+                    $jsViewer .= 'tx_dlf_viewer['.$i.'] = new dlfViewer('.json_encode($viewer).');
                             ';
                     $i++;
                 }
@@ -521,8 +521,8 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        ' . $jsViewer . '
-                        viewerCount = ' . ($i - 1) . ';
+                        ' . $jsViewer.'
+                        viewerCount = ' . ($i - 1).';
                     }
                 });';
         } else {
@@ -552,7 +552,7 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer) . ');
+                        tx_dlf_viewer = new dlfViewer(' . json_encode($viewer).');
                     }
                 });';
         }
@@ -645,12 +645,12 @@ 
                 }
                 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['files']['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
         }
 
         return $image;

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

@@ -144,11 +144,11 @@ 
 
         $this->view->assign('docCount', is_array($this->documentArray) ? count($this->documentArray) : 0);
         $this->view->assign('docArray', $this->documentArray);
-        $this->view->assign('docPage', $this->requestData['docPage'] ?? null);
+        $this->view->assign('docPage', $this->requestData['docPage'] ?? NULL);
         $this->view->assign('docType', $this->document->getCurrentDocument()->tableOfContents[0]['type']);
 
-        $this->view->assign('multiview', $this->requestData['multiview'] ?? null);
-        if ($this->requestData['multiview'] ?? false) {
+        $this->view->assign('multiview', $this->requestData['multiview'] ?? NULL);
+        if ($this->requestData['multiview'] ?? FALSE) {
             $this->multipageNavigation();
         }
 
@@ -177,7 +177,7 @@ 
             // convert either page or measure if requestData exists
             if ($this->requestData['docPage'][$i] && empty($this->requestData['docMeasure'][$i])) {
                 // convert document page information to measure count information
-                $this->requestData['docMeasure'][$i] = $this->convertMeasureOrPage($document, null, $this->requestData['docPage'][$i]);
+                $this->requestData['docMeasure'][$i] = $this->convertMeasureOrPage($document, NULL, $this->requestData['docPage'][$i]);
 
             } elseif ((empty($this->requestData['docPage'][$i]) || $this->requestData['docPage'][$i] === 1) && $this->requestData['docMeasure'][$i]) {
                 $this->requestData['docPage'][$i] = $this->convertMeasureOrPage($document, $this->requestData['docMeasure'][$i]);
@@ -259,9 +259,9 @@ 
      * @param $page
      * @return false|int|mixed|string|null
      */
-    public function convertMeasureOrPage($document, $measure = null, $page = null)
+    public function convertMeasureOrPage($document, $measure = NULL, $page = NULL)
     {
-        $return = null;
+        $return = NULL;
         $measure2Page = array_column($document->musicalStructure, 'page');
         if ($measure) {
             $return = $measure2Page[$measure];
@@ -307,7 +307,7 @@ 
      * @param int|null $docNumber
      * @return array
      */
-    protected function getMeasures(int $page, MetsDocument $specificDoc = null, $docNumber = null): array
+    protected function getMeasures(int $page, MetsDocument $specificDoc = NULL, $docNumber = NULL): array
     {
         if ($specificDoc) {
             $doc = $specificDoc;
@@ -371,7 +371,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getScore(int $page, MetsDocument $specificDoc = null)
+    protected function getScore(int $page, MetsDocument $specificDoc = NULL)
     {
         $score = [];
         $loc = '';
@@ -401,7 +401,7 @@ 
                     // Configure @action URL for form.
                     $uri = $this->uriBuilder->reset()
                         ->setTargetPageUid($this->pageUid)
-                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? true : false)
+                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? TRUE : FALSE)
                         ->setArguments(
                             [
                                 'eID' => 'tx_dlf_pageview_proxy',
@@ -470,7 +470,7 @@ 
             $jsViewer = 'tx_dlf_viewer = [];';
             $i = 0;
             foreach ($this->documentArray as $document) {
-                if ($document !== null) {
+                if ($document !== NULL) {
                     $docPage = $this->requestData['docPage'][$i];
                     $docImage = [];
                     $docFulltext = [];
@@ -484,7 +484,7 @@ 
                             $docPage = $measure2Page[$this->requestData['docMeasure'][$i]];
                         }
                     }
-                    if ($docPage == null) {
+                    if ($docPage == NULL) {
                         $docPage = 1;
                     }
                     $docImage[0] = $this->getImage($docPage, $document);
@@ -530,7 +530,7 @@ 
             $docPage = $this->requestData['page'];
 
             $docMeasures = $this->getMeasures($docPage);
-            if ($this->requestData['measure'] ?? false) {
+            if ($this->requestData['measure'] ?? FALSE) {
                 $currentMeasureId = $docMeasures['measureCounterToMeasureId'][$this->requestData['measure']];
             }
 
@@ -575,7 +575,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
@@ -585,11 +585,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();
@@ -625,7 +625,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage(int $page, MetsDocument $specificDoc = null): array
+    protected function getImage(int $page, MetsDocument $specificDoc = NULL): array
     {
         $image = [];
         // Get @USE value of METS fileGrp.
@@ -675,7 +675,7 @@ 
         }
 
         // Get the files for the specified file group
-        $files = $physicalStructureInfo['files'] ?? null;
+        $files = $physicalStructureInfo['files'] ?? NULL;
         if ($files && !empty($files[$fileGrpImages])) {
             // Get the file info for the specified file group
             if ($specificDoc) {
@@ -685,6 +685,6 @@ 
             }
         }
 
-        return null;
+        return NULL;
     }
 }

Classes/Common/Solr/SolrSearchQuery.php

Braces +3 added lines, -6 removed lines

@@ -16,8 +16,7 @@ 
  * @property int $limit
  * @property int $offset
  */
-class SolrSearchQuery extends Query
-{
+class SolrSearchQuery extends Query {
     /**
      * @access private
      * @var SolrSearch
@@ -33,8 +32,7 @@ 
      *
      * @return void
      */
-    public function __construct($solrSearch)
-    {
+    public function __construct($solrSearch) {
         $this->solrSearch = $solrSearch;
 
         $this->offset = 0;
@@ -52,8 +50,7 @@ 
      */
     // TODO: Return type (array) of method SolrSearchQuery::execute() should be compatible with return type (iterable<object>&TYPO3\CMS\Extbase\Persistence\QueryResultInterface) of method TYPO3\CMS\Extbase\Persistence\QueryInterface::execute()
     // @phpstan-ignore-next-line
-    public function execute($returnRawQueryResult = false)
-    {
+    public function execute($returnRawQueryResult = false) {
         $this->solrSearch->submit($this->offset, $this->limit);
 
         // solrSearch now only contains the results in range, indexed in [0, n)

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

@@ -52,7 +52,7 @@
      */
     // TODO: Return type (array) of method SolrSearchQuery::execute() should be compatible with return type (iterable<object>&TYPO3\CMS\Extbase\Persistence\QueryResultInterface) of method TYPO3\CMS\Extbase\Persistence\QueryInterface::execute()
     // @phpstan-ignore-next-line
-    public function execute($returnRawQueryResult = false)
+    public function execute($returnRawQueryResult = FALSE)
     {
         $this->solrSearch->submit($this->offset, $this->limit);
 

Configuration/Backend/Modules.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         'navigationComponentId' => '@typo3/backend/page-tree/page-tree-element',
         'controllerActions'     => [
             \Kitodo\Dlf\Controller\Backend\NewTenantController::class => [
-                'index','error','addFormat','addMetadata','addSolrCore','addStructure'
+                'index', 'error', 'addFormat', 'addMetadata', 'addSolrCore', 'addStructure'
             ],
         ],
     ],

Tests/Functional/FunctionalTestCase.php

Spacing +7 added lines, -7 removed lines

@@ -96,7 +96,7 @@ 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
 
         if ($this->disableJsonWrappedResponse) {
-            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function ($ext) {
+            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function($ext) {
                 return $ext !== 'Resources/Core/Functional/Extensions/json_response';
             });
         }
@@ -108,9 +108,9 @@ 
 
         $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
 
-        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
+        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-'.$this->identifier.'/';
         $this->httpClient = new HttpClient([
-            'base_uri' => $this->baseUrl . 'index.php',
+            'base_uri' => $this->baseUrl.'index.php',
             'http_errors' => false,
         ]);
 
@@ -169,13 +169,13 @@ 
 
     protected function addSiteConfig($identifier)
     {
-        $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
+        $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $this->baseUrl;
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
 
-        $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
+        $siteConfigPath = $this->instancePath.'/typo3conf/sites/'.$identifier;
         @mkdir($siteConfigPath, 0775, true);
-        file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
+        file_put_contents($siteConfigPath.'/config.yaml', Yaml::dump($siteConfig));
 
         // refresh site cache (otherwise site config is not found)
         $finder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Site\SiteFinder::class);
@@ -197,7 +197,7 @@ 
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
-        $documents = array_map(function ($jsonDoc) use ($updateQuery) {
+        $documents = array_map(function($jsonDoc) use ($updateQuery) {
             $document = $updateQuery->createDocument();
             foreach ($jsonDoc as $key => $value) {
                 $document->setField($key, $value);

Braces +7 added lines, -14 removed lines

@@ -89,8 +89,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -117,8 +116,7 @@ 
         $this->addSiteConfig('dlf-testing');
     }
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         $dotenv = Dotenv::createImmutable('/home/runner/work/kitodo-presentation/kitodo-presentation/Build/Test/', 'test.env');
         $dotenv->load();
 
@@ -167,8 +165,7 @@ 
         ];
     }
 
-    protected function addSiteConfig($identifier)
-    {
+    protected function addSiteConfig($identifier) {
         $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $this->baseUrl;
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
@@ -182,8 +179,7 @@ 
         $finder->getAllSites(false); // useCache = false
     }
 
-    protected function initializeRepository(string $className, int $storagePid)
-    {
+    protected function initializeRepository(string $className, int $storagePid) {
         $repository = GeneralUtility::makeInstance($className);
         $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
         $querySettings->setStoragePageIds([$storagePid]);
@@ -192,8 +188,7 @@ 
         return $repository;
     }
 
-    protected function importSolrDocuments(Solr $solr, string $path)
-    {
+    protected function importSolrDocuments(Solr $solr, string $path) {
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
@@ -212,8 +207,7 @@ 
         $solr->service->update($updateQuery);
     }
 
-    protected function initLanguageService(string $locale)
-    {
+    protected function initLanguageService(string $locale) {
         // create mock backend user and set language
         // which is loaded by LanguageServiceFactory as default value in backend mode
         $backendUser = GeneralUtility::makeInstance(BackendUserAuthentication::class);
@@ -224,8 +218,7 @@ 
     /**
      * Assert that $sub is recursively contained within $super.
      */
-    protected function assertArrayMatches(array $sub, array $super, string $message = '')
-    {
+    protected function assertArrayMatches(array $sub, array $super, string $message = '') {
         self::assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message);
     }
 }

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

@@ -52,7 +52,7 @@ 
         ],
         'FE' => [
             'cacheHash' => [
-                'enforceValidation' => false,
+                'enforceValidation' => FALSE,
             ],
         ],
         'DB' => [
@@ -72,7 +72,7 @@ 
      *
      * @var bool
      */
-    protected $disableJsonWrappedResponse = false;
+    protected $disableJsonWrappedResponse = FALSE;
 
     /**
      * @var PersistenceManager
@@ -111,7 +111,7 @@ 
         $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
         $this->httpClient = new HttpClient([
             'base_uri' => $this->baseUrl . 'index.php',
-            'http_errors' => false,
+            'http_errors' => FALSE,
         ]);
 
         $this->addSiteConfig('dlf-testing');
@@ -174,12 +174,12 @@ 
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
 
         $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
-        @mkdir($siteConfigPath, 0775, true);
+        @mkdir($siteConfigPath, 0775, TRUE);
         file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
 
         // refresh site cache (otherwise site config is not found)
         $finder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Site\SiteFinder::class);
-        $finder->getAllSites(false); // useCache = false
+        $finder->getAllSites(FALSE); // useCache = false
     }
 
     protected function initializeRepository(string $className, int $storagePid)
@@ -194,7 +194,7 @@ 
 
     protected function importSolrDocuments(Solr $solr, string $path)
     {
-        $jsonDocuments = json_decode(file_get_contents($path), true);
+        $jsonDocuments = json_decode(file_get_contents($path), TRUE);
 
         $updateQuery = $solr->service->createUpdate();
         $documents = array_map(function ($jsonDoc) use ($updateQuery) {