Passed
Pull Request — master (#123)
by
unknown
04:06
created
Classes/Common/Helper.php 3 patches
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
                 } elseif ($checksum == 10) {
147 147
                     //TODO: Binary operation "+" between string and 1 results in an error.
148 148
                     // @phpstan-ignore-next-line
149
-                    return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
149
+                    return self::checkIdentifier(($digits + 1).substr($id, -2, 2), 'SWD');
150 150
                 } elseif (substr($id, -1, 1) != $checksum) {
151 151
                     return false;
152 152
                 }
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
346 346
         // Merge initialization vector and encrypted data.
347 347
         if ($encrypted !== false) {
348
-            $encrypted = base64_encode($iv . $encrypted);
348
+            $encrypted = base64_encode($iv.$encrypted);
349 349
         }
350 350
         return $encrypted;
351 351
     }
@@ -404,8 +404,8 @@  discard block
 block discarded – undo
404 404
     public static function getHookObjects(string $scriptRelPath): array
405 405
     {
406 406
         $hookObjects = [];
407
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
408
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
407
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'])) {
408
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'] as $classRef) {
409 409
                 $hookObjects[] = GeneralUtility::makeInstance($classRef);
410 410
             }
411 411
         }
@@ -434,12 +434,12 @@  discard block
 block discarded – undo
434 434
             // NOTE: Only use tables that don't have too many entries!
435 435
             || !in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'])
436 436
         ) {
437
-            self::log('Invalid UID "' . $uid . '" or table "' . $table . '"', LOG_SEVERITY_ERROR);
437
+            self::log('Invalid UID "'.$uid.'" or table "'.$table.'"', LOG_SEVERITY_ERROR);
438 438
             return '';
439 439
         }
440 440
 
441
-        $makeCacheKey = function ($pid, $uid) {
442
-            return $pid . '.' . $uid;
441
+        $makeCacheKey = function($pid, $uid) {
442
+            return $pid.'.'.$uid;
443 443
         };
444 444
 
445 445
         static $cache = [];
@@ -449,9 +449,9 @@  discard block
 block discarded – undo
449 449
 
450 450
             $result = $queryBuilder
451 451
                 ->select(
452
-                    $table . '.index_name AS index_name',
453
-                    $table . '.uid AS uid',
454
-                    $table . '.pid AS pid',
452
+                    $table.'.index_name AS index_name',
453
+                    $table.'.uid AS uid',
454
+                    $table.'.pid AS pid',
455 455
                 )
456 456
                 ->from($table)
457 457
                 ->execute();
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
         $result = $cache[$table][$cacheKey] ?? '';
470 470
 
471 471
         if ($result === '') {
472
-            self::log('No "index_name" with UID ' . $uid . ' and PID ' . $pid . ' found in table "' . $table . '"', LOG_SEVERITY_WARNING);
472
+            self::log('No "index_name" with UID '.$uid.' and PID '.$pid.' found in table "'.$table.'"', LOG_SEVERITY_WARNING);
473 473
         }
474 474
 
475 475
         return $result;
@@ -498,11 +498,11 @@  discard block
 block discarded – undo
498 498
             // No ISO code, return unchanged.
499 499
             return $code;
500 500
         }
501
-        $lang = LocalizationUtility::translate('LLL:' . $file . ':' . $code);
501
+        $lang = LocalizationUtility::translate('LLL:'.$file.':'.$code);
502 502
         if (!empty($lang)) {
503 503
             return $lang;
504 504
         } else {
505
-            self::log('Language code "' . $code . '" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
505
+            self::log('Language code "'.$code.'" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
506 506
             return $code;
507 507
         }
508 508
     }
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
             '-' => 39,
604 604
             ':' => 17,
605 605
         ];
606
-        $urn = strtolower($base . $id);
606
+        $urn = strtolower($base.$id);
607 607
         if (preg_match('/[^a-z\d:-]/', $urn)) {
608 608
             self::log('Invalid chars in given parameters', LOG_SEVERITY_WARNING);
609 609
             return '';
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
             $checksum += ($i + 1) * (int) substr($digits, $i, 1);
618 618
         }
619 619
         $checksum = substr((string) floor($checksum / (int) substr($digits, -1, 1)), -1, 1);
620
-        return $base . $id . $checksum;
620
+        return $base.$id.$checksum;
621 621
     }
622 622
 
623 623
     /**
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
         // Sanitize input.
725 725
         $pid = max((int) $pid, 0);
726 726
         if (!$pid) {
727
-            self::log('Invalid PID ' . $pid . ' for translation', LOG_SEVERITY_WARNING);
727
+            self::log('Invalid PID '.$pid.' for translation', LOG_SEVERITY_WARNING);
728 728
             return $indexName;
729 729
         }
730 730
         /** @var PageRepository $pageRepository */
@@ -747,13 +747,13 @@  discard block
 block discarded – undo
747 747
         // First fetch the uid of the received index_name
748 748
         $result = $queryBuilder
749 749
             ->select(
750
-                $table . '.uid AS uid',
751
-                $table . '.l18n_parent AS l18n_parent'
750
+                $table.'.uid AS uid',
751
+                $table.'.l18n_parent AS l18n_parent'
752 752
             )
753 753
             ->from($table)
