Erikmitk / kitodo-presentation

Classes/Validation/SaxonXslToSvrlValidator.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
     protected function process(mixed $value): string
     {
         // using source from standard input
-        $process = new Process(['java', '-jar', $this->jar, '-xsl:' . $this->xsl, '-s:-'], null, null, $value->saveXML());
+        $process = new Process(['java', '-jar', $this->jar, '-xsl:'.$this->xsl, '-s:-'], null, null, $value->saveXML());
         $process->run();
         // executes after the command finish
         if (!$process->isSuccessful()) {
-            $this->logger->error('Processing exits with code "' . $process->getExitCode() . '"');
+            $this->logger->error('Processing exits with code "'.$process->getExitCode().'"');
             throw new InvalidArgumentException('Processing was not successful.', 1724862680);
         }
         return $process->getOutput();

Classes/Middleware/DOMDocumentValidation.php

Spacing +3 added lines, -3 removed lines

@@ -78,19 +78,19 @@
         $validation = GeneralUtility::makeInstance(DOMDocumentValidationStack::class, $settings['domDocumentValidationValidators']);
 
         if (!GeneralUtility::isValidUrl($urlParam)) {
-            $this->logger->debug('Parameter "' . $urlParam . '" is not a valid url.');
+            $this->logger->debug('Parameter "'.$urlParam.'" is not a valid url.');
             throw new InvalidArgumentException('Value of url parameter is not a valid url.', 1724852611);
         }
 
         $content = GeneralUtility::getUrl($urlParam);
         if ($content === false) {
-            $this->logger->debug('Error while loading content of "' . $urlParam . '"');
+            $this->logger->debug('Error while loading content of "'.$urlParam.'"');
             throw new InvalidArgumentException('Error while loading content of url.', 1724420640);
         }
 
         $document = new DOMDocument();
         if ($document->loadXML($content) === false) {
-            $this->logger->debug('Error converting content of "' . $urlParam . '" to xml.');
+            $this->logger->debug('Error converting content of "'.$urlParam.'" to xml.');
             throw new InvalidArgumentException('Error converting content to xml.', 1724420648);
         }
 

Tests/Unit/Validation/SaxonXslToSvrlValidatorTest.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
     {
         parent::setUp();
         $this->resetSingletonInstances = true;
-        $this->dlfExtensionPath = Environment::getExtensionsPath() . 'dlf';
+        $this->dlfExtensionPath = Environment::getExtensionsPath().'dlf';
     }
 
     public function testJarFileNotFound(): void
@@ -63,12 +63,12 @@ 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage("XSL Schematron file not found.");
         // It only checks if a file exists at the specified path, so we can use one of the test files.
-        new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml']);
+        new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml']);
     }
 
     public function testValidation(): void
     {
-        $saxonXslToSvrlValidator = new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml', "xsl" => $this->dlfExtensionPath . '/Tests/Fixtures/Format/alto.xml']);
+        $saxonXslToSvrlValidator = new SaxonXslToSvrlValidator(["jar" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml', "xsl" => $this->dlfExtensionPath.'/Tests/Fixtures/Format/alto.xml']);
         $reflection = new ReflectionClass($saxonXslToSvrlValidator);
 
         $result = $reflection->getProperty("result");

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;