Erikmitk / kitodo-presentation

Classes/Validation/DocumentValidator.php

Indentation +4 added lines, -4 removed lines

@@ -29,10 +29,10 @@
  */
 class DocumentValidator
 {
-     /**
-     * @access protected
-     * @var Logger This holds the logger
-     */
+        /**
+         * @access protected
+         * @var Logger This holds the logger
+         */
     protected Logger $logger;
 
     /**

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     {
         foreach ($this->requiredMetadataFields as $requiredMetadataField) {
             if (empty($this->metadata[$requiredMetadataField][0])) {
-                $this->logger->error('Missing required metadata field "' . $requiredMetadataField . '".');
+                $this->logger->error('Missing required metadata field "'.$requiredMetadataField.'".');
                 return false;
             }
         }
@@ -100,14 +100,14 @@ 
      */
     public function hasCorrectLogicalStructure(string $type): bool
     {
-        $expectedNodes = $this->xml->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="' . $type . '"]');
+        $expectedNodes = $this->xml->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="'.$type.'"]');
         if ($expectedNodes) {
             return true;
         }
 
         $existingNodes = $this->xml->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
         if ($existingNodes) {
-            $this->logger->error('Document contains logical structure but @TYPE="' . $type . '" is missing.');
+            $this->logger->error('Document contains logical structure but @TYPE="'.$type.'" is missing.');
             return false;
         }
 

Braces +2 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
  *
  * @access public
  */