754 754
             ->where(
755
-                $queryBuilder->expr()->eq($table . '.pid', $pid),
756
-                $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($indexName)),
755
+                $queryBuilder->expr()->eq($table.'.pid', $pid),
756
+                $queryBuilder->expr()->eq($table.'.index_name', $queryBuilder->expr()->literal($indexName)),
757 757
                 self::whereExpression($table, true)
758 758
             )
759 759
             ->setMaxResults(1)
@@ -764,12 +764,12 @@  discard block
 block discarded – undo
764 764
         if ($row) {
765 765
             // Now we use the uid of the l18_parent to fetch the index_name of the translated content element.
766 766
             $result = $queryBuilder
767
-                ->select($table . '.index_name AS index_name')
767
+                ->select($table.'.index_name AS index_name')
768 768
                 ->from($table)
769 769
                 ->where(
770
-                    $queryBuilder->expr()->eq($table . '.pid', $pid),
771
-                    $queryBuilder->expr()->eq($table . '.uid', $row['l18n_parent']),
772
-                    $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId),
770
+                    $queryBuilder->expr()->eq($table.'.pid', $pid),
771
+                    $queryBuilder->expr()->eq($table.'.uid', $row['l18n_parent']),
772
+                    $queryBuilder->expr()->eq($table.'.sys_language_uid', (int) $languageContentId),
773 773
                     self::whereExpression($table, true)
774 774
                 )
775 775
                 ->setMaxResults(1)
@@ -787,14 +787,14 @@  discard block
 block discarded – undo
787 787
         if (empty($labels[$table][$pid][$languageContentId][$indexName])) {
788 788
             // Check if this table is allowed for translation.
789 789
             if (in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures'])) {
790
-                $additionalWhere = $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]);
790
+                $additionalWhere = $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]);
791 791
                 if ($languageContentId > 0) {
792 792
                     $additionalWhere = $queryBuilder->expr()->andX(
793 793
                         $queryBuilder->expr()->orX(
794
-                            $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
795
-                            $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId)
794
+                            $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
795
+                            $queryBuilder->expr()->eq($table.'.sys_language_uid', (int) $languageContentId)
796 796
                         ),
797
-                        $queryBuilder->expr()->eq($table . '.l18n_parent', 0)
797
+                        $queryBuilder->expr()->eq($table.'.l18n_parent', 0)
798 798
                     );
799 799
                 }
800 800
 
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
                     ->select('*')
804 804
                     ->from($table)
805 805
                     ->where(
806
-                        $queryBuilder->expr()->eq($table . '.pid', $pid),
806
+                        $queryBuilder->expr()->eq($table.'.pid', $pid),
807 807
                         $additionalWhere,
808 808
                         self::whereExpression($table, true)
809 809
                     )
@@ -821,10 +821,10 @@  discard block
 block discarded – undo
821 821
                         }
822 822
                     }
823 823
                 } else {
824
-                    self::log('No translation with PID ' . $pid . ' available in table "' . $table . '" or translation not accessible', LOG_SEVERITY_NOTICE);
824
+                    self::log('No translation with PID '.$pid.' available in table "'.$table.'" or translation not accessible', LOG_SEVERITY_NOTICE);
825 825
                 }
826 826
             } else {
827
-                self::log('No translations available for table "' . $table . '"', LOG_SEVERITY_WARNING);
827
+                self::log('No translations available for table "'.$table.'"', LOG_SEVERITY_WARNING);
828 828
             }
829 829
         }
830 830
 
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
             return GeneralUtility::makeInstance(ConnectionPool::class)
871 871
                 ->getQueryBuilderForTable($table)
872 872
                 ->expr()
