Erikmitk / kitodo-presentation

Classes/Validation/AbstractDlfValidator.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     public function validate($value)
     {
         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 +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
  *
  * @access public
  */
-abstract class AbstractDlfValidator extends AbstractValidator
-{
+abstract class AbstractDlfValidator extends AbstractValidator {
     use LoggerAwareTrait;
 
     protected string $valueClassName;
@@ -38,15 +37,13 @@ 
     /**
      * @param $valueClassName string The class name of the value
      */
-    public function __construct(string $valueClassName)
-    {
+    public function __construct(string $valueClassName) {
         parent::__construct();
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->valueClassName = $valueClassName;
     }
 
-    public function validate($value)
-    {
+    public function validate($value) {
         if (!$value instanceof $this->valueClassName) {
             $this->logger->debug('Value must be an instance of ' . $this->valueClassName . '.');
             throw new InvalidArgumentException('Type of value is not valid.', 1723126505626);

Classes/Validation/LibXmlTrait.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-trait LibXmlTrait
-{
+trait LibXmlTrait {
     /**
      * Add the errors from the libxml error buffer as validation error.
      *

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

@@ -34,11 +34,11 @@
 
     public function enableErrorBuffer(): void
     {
-        libxml_use_internal_errors(true);
+        libxml_use_internal_errors(TRUE);
     }
 
     public function disableErrorBuffer(): void
     {
-        libxml_use_internal_errors(false);
+        libxml_use_internal_errors(FALSE);
     }
 }

Classes/Validation/AbstractDlfValidationStack.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
     {
         foreach ($configuration as $configurationItem) {
             if (!class_exists($configurationItem["className"])) {
-                $this->logger->error('Unable to load class ' . $configurationItem["className"] . '.');
+                $this->logger->error('Unable to load class '.$configurationItem["className"].'.');
                 throw new InvalidArgumentException('Unable to load validator class.', 1723200537037);
             }
             $breakOnError = !isset($configurationItem["breakOnError"]) || $configurationItem["breakOnError"] !== "false";
@@ -83,7 +83,7 @@ 
         }
 
         if (!$validator instanceof AbstractDlfValidator) {
-            $this->logger->error($className . ' must be an instance of AbstractDlfValidator.');
+            $this->logger->error($className.' must be an instance of AbstractDlfValidator.');
             throw new InvalidArgumentException('Class must be an instance of AbstractDlfValidator.', 1723121212747);
         }
 
@@ -104,7 +104,7 @@ 
     protected function isValid($value): void
     {
         if (!$value instanceof $this->valueClassName) {
-            $this->logger->error('Value must be an instance of ' . $this->valueClassName . '.');
+            $this->logger->error('Value must be an instance of '.$this->valueClassName.'.');
             throw new InvalidArgumentException('Type of value is not valid.', 1723127564821);
         }
 

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  */
-abstract class AbstractDlfValidationStack extends AbstractDlfValidator
-{
+abstract class AbstractDlfValidationStack extends AbstractDlfValidator {
     use LoggerAwareTrait;
 
     const ITEM_KEY_TITLE = "title";
@@ -36,8 +35,7 @@ 
 
     protected array $validatorStack = [];
 
-    public function __construct(string $valueClassName)
-    {
+    public function __construct(string $valueClassName) {
         parent::__construct($valueClassName);
     }
 

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

@@ -74,9 +74,9 @@
      *
      * @return void
      */
-    protected function addValidator(string $className, string $title, bool $breakOnError = true, array $configuration = null): void
+    protected function addValidator(string $className, string $title, bool $breakOnError = TRUE, array $configuration = NULL): void
     {
-        if ($configuration === null) {
+        if ($configuration === NULL) {
             $validator = GeneralUtility::makeInstance($className);
         } else {
             $validator = GeneralUtility::makeInstance($className, $configuration);

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

Braces +3 added lines, -6 removed lines

@@ -31,14 +31,12 @@ 
  *
  * @access public
  */
-class SaxonXslToSvrlValidator extends AbstractDlfValidator implements LoggerAwareInterface
-{
+class SaxonXslToSvrlValidator extends AbstractDlfValidator implements LoggerAwareInterface {
     private string $jar;
 
     private string $xsl;
 
-    public function __construct(array $configuration)
-    {
+    public function __construct(array $configuration) {
         parent::__construct(DOMDocument::class);
         $this->jar = GeneralUtility::getFileAbsFileName($configuration["jar"] ?? '');
         $this->xsl = GeneralUtility::getFileAbsFileName($configuration["xsl"] ?? '');
@@ -52,8 +50,7 @@ 
         }
     }
 
-    protected function isValid($value)
-    {
+    protected function isValid($value) {
         $svrl = $this->process($value);
         $this->addErrorsOfSvrl($svrl);
     }

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

@@ -61,7 +61,7 @@
     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()) {

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

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
  * @subpackage dlf
  * @access public
  */
-class DOMDocumentValidation implements MiddlewareInterface
-{
+class DOMDocumentValidation implements MiddlewareInterface {
     use LoggerAwareTrait;
 
     /**

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

@@ -83,13 +83,13 @@
         }
 
         $content = GeneralUtility::getUrl($urlParam);
-        if ($content === false) {
+        if ($content === FALSE) {
             $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) {
+        if ($document->loadXML($content) === FALSE) {
             $this->logger->debug('Error converting content of "' . $urlParam . '" to xml.');
             throw new InvalidArgumentException('Error converting content to xml.', 1724420648);
         }

Tests/Unit/Validation/SaxonXslToSvrlValidatorTest.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
  *
  * @access public
  */
-class SaxonXslToSvrlValidatorTest extends UnitTestCase
-{
+class SaxonXslToSvrlValidatorTest extends UnitTestCase {
     const SVRL = <<<SVRL
         <svrl:schematron-output
             xmlns:svrl="http://purl.oclc.org/dsdl/schematron">

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

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

@@ -47,7 +47,7 @@ 
     public function setUp(): void
     {
         parent::setUp();
-        $this->resetSingletonInstances = true;
+        $this->resetSingletonInstances = TRUE;
         $this->dlfExtensionPath = Environment::getExtensionsPath() . 'dlf';
     }
 
@@ -72,11 +72,11 @@ 
         $reflection = new ReflectionClass($saxonXslToSvrlValidator);
 
         $result = $reflection->getProperty("result");
-        $result->setAccessible(true);
+        $result->setAccessible(TRUE);
         $result->setValue($saxonXslToSvrlValidator, new Result());
 
         $method = $reflection->getMethod("addErrorsOfSvrl");
-        $method->setAccessible(true);
+        $method->setAccessible(TRUE);
         $method->invoke($saxonXslToSvrlValidator, self::SVRL);
 
         self::assertTrue($result->getValue($saxonXslToSvrlValidator)->hasErrors());

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