-class DocumentValidator
-{
+class DocumentValidator {
      /**
      * @access protected
      * @var Logger This holds the logger
@@ -63,8 +62,7 @@ 
      *
      * @return void
      */
-    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = null)
-    {
+    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = null) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->metadata = $metadata;
         $this->requiredMetadataFields = $requiredMetadataFields;

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

@@ -63,7 +63,7 @@ 
      *
      * @return void
      */
-    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = null)
+    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = NULL)
     {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->metadata = $metadata;
@@ -83,10 +83,10 @@ 
         foreach ($this->requiredMetadataFields as $requiredMetadataField) {
             if (empty($this->metadata[$requiredMetadataField][0])) {
                 $this->logger->error('Missing required metadata field "' . $requiredMetadataField . '".');
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -102,17 +102,17 @@ 
     {
         $expectedNodes = $this->xml->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="' . $type . '"]');
         if ($expectedNodes) {
-            return true;
+            return TRUE;
         }
 
         $existingNodes = $this->xml->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
         if ($existingNodes) {
             $this->logger->error('Document contains logical structure but @TYPE="' . $type . '" is missing.');
-            return false;
+            return FALSE;
         }
 
         $this->logger->error('Document does not contain logical structure.');
-        return false;
+        return FALSE;
     }
 
     /**
@@ -126,16 +126,16 @@ 
     {
         $physSequenceNodes = $this->xml->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]');
         if ($physSequenceNodes) {
-            return true;
+            return TRUE;
         }
 
         $physicalStructureNodes = $this->xml->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div');
         if ($physicalStructureNodes) {
             $this->logger->error('Document contains physical structure but @TYPE="physSequence" is missing.');
-            return false;
+            return FALSE;
         }
 
         $this->logger->error('Document does not contain physical structure.');
-        return false;
+        return FALSE;
     }
 }

Tests/Unit/Validation/DocumentValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 
     private function getXml(string $file): SimpleXMLElement
     {
-        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/MetsDocument/' . $file);
+        $xml = simplexml_load_file(__DIR__.'/../../Fixtures/MetsDocument/'.$file);
         self::assertNotFalse($xml);
         return $xml;
     }

Braces +7 added lines, -14 removed lines

@@ -15,8 +15,7 @@ 
 use SimpleXMLElement;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-class DocumentValidatorTest extends UnitTestCase
-{
+class DocumentValidatorTest extends UnitTestCase {
     public function setUp(): void
     {
         parent::setUp();
@@ -27,8 +26,7 @@ 
     /**
      * @test
      */
-    public function passesHasAllMandatoryMetadataFields()
-    {
+    public function passesHasAllMandatoryMetadataFields() {
         $metadata = [
             'record_id' => [
                 'xyz'
@@ -41,8 +39,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasAllMandatoryMetadataFields()
-    {
+    public function notPassesHasAllMandatoryMetadataFields() {
         $metadata = [
             'document_format' => [
                 'METS'
@@ -55,8 +52,7 @@ 
     /**
      * @test
      */
-    public function passesHasCorrectLogicalStructure()
-    {
+    public function passesHasCorrectLogicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -66,8 +62,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasCorrectLogicalStructure()
-    {
+    public function notPassesHasCorrectLogicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -77,8 +72,7 @@ 
     /**
      * @test
      */
-    public function passesHasCorrectPhysicalStructure()
-    {
+    public function passesHasCorrectPhysicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -88,8 +82,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasCorrectPhysicalStructure()
-    {
+    public function notPassesHasCorrectPhysicalStructure() {
         $xml = $this->getXml('two_dmdsec.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);

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

@@ -21,7 +21,7 @@
     {
         parent::setUp();
 
-        $this->resetSingletonInstances = true;
+        $this->resetSingletonInstances = TRUE;
     }
 
     /**

Classes/Common/Helper.php

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

@@ -87,7 +87,7 @@ 
      *
      * @return FlashMessageQueue The queue the message was added to
      */
-    public static function addMessage(string $message, string $title, int $severity, bool $session = false, string $queue = 'kitodo.default.flashMessages'): FlashMessageQueue
+    public static function addMessage(string $message, string $title, int $severity, bool $session = FALSE, string $queue = 'kitodo.default.flashMessages'): FlashMessageQueue
     {
         $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
@@ -126,9 +126,9 @@ 
                     $checksum = 'X';
                 }
                 if (!preg_match('/\d{8}[\dX]{1}/i', $id)) {
-                    return false;
+                    return FALSE;
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
-                    return false;
+                    return FALSE;
                 }
                 break;
             case 'ZDB':
@@ -136,21 +136,21 @@ 
                     $checksum = 'X';
                 }
                 if (!preg_match('/\d{8}-[\dX]{1}/i', $id)) {
-                    return false;
+                    return FALSE;
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
-                    return false;
+                    return FALSE;
                 }
                 break;
             case 'SWD':
                 $checksum = 11 - $checksum;
                 if (!preg_match('/\d{8}-\d{1}/i', $id)) {
-                    return false;
+                    return FALSE;
                 } elseif ($checksum == 10) {
                     //TODO: Binary operation "+" between string and 1 results in an error.
                     // @phpstan-ignore-next-line
                     return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
                 } elseif (substr($id, -1, 1) != $checksum) {
-                    return false;
+                    return FALSE;
                 }
                 break;
             case 'GKD':
@@ -159,13 +159,13 @@ 
                     $checksum = 'X';
                 }
                 if (!preg_match('/\d{8}-[\dX]{1}/i', $id)) {
-                    return false;
+                    return FALSE;
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
-                    return false;
+                    return FALSE;
                 }
                 break;
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -202,28 +202,28 @@ 
     public static function decrypt(string $encrypted)
     {
         if (
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
         ) {
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         if (empty(self::getEncryptionKey())) {
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         if (
             empty($encrypted)
             || strlen($encrypted) < openssl_cipher_iv_length(self::$cipherAlgorithm)
         ) {
             self::log('Invalid parameters given for decryption', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         // Split initialisation vector and encrypted data.
         $binary = base64_decode($encrypted);
         $iv = substr($binary, 0, openssl_cipher_iv_length(self::$cipherAlgorithm));
         $data = substr($binary, openssl_cipher_iv_length(self::$cipherAlgorithm));
-        $key = openssl_digest(self::getEncryptionKey(), self::$hashAlgorithm, true);
+        $key = openssl_digest(self::getEncryptionKey(), self::$hashAlgorithm, TRUE);
         // Decrypt data.
         return openssl_decrypt($data, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
     }
@@ -245,15 +245,15 @@ 
         // Don't make simplexml_load_string throw (when $content is an array
         // or object)
         if (!is_string($content)) {
-            return false;
+            return FALSE;
         }
 
         // Turn off libxml's error logging.
-        $libxmlErrors = libxml_use_internal_errors(true);
+        $libxmlErrors = libxml_use_internal_errors(TRUE);
 
         if (\PHP_VERSION_ID < 80000) {
             // Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
-            $previousValueOfEntityLoader = libxml_disable_entity_loader(true);
+            $previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
         }
 
         // Try to load XML from file.
@@ -315,9 +315,9 @@ 
      */
     public static function digest(string $string)
     {
-        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
+        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))) {
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         // Hash string.
         return openssl_digest($string, self::$hashAlgorithm);
@@ -337,23 +337,23 @@ 
     public static function encrypt(string $string)
     {
         if (
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
         ) {
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         if (empty(self::getEncryptionKey())) {
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
         // Generate random initialization vector.
         $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length(self::$cipherAlgorithm));
-        $key = openssl_digest(self::getEncryptionKey(), self::$hashAlgorithm, true);
+        $key = openssl_digest(self::getEncryptionKey(), self::$hashAlgorithm, TRUE);
         // Encrypt data.
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
         // Merge initialization vector and encrypted data.
-        if ($encrypted !== false) {
+        if ($encrypted !== FALSE) {
             $encrypted = base64_encode($iv . $encrypted);
         }
         return $encrypted;
@@ -554,7 +554,7 @@ 
     public static function isValidHttpUrl(string $url): bool
     {
         if (!GeneralUtility::isValidUrl($url)) {
-            return false;
+            return FALSE;
         }
 
         try {
@@ -562,7 +562,7 @@ 
             return !empty($uri->getScheme());
         } catch (\InvalidArgumentException $e) {
             self::log($e->getMessage(), LOG_SEVERITY_ERROR);
-            return false;
+            return FALSE;
         }
     }
 
@@ -578,7 +578,7 @@ 
      *
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
+    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = FALSE, $cmdFirst = FALSE)
     {
         $context = GeneralUtility::makeInstance(Context::class);
 
@@ -589,7 +589,7 @@ 
             // Instantiate TYPO3 core engine.
             $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
             // We do not use workspaces and have to bypass restrictions in DataHandler.
-            $dataHandler->bypassWorkspaceRestrictions = true;
+            $dataHandler->bypassWorkspaceRestrictions = TRUE;
             // Load data and command arrays.
             $dataHandler->start($data, $cmd);
             // Process command map first if default order is reversed.
@@ -688,7 +688,7 @@ 
             ->where(
                 $queryBuilder->expr()->eq($table . '.pid', $pid),
                 $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($indexName)),
-                self::whereExpression($table, true)
+                self::whereExpression($table, TRUE)
             )
             ->setMaxResults(1)
             ->execute();
@@ -704,7 +704,7 @@ 
                     $queryBuilder->expr()->eq($table . '.pid', $pid),
                     $queryBuilder->expr()->eq($table . '.uid', $row['l18n_parent']),
                     $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId),
-                    self::whereExpression($table, true)
+                    self::whereExpression($table, TRUE)
                 )
                 ->setMaxResults(1)
                 ->execute();
@@ -739,7 +739,7 @@ 
                     ->where(
                         $queryBuilder->expr()->eq($table . '.pid', $pid),
                         $additionalWhere,
-                        self::whereExpression($table, true)
+                        self::whereExpression($table, TRUE)
                     )
                     ->setMaxResults(10000)
                     ->execute();
@@ -781,7 +781,7 @@ 
      *
      * @return string Additional WHERE expression
      */
-    public static function whereExpression(string $table, bool $showHidden = false): string
+    public static function whereExpression(string $table, bool $showHidden = FALSE): string
     {
         // TODO: Check with applicationType; TYPO3_MODE is removed in v12
         if (\TYPO3_MODE === 'FE') {
@@ -853,7 +853,7 @@ 
     public static function getUrl(string $url)
     {
         if (!Helper::isValidHttpUrl($url)) {
-            return false;
+            return FALSE;
         }
 
         // Get extension configuration.
@@ -871,7 +871,7 @@ 
             $response = $requestFactory->request($url, 'GET', $configuration);
         } catch (\Exception $e) {
             self::log('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.', LOG_SEVERITY_WARNING);
-            return false;
+            return FALSE;
         }
         return $response->getBody()->getContents();
     }

Braces +9 added lines, -18 removed lines

@@ -38,8 +38,7 @@ 
  *
  * @access public
  */
-class Helper
-{
+class Helper {
     /**
      * @access public
      * @static
@@ -199,8 +198,7 @@ 
      *
      * @return mixed The decrypted value or false on error
      */
-    public static function decrypt(string $encrypted)
-    {
+    public static function decrypt(string $encrypted) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -240,8 +238,7 @@ 
      *
      * @return \SimpleXMLElement|false
      */
-    public static function getXmlFileAsString($content)
-    {
+    public static function getXmlFileAsString($content) {
         // Don't make simplexml_load_string throw (when $content is an array
         // or object)
         if (!is_string($content)) {
@@ -313,8 +310,7 @@ 
      *
      * @return mixed Hashed string or false on error
      */
-    public static function digest(string $string)
-    {
+    public static function digest(string $string) {
         if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
             return false;
@@ -334,8 +330,7 @@ 
      *
      * @return mixed Encrypted string or false on error
      */
-    public static function encrypt(string $string)
-    {
+    public static function encrypt(string $string) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -578,8 +573,7 @@ 
      *
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
-    {
+    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false) {
         $context = GeneralUtility::makeInstance(Context::class);
 
         if (
@@ -818,8 +812,7 @@ 
      *
      * @return void
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 
@@ -850,8 +843,7 @@ 
      *
      * @return string|bool
      */
-    public static function getUrl(string $url)
-    {
+    public static function getUrl(string $url) {
         if (!Helper::isValidHttpUrl($url)) {
             return false;
         }
@@ -932,8 +924,7 @@ 
      *
      * @return mixed
      */
-    private static function getLocalConfigurationByPath(string $path)
-    {
+    private static function getLocalConfigurationByPath(string $path) {
         $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);
 
         if (array_key_exists(strtok($path, '/'), $configurationManager->getLocalConfiguration())) {

Spacing +31 added lines, -31 removed lines

@@ -148,7 +148,7 @@ 
                 } elseif ($checksum == 10) {
                     //TODO: Binary operation "+" between string and 1 results in an error.
                     // @phpstan-ignore-next-line
-                    return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
+                    return self::checkIdentifier(($digits + 1).substr($id, -2, 2), 'SWD');
                 } elseif (substr($id, -1, 1) != $checksum) {
                     return false;
                 }
@@ -354,7 +354,7 @@ 
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
         // Merge initialization vector and encrypted data.
         if ($encrypted !== false) {
-            $encrypted = base64_encode($iv . $encrypted);
+            $encrypted = base64_encode($iv.$encrypted);
         }
         return $encrypted;
     }
@@ -396,8 +396,8 @@ 
     public static function getHookObjects(string $scriptRelPath): array
     {
         $hookObjects = [];
-        if (is_array(self::getOptions()[self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
-            foreach (self::getOptions()[self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
+        if (is_array(self::getOptions()[self::$extKey.'/'.$scriptRelPath]['hookClass'])) {
+            foreach (self::getOptions()[self::$extKey.'/'.$scriptRelPath]['hookClass'] as $classRef) {
                 $hookObjects[] = GeneralUtility::makeInstance($classRef);
             }
         }
@@ -426,12 +426,12 @@ 
             // NOTE: Only use tables that don't have too many entries!
             || !in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_metadatasubentries', 'tx_dlf_structures', 'tx_dlf_solrcores'])
         ) {
-            self::log('Invalid UID "' . $uid . '" or table "' . $table . '"', LOG_SEVERITY_ERROR);
+            self::log('Invalid UID "'.$uid.'" or table "'.$table.'"', LOG_SEVERITY_ERROR);
             return '';
         }
 
-        $makeCacheKey = function ($pid, $uid) {
-            return $pid . '.' . $uid;
+        $makeCacheKey = function($pid, $uid) {
+            return $pid.'.'.$uid;
         };
 
         static $cache = [];
@@ -441,9 +441,9 @@ 
 
             $result = $queryBuilder
                 ->select(
-                    $table . '.index_name AS index_name',
-                    $table . '.uid AS uid',
-                    $table . '.pid AS pid',
+                    $table.'.index_name AS index_name',
+                    $table.'.uid AS uid',
+                    $table.'.pid AS pid',
                 )
                 ->from($table)
                 ->execute();
@@ -461,7 +461,7 @@ 
         $result = $cache[$table][$cacheKey] ?? '';
 
         if ($result === '') {
-            self::log('No "index_name" with UID ' . $uid . ' and PID ' . $pid . ' found in table "' . $table . '"', LOG_SEVERITY_WARNING);
+            self::log('No "index_name" with UID '.$uid.' and PID '.$pid.' found in table "'.$table.'"', LOG_SEVERITY_WARNING);
         }
 
         return $result;
@@ -490,11 +490,11 @@ 
             // No ISO code, return unchanged.
             return $code;
         }
-        $lang = LocalizationUtility::translate('LLL:' . $file . ':' . $code);
+        $lang = LocalizationUtility::translate('LLL:'.$file.':'.$code);
         if (!empty($lang)) {
             return $lang;
         } else {
-            self::log('Language code "' . $code . '" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
+            self::log('Language code "'.$code.'" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
             return $code;
         }
     }
@@ -658,7 +658,7 @@ 
         // Sanitize input.
         $pid = max((int) $pid, 0);
         if (!$pid) {
-            self::log('Invalid PID ' . $pid . ' for translation', LOG_SEVERITY_WARNING);
+            self::log('Invalid PID '.$pid.' for translation', LOG_SEVERITY_WARNING);
             return $indexName;
         }
         /** @var PageRepository $pageRepository */
@@ -681,13 +681,13 @@ 
         // First fetch the uid of the received index_name
         $result = $queryBuilder
             ->select(
-                $table . '.uid AS uid',
-                $table . '.l18n_parent AS l18n_parent'
+                $table.'.uid AS uid',
+                $table.'.l18n_parent AS l18n_parent'
             )
             ->from($table)
             ->where(
-                $queryBuilder->expr()->eq($table . '.pid', $pid),
-                $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($indexName)),
+                $queryBuilder->expr()->eq($table.'.pid', $pid),
+                $queryBuilder->expr()->eq($table.'.index_name', $queryBuilder->expr()->literal($indexName)),
                 self::whereExpression($table, true)
             )
             ->setMaxResults(1)
@@ -698,12 +698,12 @@ 
         if ($row) {
             // Now we use the uid of the l18_parent to fetch the index_name of the translated content element.
             $result = $queryBuilder
-                ->select($table . '.index_name AS index_name')
+                ->select($table.'.index_name AS index_name')
                 ->from($table)
                 ->where(
-                    $queryBuilder->expr()->eq($table . '.pid', $pid),
-                    $queryBuilder->expr()->eq($table . '.uid', $row['l18n_parent']),
-                    $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId),
+                    $queryBuilder->expr()->eq($table.'.pid', $pid),
+                    $queryBuilder->expr()->eq($table.'.uid', $row['l18n_parent']),
+                    $queryBuilder->expr()->eq($table.'.sys_language_uid', (int) $languageContentId),
                     self::whereExpression($table, true)
                 )
                 ->setMaxResults(1)
@@ -721,14 +721,14 @@ 
         if (empty($labels[$table][$pid][$languageContentId][$indexName])) {
             // Check if this table is allowed for translation.
             if (in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_metadatasubentries', 'tx_dlf_structures'])) {
-                $additionalWhere = $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]);
+                $additionalWhere = $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]);
                 if ($languageContentId > 0) {
                     $additionalWhere = $queryBuilder->expr()->andX(
                         $queryBuilder->expr()->orX(
-                            $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
-                            $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId)
+                            $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
+                            $queryBuilder->expr()->eq($table.'.sys_language_uid', (int) $languageContentId)
                         ),
-                        $queryBuilder->expr()->eq($table . '.l18n_parent', 0)
+                        $queryBuilder->expr()->eq($table.'.l18n_parent', 0)
                     );
                 }
 
@@ -737,7 +737,7 @@ 
                     ->select('*')
                     ->from($table)
                     ->where(
-                        $queryBuilder->expr()->eq($table . '.pid', $pid),
+                        $queryBuilder->expr()->eq($table.'.pid', $pid),
                         $additionalWhere,
                         self::whereExpression($table, true)
                     )
@@ -755,10 +755,10 @@ 
                         }
                     }
                 } else {
-                    self::log('No translation with PID ' . $pid . ' available in table "' . $table . '" or translation not accessible', LOG_SEVERITY_NOTICE);
+                    self::log('No translation with PID '.$pid.' available in table "'.$table.'" or translation not accessible', LOG_SEVERITY_NOTICE);
                 }
             } else {
-                self::log('No translations available for table "' . $table . '"', LOG_SEVERITY_WARNING);
+                self::log('No translations available for table "'.$table.'"', LOG_SEVERITY_WARNING);
             }
         }
 
@@ -804,7 +804,7 @@ 
             return GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable($table)
                 ->expr()
-                ->eq($table . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
+                ->eq($table.'.'.$GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
         } else {
             self::log('Unexpected TYPO3_MODE', LOG_SEVERITY_ERROR);
             return '1=-1';
@@ -870,7 +870,7 @@ 
         try {
             $response = $requestFactory->request($url, 'GET', $configuration);
         } catch (\Exception $e) {
-            self::log('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.', LOG_SEVERITY_WARNING);
+            self::log('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.', LOG_SEVERITY_WARNING);
             return false;
         }
         return $response->getBody()->getContents();

Classes/Common/Solr/SearchResult/Region.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  *
  * @access public
  */
-class Region
-{
+class Region {
 
     /**
      * @access private
@@ -87,8 +86,7 @@ 
      *
      * @return void
      */
-    public function __construct(int $id, array $region)
-    {
+    public function __construct(int $id, array $region) {
         $this->id = $id;
         $this->pageId = $region['pageIdx'] ?? null;
         $this->xBeginPosition = $region['ulx'];

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

@@ -90,7 +90,7 @@
     public function __construct(int $id, array $region)
     {
         $this->id = $id;
-        $this->pageId = $region['pageIdx'] ?? null;
+        $this->pageId = $region['pageIdx'] ?? NULL;
         $this->xBeginPosition = $region['ulx'];
         $this->xEndPosition = $region['lrx'];
         $this->yBeginPosition = $region['uly'];

Classes/Task/IndexAdditionalFieldProvider.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
 
         // Text field for document URL
         $fieldName = 'doc';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.doc',

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
  *
  * @access public
  */
-class IndexAdditionalFieldProvider extends BaseAdditionalFieldProvider
-{
+class IndexAdditionalFieldProvider extends BaseAdditionalFieldProvider {
     /**
      * Gets additional fields to render in the form to add/edit a task
      *
@@ -33,8 +32,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return array A two dimensional array, array('Identifier' => array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
      */
-    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule)
-    {
+    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule) {
         $currentSchedulerModuleAction = $schedulerModule->getCurrentAction();
 
         /** @var BaseTask $task */

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

@@ -46,12 +46,12 @@
             $taskInfo['owner'] = $task->getOwner();
             $taskInfo['softCommit'] = $task->isSoftCommit();
         } else {
-            $taskInfo['dryRun'] = false;
+            $taskInfo['dryRun'] = FALSE;
             $taskInfo['doc'] = 'https://';
             $taskInfo['pid'] = - 1;
             $taskInfo['solr'] = - 1;
             $taskInfo['owner'] = '';
-            $taskInfo['softCommit'] = false;
+            $taskInfo['softCommit'] = FALSE;
         }
 
         $additionalFields = [];

Classes/Task/HarvestAdditionalFieldProvider.php

Spacing +9 added lines, -9 removed lines

@@ -65,16 +65,16 @@ 
 
         // Text field for library
         $fieldName = 'lib';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $allLibraries = $this->getLibraries($taskInfo['pid']);
         $options = [];
         $options[] = '<option value="-1"></option>';
         foreach ($allLibraries as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . ($taskInfo['lib'] == $uid ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.($taskInfo['lib'] == $uid ? 'selected' : '').' >'.$label.'</option>';
         }
 
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.lib',
@@ -90,8 +90,8 @@ 
 
         // Text field for from
         $fieldName = 'from';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="date" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="date" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.from',
@@ -101,8 +101,8 @@ 
 
         // Text field for until
         $fieldName = 'until';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="date" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="date" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.until',
@@ -112,8 +112,8 @@ 
 
         // Text field for set
         $fieldName = 'set';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.set',

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
  *
  * @access public
  */
-class HarvestAdditionalFieldProvider extends BaseAdditionalFieldProvider
-{
+class HarvestAdditionalFieldProvider extends BaseAdditionalFieldProvider {
     /**
      * Gets additional fields to render in the form to add/edit a task
      *
@@ -35,8 +34,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return array A two dimensional array, array('Identifier' => array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
      */
-    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule)
-    {
+    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule) {
         $currentSchedulerModuleAction = $schedulerModule->getCurrentAction();
 
         /** @var BaseTask $task */

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

@@ -50,14 +50,14 @@
             $taskInfo['set'] = $task->getSet();
             $taskInfo['softCommit'] = $task->isSoftCommit();
         } else {
-            $taskInfo['dryRun'] = false;
+            $taskInfo['dryRun'] = FALSE;
             $taskInfo['lib'] = - 1;
             $taskInfo['pid'] = - 1;
             $taskInfo['solr'] = - 1;
             $taskInfo['from'] = '';
             $taskInfo['until'] = '';
             $taskInfo['set'] = '';
-            $taskInfo['softCommit'] = false;
+            $taskInfo['softCommit'] = FALSE;
         }
 
         $additionalFields = [];

Classes/Task/ReindexTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class ReindexTask extends BaseTask
-{
-    public function execute()
-    {
+class ReindexTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         if ($this->dryRun) {
             $inputArray['--dry-run'] = true;

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

@@ -29,7 +29,7 @@ 
     {
         $inputArray = [];
         if ($this->dryRun) {
-            $inputArray['--dry-run'] = true;
+            $inputArray['--dry-run'] = TRUE;
         }
         if (count($this->coll)) {
             $inputArray['-c'] = implode(',', $this->coll);
@@ -40,10 +40,10 @@ 
             $inputArray['-o'] = $this->owner;
         }
         if ($this->all) {
-            $inputArray['--all'] = true;
+            $inputArray['--all'] = TRUE;
         }
         if (!empty($this->softCommit)) {
-            $inputArray['--softCommit'] = true;
+            $inputArray['--softCommit'] = TRUE;
         }
 
         $reindexCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\ReindexCommand::class);

Classes/Task/BaseAdditionalFieldProvider.php

Braces +4 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
  *
  * @access public
  */
-class BaseAdditionalFieldProvider implements AdditionalFieldProviderInterface
-{
+class BaseAdditionalFieldProvider implements AdditionalFieldProviderInterface {
     /**
      * Gets additional fields to render in the form to add/edit a task
      *
@@ -39,8 +38,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return array A two dimensional array, array('Identifier' => array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
      */
-    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule)
-    {
+    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule) {
         return [];
     }
 
@@ -51,8 +49,7 @@ 
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
      */
-    public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule)
-    {
+    public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule) {
         $fieldsValid = true;
 
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_tasks.xlf');
@@ -130,8 +127,7 @@ 
      * @param BaseTask $task Reference to the scheduler backend module
      * @return void
      */
-    public function saveAdditionalFields(array $submittedData, AbstractTask $task)
-    {
+    public function saveAdditionalFields(array $submittedData, AbstractTask $task) {
         /** @var BaseTask $task */
         $task->setDryRun(!empty($submittedData['dryRun']));
         if (isset($submittedData['doc'])) {

Spacing +17 added lines, -17 removed lines

@@ -62,7 +62,7 @@ 
 
         if (isset($submittedData['doc']) && empty($submittedData['doc'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.doc').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -73,7 +73,7 @@ 
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.pid').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -100,7 +100,7 @@ 
 
         if ((isset($submittedData['lib']) && (int) $submittedData['lib'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.lib').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -111,7 +111,7 @@ 
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.solr').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -192,8 +192,8 @@ 
     protected function getDryRunField(bool $dryRun): array
     {
         $fieldName = 'dryRun';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($dryRun ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($dryRun ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.dryRun',
@@ -215,15 +215,15 @@ 
     protected function getSolrField(int $solr, int $pid = null): array
     {
         $fieldName = 'solr';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $allSolrCores = $this->getSolrCores($pid);
         $options = [];
         $options[] = '<option value="-1"></option>';
         foreach ($allSolrCores as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . ($solr == $uid ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.($solr == $uid ? 'selected' : '').' >'.$label.'</option>';
         };
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.solr',
@@ -244,7 +244,7 @@ 
     protected function getPidField(int $pid): array
     {
         $fieldName = 'pid';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class);
         $pages = $pageRepository->getTree(0);
@@ -252,11 +252,11 @@ 
         $options = [];
         foreach ($pages['_children'] as $page) {
             if ($page['doktype'] == 254) {
-                $options[] = '<option value="' . $page['uid'] . '" ' . ($pid == $page['uid'] ? 'selected' : '') . ' >' . $page['title'] . '</option>';
+                $options[] = '<option value="'.$page['uid'].'" '.($pid == $page['uid'] ? 'selected' : '').' >'.$page['title'].'</option>';
             }
         }
 
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.pid',
@@ -277,8 +277,8 @@ 
     protected function getOwnerField(string $owner): array
     {
         $fieldName = 'owner';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $owner . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$owner.'" >';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.owner',
@@ -312,7 +312,7 @@ 
         $result = $queryBuilder->execute();
 
         while ($record = $result->fetchAssociative()) {
-            $solrCores[$record['label'] . ' (' . $record['index_name'] . ')'] = $record['uid'];
+            $solrCores[$record['label'].' ('.$record['index_name'].')'] = $record['uid'];
         }
 
         return $solrCores;
@@ -330,8 +330,8 @@ 
     protected function getSoftCommitField(bool $softCommit): array
     {
         $fieldName = 'softCommit';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($softCommit ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($softCommit ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.softCommit',

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

@@ -53,7 +53,7 @@ 
      */
     public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule)
     {
-        $fieldsValid = true;
+        $fieldsValid = TRUE;
 
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_tasks.xlf');
 
@@ -65,10 +65,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) {
@@ -76,10 +76,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if (!isset($submittedData['commit']) && !isset($submittedData['optimize']) && !isset($submittedData['pid']) && ($submittedData['class'] != 'Kitodo\Dlf\Task\SuggestBuildTask')) {
@@ -87,10 +87,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.commitOrOptimize'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = false;
+            $fieldsValid = FALSE;
         }
 
         if (!$submittedData['uid']) {
@@ -103,10 +103,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
@@ -114,10 +114,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
 
         if (((isset($submittedData['coll']) && isset($submittedData['all'])) || (!isset($submittedData['coll']) && !isset($submittedData['all'])))
@@ -126,10 +126,10 @@ 
                 Helper::getLanguageService()->getLL('additionalFields.collOrAll'),
                 $messageTitle,
                 $messageSeverity,
-                true,
+                TRUE,
                 'core.template.flashMessages'
             );
-            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? false : $fieldsValid;
+            $fieldsValid = $messageSeverity === FlashMessage::ERROR ? FALSE : $fieldsValid;
         }
         return $fieldsValid;
     }
@@ -212,7 +212,7 @@ 
      *
      * @return array additional field solr dropdown
      */
-    protected function getSolrField(int $solr, int $pid = null): array
+    protected function getSolrField(int $solr, int $pid = NULL): array
     {
         $fieldName = 'solr';
         $fieldId = 'task_' . $fieldName;
@@ -296,14 +296,14 @@ 
      *
      * @return array Array of valid Solr cores
      */
-    private function getSolrCores(int $pid = null): array
+    private function getSolrCores(int $pid = NULL): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_solrcores');
 
         $solrCores = [];
         $result = $queryBuilder->select('uid', 'label', 'index_name')
             ->from('tx_dlf_solrcores');
-        if ($pid !== null) {
+        if ($pid !== NULL) {
             $queryBuilder->where(
                 $queryBuilder->expr()
                     ->eq('pid', $queryBuilder->createNamedParameter((int) $pid, Connection::PARAM_INT))

Classes/Task/HarvestTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class HarvestTask extends BaseTask
-{
-    public function execute()
-    {
+class HarvestTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         if ($this->dryRun) {
             $inputArray['--dry-run'] = true;

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

@@ -29,7 +29,7 @@ 
     {
         $inputArray = [];
         if ($this->dryRun) {
-            $inputArray['--dry-run'] = true;
+            $inputArray['--dry-run'] = TRUE;
         }
         $inputArray['-l'] = $this->lib;
         $inputArray['-p'] = $this->pid;
@@ -44,7 +44,7 @@ 
             $inputArray['--set'] = $this->set;
         }
         if (!empty($this->softCommit)) {
-            $inputArray['--softCommit'] = true;
+            $inputArray['--softCommit'] = TRUE;
         }
 
         $harvestCommand = GeneralUtility::makeInstance(\Kitodo\Dlf\Command\HarvestCommand::class);