873
-                ->eq($table . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
873
+                ->eq($table.'.'.$GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
874 874
         } else {
875 875
             self::log('Unexpected TYPO3_MODE', LOG_SEVERITY_ERROR);
876 876
             return '1=-1';
@@ -936,7 +936,7 @@  discard block
 block discarded – undo
936 936
         try {
937 937
             $response = $requestFactory->request($url, 'GET', $configuration);
938 938
         } catch (\Exception $e) {
939
-            self::log('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.', LOG_SEVERITY_WARNING);
939
+            self::log('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.', LOG_SEVERITY_WARNING);
940 940
             return false;
941 941
         }
942 942
         return $response->getBody()->getContents();
Please login to merge, or discard this patch.
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -37,8 +37,7 @@  discard block
 block discarded – undo
37 37
  *
38 38
  * @access public
39 39
  */
40
-class Helper
41
-{
40
+class Helper {
42 41
     /**
43 42
      * @access public
44 43
      * @static
@@ -198,8 +197,7 @@  discard block
 block discarded – undo
198 197
      *
199 198
      * @return mixed The decrypted value or false on error
200 199
      */
201
-    public static function decrypt(string $encrypted)
202
-    {
200
+    public static function decrypt(string $encrypted) {
203 201
         if (
204 202
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
205 203
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -239,8 +237,7 @@  discard block
 block discarded – undo
239 237
      *
240 238
      * @return \SimpleXMLElement|false
241 239
      */
242
-    public static function getXmlFileAsString($content)
243
-    {
240
+    public static function getXmlFileAsString($content) {
244 241
         // Don't make simplexml_load_string throw (when $content is an array
245 242
         // or object)
246 243
         if (!is_string($content)) {
@@ -305,8 +302,7 @@  discard block
 block discarded – undo
305 302
      *
306 303
      * @return mixed Hashed string or false on error
307 304
      */
308
-    public static function digest(string $string)
309
-    {
305
+    public static function digest(string $string) {
310 306
         if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
311 307
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
312 308
             return false;
@@ -326,8 +322,7 @@  discard block
 block discarded – undo
326 322
      *
327 323
      * @return mixed Encrypted string or false on error
328 324
      */
329
-    public static function encrypt(string $string)
330
-    {
325
+    public static function encrypt(string $string) {
331 326
         if (
332 327
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
333 328
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -697,8 +692,7 @@  discard block
 block discarded – undo
697 692
      *
698 693
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
699 694
      */
700
-    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
701
-    {
695
+    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false) {
702 696
         $context = GeneralUtility::makeInstance(Context::class);
703 697
 
704 698
         if (
@@ -937,8 +931,7 @@  discard block
 block discarded – undo
937 931
      *
938 932
      * @return void
939 933
      */
940
-    private function __construct()
941
-    {
934
+    private function __construct() {
942 935
         // This is a static class, thus no instances should be created.
943 936
     }
944 937
 
@@ -969,8 +962,7 @@  discard block
 block discarded – undo
969 962
      *
970 963
      * @return string|bool
971 964
      */
972
-    public static function getUrl(string $url)
973
-    {
965
+    public static function getUrl(string $url) {
974 966
         if (!Helper::isValidHttpUrl($url)) {
975 967
             return false;
976 968
         }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      *
87 87
      * @return FlashMessageQueue The queue the message was added to
88 88
      */
89
-    public static function addMessage(string $message, string $title, int $severity, bool $session = false, string $queue = 'kitodo.default.flashMessages'): FlashMessageQueue
89
+    public static function addMessage(string $message, string $title, int $severity, bool $session = FALSE, string $queue = 'kitodo.default.flashMessages'): FlashMessageQueue
90 90
     {
91 91
         $flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
92 92
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
                     $checksum = 'X';
126 126
                 }
127 127
                 if (!preg_match('/\d{8}[\dX]{1}/i', $id)) {
128
-                    return false;
128
+                    return FALSE;
129 129
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
130
-                    return false;
130
+                    return FALSE;
131 131
                 }
132 132
                 break;
133 133
             case 'ZDB':
@@ -135,21 +135,21 @@  discard block
 block discarded – undo
135 135
                     $checksum = 'X';
136 136
                 }
137 137
                 if (!preg_match('/\d{8}-[\dX]{1}/i', $id)) {
138
-                    return false;
138
+                    return FALSE;
139 139
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
140
-                    return false;
140
+                    return FALSE;
141 141
                 }
142 142
                 break;
143 143
             case 'SWD':
144 144
                 $checksum = 11 - $checksum;
145 145
                 if (!preg_match('/\d{8}-\d{1}/i', $id)) {
146
-                    return false;
146
+                    return FALSE;
147 147
                 } elseif ($checksum == 10) {
148 148
                     //TODO: Binary operation "+" between string and 1 results in an error.
149 149
                     // @phpstan-ignore-next-line
150 150
                     return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
151 151
                 } elseif (substr($id, -1, 1) != $checksum) {
152
-                    return false;
152
+                    return FALSE;
153 153
                 }
154 154
                 break;
155 155
             case 'GKD':
@@ -158,13 +158,13 @@  discard block
 block discarded – undo
158 158
                     $checksum = 'X';
159 159
                 }
160 160
                 if (!preg_match('/\d{8}-[\dX]{1}/i', $id)) {
161
-                    return false;
161
+                    return FALSE;
162 162
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
163
-                    return false;
163
+                    return FALSE;
164 164
                 }
165 165
                 break;
166 166
         }
167
-        return true;
167
+        return TRUE;
168 168
     }
169 169
 
170 170
     /**
@@ -201,28 +201,28 @@  discard block
 block discarded – undo
201 201
     public static function decrypt(string $encrypted)
202 202
     {
203 203
         if (
204
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
205
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
204
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
205
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
206 206
         ) {
207 207
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
208
-            return false;
208
+            return FALSE;
209 209
         }
210 210
         if (empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
211 211
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
212
-            return false;
212
+            return FALSE;
213 213
         }
214 214
         if (
215 215
             empty($encrypted)
216 216
             || strlen($encrypted) < openssl_cipher_iv_length(self::$cipherAlgorithm)
217 217
         ) {
218 218
             self::log('Invalid parameters given for decryption', LOG_SEVERITY_ERROR);
219
-            return false;
219
+            return FALSE;
220 220
         }
221 221
         // Split initialisation vector and encrypted data.
222 222
         $binary = base64_decode($encrypted);
223 223
         $iv = substr($binary, 0, openssl_cipher_iv_length(self::$cipherAlgorithm));
224 224
         $data = substr($binary, openssl_cipher_iv_length(self::$cipherAlgorithm));
225
-        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, true);
225
+        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, TRUE);
226 226
         // Decrypt data.
227 227
         return openssl_decrypt($data, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
228 228
     }
@@ -244,15 +244,15 @@  discard block
 block discarded – undo
244 244
         // Don't make simplexml_load_string throw (when $content is an array
245 245
         // or object)
246 246
         if (!is_string($content)) {
247
-            return false;
247
+            return FALSE;
248 248
         }
249 249
 
250 250
         // Turn off libxml's error logging.
251
-        $libxmlErrors = libxml_use_internal_errors(true);
251
+        $libxmlErrors = libxml_use_internal_errors(TRUE);
252 252
 
253 253
         if (\PHP_VERSION_ID < 80000) {
254 254
             // Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
255
-            $previousValueOfEntityLoader = libxml_disable_entity_loader(true);
255
+            $previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
256 256
         }
257 257
 
258 258
         // Try to load XML from file.
@@ -314,9 +314,9 @@  discard block
 block discarded – undo
314 314
      */
315 315
     public static function digest(string $string)
316 316
     {
317
-        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
317
+        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))) {
318 318
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
319
-            return false;
319
+            return FALSE;
320 320
         }
321 321
         // Hash string.
322 322
         return openssl_digest($string, self::$hashAlgorithm);
@@ -336,23 +336,23 @@  discard block
 block discarded – undo
336 336
     public static function encrypt(string $string)
337 337
     {
338 338
         if (
339
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
340
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
339
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
340
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
341 341
         ) {
342 342
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
343
-            return false;
343
+            return FALSE;
344 344
         }
345 345
         if (empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
346 346
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
347
-            return false;
347
+            return FALSE;
348 348
         }
349 349
         // Generate random initialization vector.
350 350
         $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length(self::$cipherAlgorithm));
351
-        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, true);
351
+        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, TRUE);
352 352
         // Encrypt data.
353 353
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
354 354
         // Merge initialization vector and encrypted data.
355
-        if ($encrypted !== false) {
355
+        if ($encrypted !== FALSE) {
356 356
             $encrypted = base64_encode($iv . $encrypted);
357 357
         }
358 358
         return $encrypted;
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
     public static function isValidHttpUrl(string $url): bool
659 659
     {
660 660
         if (!GeneralUtility::isValidUrl($url)) {
661
-            return false;
661
+            return FALSE;
662 662
         }
663 663
 
664 664
         try {
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
             return !empty($uri->getScheme());
667 667
         } catch (\InvalidArgumentException $e) {
668 668
             self::log($e->getMessage(), LOG_SEVERITY_ERROR);
669
-            return false;
669
+            return FALSE;
670 670
         }
671 671
     }
672 672
 
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
      *
687 687
      * @return array Merged array
688 688
      */
689
-    public static function mergeRecursiveWithOverrule(array $original, array $overrule, bool $addKeys = true, bool $includeEmptyValues = true, bool $enableUnsetFeature = true): array
689
+    public static function mergeRecursiveWithOverrule(array $original, array $overrule, bool $addKeys = TRUE, bool $includeEmptyValues = TRUE, bool $enableUnsetFeature = TRUE): array
690 690
     {
691 691
         ArrayUtility::mergeRecursiveWithOverrule($original, $overrule, $addKeys, $includeEmptyValues, $enableUnsetFeature);
692 692
         return $original;
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
      *
705 705
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
706 706
      */
707
-    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
707
+    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = FALSE, $cmdFirst = FALSE)
708 708
     {
709 709
         $context = GeneralUtility::makeInstance(Context::class);
710 710
 
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
             // Instantiate TYPO3 core engine.
716 716
             $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
717 717
             // We do not use workspaces and have to bypass restrictions in DataHandler.
718
-            $dataHandler->bypassWorkspaceRestrictions = true;
718
+            $dataHandler->bypassWorkspaceRestrictions = TRUE;
719 719
             // Load data and command arrays.
720 720
             $dataHandler->start($data, $cmd);
721 721
             // Process command map first if default order is reversed.
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
             ->where(
815 815
                 $queryBuilder->expr()->eq($table . '.pid', $pid),
816 816
                 $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($indexName)),
817
-                self::whereExpression($table, true)
817
+                self::whereExpression($table, TRUE)
818 818
             )
819 819
             ->setMaxResults(1)
820 820
             ->execute();
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
830 830
                     $queryBuilder->expr()->eq($table . '.pid', $pid),
831 831
                     $queryBuilder->expr()->eq($table . '.uid', $row['l18n_parent']),
832 832
                     $queryBuilder->expr()->eq($table . '.sys_language_uid', (int) $languageContentId),
833
-                    self::whereExpression($table, true)
833
+                    self::whereExpression($table, TRUE)
834 834
                 )
835 835
                 ->setMaxResults(1)
836 836
                 ->execute();
@@ -865,7 +865,7 @@  discard block
 block discarded – undo
865 865
                     ->where(
866 866
                         $queryBuilder->expr()->eq($table . '.pid', $pid),
867 867
                         $additionalWhere,
868
-                        self::whereExpression($table, true)
868
+                        self::whereExpression($table, TRUE)
869 869
                     )
870 870
                     ->setMaxResults(10000)
871 871
                     ->execute();
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
      *
908 908
      * @return string Additional WHERE expression
909 909
      */
910
-    public static function whereExpression(string $table, bool $showHidden = false): string
910
+    public static function whereExpression(string $table, bool $showHidden = FALSE): string
911 911
     {
912 912
         // TODO: Check with applicationType; TYPO3_MODE is removed in v12
913 913
         if (\TYPO3_MODE === 'FE') {
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
     public static function getUrl(string $url)
980 980
     {
981 981
         if (!Helper::isValidHttpUrl($url)) {
982
-            return false;
982
+            return FALSE;
983 983
         }
984 984
 
985 985
         // Get extension configuration.
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
             $response = $requestFactory->request($url, 'GET', $configuration);
998 998
         } catch (\Exception $e) {
999 999
             self::log('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.', LOG_SEVERITY_WARNING);
1000
-            return false;
1000
+            return FALSE;
1001 1001
         }
1002 1002
         return $response->getBody()->getContents();
1003 1003
     }
Please login to merge, or discard this patch.
Classes/Command/ReindexCommand.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,8 +30,7 @@
 block discarded – undo
30 30
  *
31 31
  * @access public
32 32
  */
33
-class ReindexCommand extends BaseCommand
34
-{
33
+class ReindexCommand extends BaseCommand {
35 34
     /**
36 35
      * Configure the command by defining the name, options and arguments
37 36
      *
Please login to merge, or discard this patch.
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             ->setHelp('')
47 47
             ->addOption(
48 48
                 'dry-run',
49
-                null,
49
+                NULL,
50 50
                 InputOption::VALUE_NONE,
51 51
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
52 52
             )
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
      */
107 107
     protected function execute(InputInterface $input, OutputInterface $output): int
108 108
     {
109
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
109
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
110 110
 
111 111
         $io = new SymfonyStyle($input, $output);
112 112
         $io->title($this->getDescription());
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
152 152
             }
153 153
         } else {
154
-            $this->owner = null;
154
+            $this->owner = NULL;
155 155
         }
156 156
 
157 157
         if (!empty($input->getOption('all'))) {
@@ -174,21 +174,21 @@  discard block
 block discarded – undo
174 174
             && !is_array($input->getOption('coll'))
175 175
         ) {
176 176
             // "coll" may be a single integer or a comma-separated list of integers.
177
-            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), true)))) {
177
+            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE)))) {
178 178
                 $io->error('ERROR: Parameter --coll|-c is not a valid comma-separated list of collection UIDs.');
179 179
                 return BaseCommand::FAILURE;
180 180
             }
181 181
             // Get all documents of given collections.
182
-            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), true), 0);
182
+            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE), 0);
183 183
         } else {
184 184
             $io->error('ERROR: One of parameters --all|-a or --coll|-c must be given.');
185 185
             return BaseCommand::FAILURE;
186 186
         }
187 187
 
188 188
         foreach ($documents as $id => $document) {
189
-            $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
189
+            $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
190 190
 
191
-            if ($doc === null) {
191
+            if ($doc === NULL) {
192 192
                 $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
193 193
                 continue;
194 194
             }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         $this->initializeRepositories((int) $input->getOption('pid'));
115 115
 
116 116
         if ($this->storagePid == 0) {
117
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
117
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
118 118
             return BaseCommand::FAILURE;
119 119
         }
120 120
 
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
130 130
                 $output_solrCores = [];
131 131
                 foreach ($allSolrCores as $index_name => $uid) {
132
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
132
+                    $output_solrCores[] = $uid.' : '.$index_name;
133 133
                 }
134 134
                 if (empty($output_solrCores)) {
135
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
135
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
136 136
                     return BaseCommand::FAILURE;
137 137
                 } else {
138
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
138
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
139 139
                     return BaseCommand::FAILURE;
140 140
                 }
141 141
             }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
                 ->setOffset((int) $input->getOption('index-begin'))
169 169
                 ->execute();
170 170
 
171
-            $io->writeln($input->getOption('index-limit') . ' documents starting from ' . $input->getOption('index-begin') . ' will be indexed.');
171
+            $io->writeln($input->getOption('index-limit').' documents starting from '.$input->getOption('index-begin').' will be indexed.');
172 172
         } elseif (
173 173
             !empty($input->getOption('coll'))
174 174
             && !is_array($input->getOption('coll'))
@@ -189,15 +189,15 @@  discard block
 block discarded – undo
189 189
             $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
190 190
 
191 191
             if ($doc === null) {
192
-                $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
192
+                $io->warning('WARNING: Document "'.$document->getLocation().'" could not be loaded. Skip to next document.');
193 193
                 continue;
194 194
             }
195 195
 
196 196
             if ($dryRun) {
197
-                $io->writeln('DRY RUN: Would index ' . ($id + 1) . '/' . count($documents) . '  with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
197
+                $io->writeln('DRY RUN: Would index '.($id + 1).'/'.count($documents).'  with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
198 198
             } else {
199 199
                 if ($io->isVerbose()) {
200
-                    $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . ($id + 1) . '/' . count($documents) . ' with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
200
+                    $io->writeln(date('Y-m-d H:i:s').' Indexing '.($id + 1).'/'.count($documents).' with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
201 201
                 }
202 202
                 $document->setCurrentDocument($doc);
203 203
                 // save to database
Please login to merge, or discard this patch.
Classes/Command/BaseCommand.php 3 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
      *
335 335
      * @return void
336 336
      */
337
-    private function addCollections(Document &$document, array $collections): void
337
+    private function addCollections(Document & $document, array $collections): void
338 338
     {
339 339
         foreach ($collections as $collection) {
340 340
             $documentCollection = $this->collectionRepository->findOneByIndexName($collection);
@@ -376,11 +376,11 @@  discard block
 block discarded – undo
376 376
 
377 377
         for ($i = 0; $i < $count; $i++) {
378 378
             // Build the next part to add
379
-            $nextPart = ($i === 0 ? '' : $delimiter) . $metadataAuthor[$i];
379
+            $nextPart = ($i === 0 ? '' : $delimiter).$metadataAuthor[$i];
380 380
             // Check if adding this part and ellipsis in future would exceed the character limit
381
-            if (strlen($authors . $nextPart . $delimiter . $ellipsis) > 255) {
381
+            if (strlen($authors.$nextPart.$delimiter.$ellipsis) > 255) {
382 382
                 // Add ellipsis and stop adding more authors
383
-                $authors .= $delimiter . $ellipsis;
383
+                $authors .= $delimiter.$ellipsis;
384 384
                 break;
385 385
             }
386 386
             // Add the part to the main string
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
  *
41 41
  * @access public
42 42
  */
43
-class BaseCommand extends Command
44
-{
43
+class BaseCommand extends Command {
45 44
     /**
46 45
      * @access protected
47 46
      * @var CollectionRepository
Please login to merge, or discard this patch.
Upper-Lower-Casing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
     protected function saveToDatabase(Document $document): bool
202 202
     {
203 203
         $doc = $document->getCurrentDocument();
204
-        if ($doc === null) {
205
-            return false;
204
+        if ($doc === NULL) {
205
+            return FALSE;
206 206
         }
207 207
 
208 208
         $doc->cPid = $this->storagePid;
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
                 $document->setPartof($this->getParentDocumentUidForSaving($document));
259 259
             }
260 260
 
261
-            if ($document->getUid() === null) {
261
+            if ($document->getUid() === NULL) {
262 262
                 // new document
263 263
                 $this->documentRepository->add($document);
264 264
             } else {
@@ -268,10 +268,10 @@  discard block
 block discarded – undo
268 268
 
269 269
             $this->persistenceManager->persistAll();
270 270
 
271
-            return true;
271
+            return TRUE;
272 272
         }
273 273
 
274
-        return false;
274
+        return FALSE;
275 275
     }
276 276
 
277 277
     /**
@@ -288,14 +288,14 @@  discard block
 block discarded – undo
288 288
     {
289 289
         $doc = $document->getCurrentDocument();
290 290
 
291
-        if ($doc !== null && !empty($doc->parentHref)) {
291
+        if ($doc !== NULL && !empty($doc->parentHref)) {
292 292
             // find document object by record_id of parent
293 293
             $parent = AbstractDocument::getInstance($doc->parentHref, ['storagePid' => $this->storagePid]);
294 294
 
295 295
             if ($parent->recordId) {
296 296
                 $parentDocument = $this->documentRepository->findOneByRecordId($parent->recordId);
297 297
 
298
-                if ($parentDocument === null) {
298
+                if ($parentDocument === NULL) {
299 299
                     // create new Document object
300 300
                     $parentDocument = GeneralUtility::makeInstance(Document::class);
301 301
                 }
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 
308 308
                 $success = $this->saveToDatabase($parentDocument);
309 309
 
310
-                if ($success === true) {
310
+                if ($success === TRUE) {
311 311
                     // add to index
312 312
                     Indexer::add($parentDocument, $this->documentRepository);
313 313
                     return $parentDocument->getUid();
Please login to merge, or discard this patch.
Classes/Command/HarvestCommand.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,8 +33,7 @@
 block discarded – undo
33 33
  *
34 34
  * @access public
35 35
  */
36
-class HarvestCommand extends BaseCommand
37
-{
36
+class HarvestCommand extends BaseCommand {
38 37
     /**
39 38
      * Configure the command by defining the name, options and arguments
40 39
      *
Please login to merge, or discard this patch.
Upper-Lower-Casing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             ->setHelp('')
50 50
             ->addOption(
51 51
                 'dry-run',
52
-                null,
52
+                NULL,
53 53
                 InputOption::VALUE_NONE,
54 54
                 'If this option is set, the files will not actually be processed but the location URIs are shown.'
55 55
             )
@@ -73,19 +73,19 @@  discard block
 block discarded – undo
73 73
             )
74 74
             ->addOption(
75 75
                 'from',
76
-                null,
76
+                NULL,
77 77
                 InputOption::VALUE_OPTIONAL,
78 78
                 'Datestamp (YYYY-MM-DD) to begin harvesting from.'
79 79
             )
80 80
             ->addOption(
81 81
                 'until',
82
-                null,
82
+                NULL,
83 83
                 InputOption::VALUE_OPTIONAL,
84 84
                 'Datestamp (YYYY-MM-DD) to end harvesting on.'
85 85
             )
86 86
             ->addOption(
87 87
                 'set',
88
-                null,
88
+                NULL,
89 89
                 InputOption::VALUE_OPTIONAL,
90 90
                 'Name of the set to limit harvesting to.'
91 91
             );
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
      */
104 104
     protected function execute(InputInterface $input, OutputInterface $output): int
105 105
     {
106
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
106
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
107 107
 
108 108
         $io = new SymfonyStyle($input, $output);
109 109
         $io->title($this->getDescription());
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         ) {
172 172
             $from = new \DateTime($input->getOption('from'));
173 173
         } else {
174
-            $from = null;
174
+            $from = NULL;
175 175
         }
176 176
 
177 177
         if (
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
         ) {
181 181
             $until = new \DateTime($input->getOption('until'));
182 182
         } else {
183
-            $until = null;
183
+            $until = NULL;
184 184
         }
185 185
 
186
-        $set = null;
186
+        $set = NULL;
187 187
         if (
188 188
             !is_array($input->getOption('set'))
189 189
             && !empty($input->getOption('set'))
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
             ];
226 226
             $docLocation = $baseLocation . http_build_query($params);
227 227
             // ...index the document...
228
-            $document = null;
229
-            $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
228
+            $document = NULL;
229
+            $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], TRUE);
230 230
 
231
-            if ($doc === null) {
231
+            if ($doc === NULL) {
232 232
                 $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
233 233
                 continue;
234 234
             }
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                 $document = $this->documentRepository->findOneByRecordId($doc->recordId);
238 238
             }
239 239
 
240
-            if ($document === null) {
240
+            if ($document === NULL) {
241 241
                 // create new Document object
242 242
                 $document = GeneralUtility::makeInstance(Document::class);
243 243
             }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $this->initializeRepositories((int) $input->getOption('pid'));
112 112
 
113 113
         if ($this->storagePid == 0) {
114
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
114
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
115 115
             return BaseCommand::FAILURE;
116 116
         }
117 117
 
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
130 130
                 $output_solrCores = [];
131 131
                 foreach ($allSolrCores as $index_name => $uid) {
132
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
132
+                    $output_solrCores[] = $uid.' : '.$index_name;
133 133
                 }
134 134
                 if (empty($output_solrCores)) {
135
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
135
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
136 136
                     return BaseCommand::FAILURE;
137 137
                 } else {
138
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
138
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
139 139
                     return BaseCommand::FAILURE;
140 140
                 }
141 141
             }
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             return BaseCommand::FAILURE;
156 156
         }
157 157
         if (!GeneralUtility::isValidUrl($baseUrl)) {
158
-            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("' . $input->getOption('lib') . '").');
158
+            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("'.$input->getOption('lib').'").');
159 159
             return BaseCommand::FAILURE;
160 160
         } else {
161 161
             try {
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                 }
198 198
             }
199 199
             if (empty($set)) {
200
-                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("' . $input->getOption('set') . '").');
200
+                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("'.$input->getOption('set').'").');
201 201
                 return BaseCommand::FAILURE;
202 202
             }
203 203
         }
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
         }
216 216
 
217 217
         // Process all identifiers.
218
-        $baseLocation = $baseUrl . (parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
218
+        $baseLocation = $baseUrl.(parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
219 219
         foreach ($identifiers as $identifier) {
220 220
             // Build OAI GetRecord URL...
221 221
             $params = [
@@ -223,13 +223,13 @@  discard block
 block discarded – undo
223 223
                 'metadataPrefix' => 'mets',
224 224
                 'identifier' => (string) $identifier->identifier
225 225
             ];
226
-            $docLocation = $baseLocation . http_build_query($params);
226
+            $docLocation = $baseLocation.http_build_query($params);
227 227
             // ...index the document...
228 228
             $document = null;
229 229
             $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
230 230
 
231 231
             if ($doc === null) {
232
-                $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
232
+                $io->warning('WARNING: Document "'.$docLocation.'" could not be loaded. Skip to next document.');
233 233
                 continue;
234 234
             }
235 235
 
@@ -246,10 +246,10 @@  discard block
 block discarded – undo
246 246
             $document->setSolrcore($solrCoreUid);
247 247
 
248 248
             if ($dryRun) {
249
-                $io->writeln('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
249
+                $io->writeln('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
250 250
             } else {
251 251
                 if ($io->isVerbose()) {
252
-                    $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
252
+                    $io->writeln(date('Y-m-d H:i:s').' Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
253 253
                 }
254 254
                 $document->setCurrentDocument($doc);
255 255
                 // save to database
@@ -276,6 +276,6 @@  discard block
 block discarded – undo
276 276
      */
277 277
     protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io): void
278 278
     {
279
-        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n    " . $exception->getMessage());
279
+        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:'."\n    ".$exception->getMessage());
280 280
     }
281 281
 }
Please login to merge, or discard this patch.
Classes/Command/IndexCommand.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,7 @@
 block discarded – undo
31 31
  *
32 32
  * @access public
33 33
  */
34
-class IndexCommand extends BaseCommand
35
-{
34
+class IndexCommand extends BaseCommand {
36 35
 
37 36
     /**
38 37
      * Configure the command by defining the name, options and arguments
Please login to merge, or discard this patch.
Upper-Lower-Casing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             ->setHelp('')
49 49
             ->addOption(
50 50
                 'dry-run',
51
-                null,
51
+                NULL,
52 52
                 InputOption::VALUE_NONE,
53 53
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
54 54
             )
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
      */
91 91
     protected function execute(InputInterface $input, OutputInterface $output): int
92 92
     {
93
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
93
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
94 94
 
95 95
         $io = new SymfonyStyle($input, $output);
96 96
         $io->title($this->getDescription());
@@ -147,31 +147,31 @@  discard block
 block discarded – undo
147 147
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
148 148
             }
149 149
         } else {
150
-            $this->owner = null;
150
+            $this->owner = NULL;
151 151
         }
152 152
 
153
-        $document = null;
154
-        $doc = null;
153
+        $document = NULL;
154
+        $doc = NULL;
155 155
 
156 156
         // Try to find existing document in database
157 157
         if (MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))) {
158 158
 
159 159
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
160 160
 
161
-            if ($document === null) {
161
+            if ($document === NULL) {
162 162
                 $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
163 163
                 exit(1);
164 164
             } else {
165
-                $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
165
+                $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
166 166
             }
167 167
 
168 168
         } else if (GeneralUtility::isValidUrl($input->getOption('doc'))) {
169
-            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
169
+            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], TRUE);
170 170
 
171 171
             $document = $this->getDocumentFromUrl($doc, $input->getOption('doc'));
172 172
         }
173 173
 
174
-        if ($doc === null) {
174
+        if ($doc === NULL) {
175 175
             $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
176 176
             return BaseCommand::FAILURE;
177 177
         }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
      */
209 209
     private function getDocumentFromUrl($doc, string $url): Document
210 210
     {
211
-        $document = null;
211
+        $document = NULL;
212 212
 
213 213
         if ($doc->recordId) {
214 214
             $document = $this->documentRepository->findOneByRecordId($doc->recordId);
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
             $document = $this->documentRepository->findOneByLocation($url);
217 217
         }
218 218
 
219
-        if ($document === null) {
219
+        if ($document === NULL) {
220 220
             // create new Document object
221 221
             $document = GeneralUtility::makeInstance(Document::class);
222 222
         }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         $this->initializeRepositories((int) $input->getOption('pid'));
99 99
 
100 100
         if ($this->storagePid == 0) {
101
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
101
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
102 102
             return BaseCommand::FAILURE;
103 103
         }
104 104
 
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
114 114
                 $output_solrCores = [];
115 115
                 foreach ($allSolrCores as $index_name => $uid) {
116
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
116
+                    $output_solrCores[] = $uid.' : '.$index_name;
117 117
                 }
118 118
                 if (empty($output_solrCores)) {
119
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
119
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
120 120
                     return BaseCommand::FAILURE;
121 121
                 } else {
122
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
122
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
123 123
                     return BaseCommand::FAILURE;
124 124
                 }
125 125
             }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
160 160
 
161 161
             if ($document === null) {
162
-                $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
162
+                $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .');
163 163
                 exit(1);
164 164
             } else {
165 165
                 $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
@@ -172,31 +172,31 @@  discard block
 block discarded – undo
172 172
         }
173 173
 
174 174
         if ($doc === null) {
175
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
175
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
176 176
             return BaseCommand::FAILURE;
177 177
         }
178 178
 
179 179
         $document->setSolrcore($solrCoreUid);
180 180
 
181 181
         if ($dryRun) {
182
-            $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
182
+            $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
183 183
             $io->success('All done!');
184 184
             return BaseCommand::SUCCESS;
185 185
         } else {
186 186
             $document->setCurrentDocument($doc);
187 187
 
188 188
             if ($io->isVerbose()) {
189
-                $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . '.');
189
+                $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.'.');
190 190
             }
191 191
             $isSaved = $this->saveToDatabase($document);
192 192
 
193 193
             if ($isSaved) {
194 194
                 if ($io->isVerbose()) {
195
-                    $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on Solr core ' . $solrCoreUid . '.');
195
+                    $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on Solr core '.$solrCoreUid.'.');
196 196
                 }
197 197
                 $isSaved = Indexer::add($document, $this->documentRepository);
198 198
             } else {
199
-                $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on PID ' . $this->storagePid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['requiredMetadataFields'] . ') in this document.');
199
+                $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on PID '.$this->storagePid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['requiredMetadataFields'].') in this document.');
200 200
                 return BaseCommand::FAILURE;
201 201
             }
202 202
 
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
                 return BaseCommand::SUCCESS;
206 206
             }
207 207
 
208
-            $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on Solr core ' . $solrCoreUid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['requiredMetadataFields'] . ') in this document.');
209
-            $io->info('INFO: Document with UID "' . $document->getUid() . '" is already in database. If you want to keep the database and index consistent you need to remove it.');
208
+            $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on Solr core '.$solrCoreUid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['requiredMetadataFields'].') in this document.');
209
+            $io->info('INFO: Document with UID "'.$document->getUid().'" is already in database. If you want to keep the database and index consistent you need to remove it.');
210 210
             return BaseCommand::FAILURE;
211 211
         }
212 212
     }
Please login to merge, or discard this patch.
Classes/Domain/Repository/StructureRepository.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,6 @@
 block discarded – undo
22 22
  *
23 23
  * @access public
24 24
  */
25
-class StructureRepository extends Repository
26
-{
25
+class StructureRepository extends Repository {
27 26
 
28 27
 }
Please login to merge, or discard this patch.
Classes/Domain/Repository/MetadataRepository.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
  *
25 25
  * @access public
26 26
  */
27
-class MetadataRepository extends Repository
28
-{
27
+class MetadataRepository extends Repository {
29 28
     /**
30 29
      * Finds all collection for the given settings
31 30
      *
Please login to merge, or discard this patch.
Classes/Domain/Repository/FormatRepository.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,6 @@
 block discarded – undo
22 22
  *
23 23
  * @access public
24 24
  */
25
-class FormatRepository extends Repository
26
-{
25
+class FormatRepository extends Repository {
27 26
 
28 27
 }
Please login to merge, or discard this patch.
Classes/Domain/Repository/TokenRepository.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,7 @@
 block discarded – undo
22 22
  *
23 23
  * @access public
24 24
  */
25
-class TokenRepository extends Repository
26
-{
25
+class TokenRepository extends Repository {
27 26
     /**
28 27
      * Delete all expired token
29 28
      *
Please login to merge, or discard this patch.