Erikmitk / kitodo-presentation

Classes/Common/AbstractDocument.php

Spacing +13 added lines, -13 removed lines

@@ -664,14 +664,14 @@ 
                     if ($fileContent !== false) {
                         $textFormat = $this->getTextFormat($fileContent);
                     } else {
-                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
+                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "'.$id.'"');
                         return $fullText;
                     }
                     break;
                 }
             }
         } else {
-            $this->logger->warning('Invalid structure node @ID "' . $id . '"');
+            $this->logger->warning('Invalid structure node @ID "'.$id.'"');
             return $fullText;
         }
         // Is this text format supported?
@@ -683,7 +683,7 @@ 
             }
             $fullText = $textMiniOcr;
         } else {
-            $this->logger->warning('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"');
+            $this->logger->warning('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"');
         }
         return $fullText;
     }
@@ -712,10 +712,10 @@ 
                 $textMiniOcr = $obj->getTextAsMiniOcr($ocrTextXml);
                 $this->rawTextArray[$id] = $textMiniOcr;
             } else {
-                $this->logger->warning('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"');
+                $this->logger->warning('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"');
             }
         } else {
-            $this->logger->warning('Class "' . $class . ' does not exists for "' . $textFormat . ' text format"');
+            $this->logger->warning('Class "'.$class.' does not exists for "'.$textFormat.' text format"');
         }
         return $textMiniOcr;
     }
@@ -790,10 +790,10 @@ 
                     $title = self::getTitle($partof, true);
                 }
             } else {
-                Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING);
+                Helper::log('No document with UID '.$uid.' found or document not accessible', LOG_SEVERITY_WARNING);
             }
         } else {
-            Helper::log('Invalid UID ' . $uid . ' for document', LOG_SEVERITY_ERROR);
+            Helper::log('Invalid UID '.$uid.' for document', LOG_SEVERITY_ERROR);
         }
         return $title;
     }
@@ -883,7 +883,7 @@ 
             // the actual loading is format specific
             return $this->loadLocation($location);
         } else {
-            $this->logger->error('Invalid file location "' . $location . '" for document loading');
+            $this->logger->error('Invalid file location "'.$location.'" for document loading');
         }
         return false;
     }
@@ -1035,7 +1035,7 @@ 
         // Set metadata definitions' PID.
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
         if (!$cPid) {
-            $this->logger->error('Invalid PID ' . $cPid . ' for metadata definitions');
+            $this->logger->error('Invalid PID '.$cPid.' for metadata definitions');
             return [];
         }
         if (
@@ -1212,12 +1212,12 @@ 
      */
     public function __get(string $var)
     {
-        $method = 'magicGet' . ucfirst($var);
+        $method = 'magicGet'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no getter function for property "' . $var . '"');
+            $this->logger->warning('There is no getter function for property "'.$var.'"');
             return null;
         } else {
             return $this->$method();
@@ -1250,12 +1250,12 @@ 
      */
     public function __set(string $var, $value): void
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no setter function for property "' . $var . '"');
+            $this->logger->warning('There is no setter function for property "'.$var.'"');
         } else {
             $this->$method($value);
         }

Braces +7 added lines, -14 removed lines

@@ -57,8 +57,7 @@ 
  * @property-read string $toplevelId this holds the toplevel structure's "@ID" (METS) or the manifest's "@id" (IIIF)
  * @property \SimpleXMLElement $xml this holds the whole XML file as \SimpleXMLElement object
  */
-abstract class AbstractDocument
-{
+abstract class AbstractDocument {
     /**
      * @access protected
      * @var Logger This holds the logger
@@ -838,8 +837,7 @@ 
      * @return int|bool false if structure with $logId is not a child of this substructure,
      * or the actual depth.
      */
-    protected function getTreeDepth(array $structure, int $depth, string $logId)
-    {
+    protected function getTreeDepth(array $structure, int $depth, string $logId) {
         foreach ($structure as $element) {
             if ($element['id'] == $logId) {
                 return $depth;
@@ -862,8 +860,7 @@ 
      *
      * @return int|bool tree depth as integer or false if no element with $logId exists within the TOC.
      */
-    public function getStructureDepth(string $logId)
-    {
+    public function getStructureDepth(string $logId) {
         return $this->getTreeDepth($this->magicGetTableOfContents(), 1, $logId);
     }
 
@@ -1122,8 +1119,7 @@ 
      *
      * @return mixed The METS file's / IIIF manifest's record identifier
      */
-    protected function magicGetRecordId()
-    {
+    protected function magicGetRecordId() {
         return $this->recordId;
     }
 
@@ -1193,8 +1189,7 @@ 
      *
      * @return void
      */
-    protected function __construct(int $pid, string $location, $preloadedDocument, array $settings = [])
-    {
+    protected function __construct(int $pid, string $location, $preloadedDocument, array $settings = []) {
         $this->pid = $pid;
         $this->setPreloadedDocument($preloadedDocument);
         $this->init($location, $settings);
@@ -1210,8 +1205,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get(string $var)
-    {
+    public function __get(string $var) {
         $method = 'magicGet' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -1272,8 +1266,7 @@ 
      *
      * @return AbstractDocument|false
      */
-    private static function getDocumentCache(string $location)
-    {
+    private static function getDocumentCache(string $location) {
         $cacheIdentifier = hash('md5', $location);
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_doc');
         $cacheHit = $cache->get($cacheIdentifier);

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

@@ -111,7 +111,7 @@ 
      *
      * @see $formats
      */
-    protected bool $formatsLoaded = false;
+    protected bool $formatsLoaded = FALSE;
 
     /**
      * Are there any fulltext files available? This also includes IIIF text annotations
@@ -121,13 +121,13 @@ 
      * @access protected
      * @var bool
      */
-    protected bool $hasFulltext = false;
+    protected bool $hasFulltext = FALSE;
 
     /**
      * @access protected
      * @var array Last searched logical and physical page
      */
-    protected array $lastSearchedPhysicalPage = ['logicalPage' => null, 'physicalPage' => null];
+    protected array $lastSearchedPhysicalPage = ['logicalPage' => NULL, 'physicalPage' => NULL];
 
     /**
      * @access protected
@@ -150,7 +150,7 @@ 
      *
      * @see $metadataArray
      */
-    protected bool $metadataArrayLoaded = false;
+    protected bool $metadataArrayLoaded = FALSE;
 
     /**
      * @access protected
@@ -182,7 +182,7 @@ 
      *
      * @see $physicalStructure
      */
-    protected bool $physicalStructureLoaded = false;
+    protected bool $physicalStructureLoaded = FALSE;
 
     /**
      * @access protected
@@ -203,7 +203,7 @@ 
      * @access protected
      * @var bool Is the document instantiated successfully?
      */
-    protected bool $ready = false;
+    protected bool $ready = FALSE;
 
     /**
      * @access protected
@@ -223,7 +223,7 @@ 
      *
      * @see $rootId
      */
-    protected bool $rootIdLoaded = false;
+    protected bool $rootIdLoaded = FALSE;
 
     /**
      * @access protected
@@ -237,7 +237,7 @@ 
      *
      * @see $smLinks
      */
-    protected bool $smLinksLoaded = false;
+    protected bool $smLinksLoaded = FALSE;
 
     /**
      * This holds the logical structure
@@ -253,7 +253,7 @@ 
      *
      * @see $tableOfContents
      */
-    protected bool $tableOfContentsLoaded = false;
+    protected bool $tableOfContentsLoaded = FALSE;
 
     /**
      * @access protected
@@ -267,7 +267,7 @@ 
      *
      * @see $thumbnail
      */
-    protected bool $thumbnailLoaded = false;
+    protected bool $thumbnailLoaded = FALSE;
 
     /**
      * @access protected
@@ -361,7 +361,7 @@ 
      *
      * @return array Array of the element's id, label, type and physical page indexes/mptr link
      */
-    abstract public function getLogicalStructure(string $id, bool $recursive = false): array;
+    abstract public function getLogicalStructure(string $id, bool $recursive = FALSE): array;
 
     /**
      * This extracts all the metadata for a logical structure node
@@ -449,7 +449,7 @@ 
      *
      * @return string The document's thumbnail location
      */
-    abstract protected function magicGetThumbnail(bool $forceReload = false): string;
+    abstract protected function magicGetThumbnail(bool $forceReload = FALSE): string;
 
     /**
      * This returns the ID of the toplevel logical structure node
@@ -528,21 +528,21 @@ 
      *
      * @return AbstractDocument|null Instance of this class, either MetsDocument or IiifManifest
      */
-    public static function &getInstance(string $location, array $settings = [], bool $forceReload = false)
+    public static function &getInstance(string $location, array $settings = [], bool $forceReload = FALSE)
     {
         // Create new instance depending on format (METS or IIIF) ...
-        $documentFormat = null;
-        $xml = null;
-        $iiif = null;
+        $documentFormat = NULL;
+        $xml = NULL;
+        $iiif = NULL;
 
         if (!$forceReload) {
             $instance = self::getDocumentCache($location);
-            if ($instance !== false) {
+            if ($instance !== FALSE) {
                 return $instance;
             }
         }
 
-        $instance = null;
+        $instance = NULL;
 
         // Try to load a file from the url
         if (GeneralUtility::isValidUrl($location)) {
@@ -550,17 +550,17 @@ 
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
 
             $content = Helper::getUrl($location);
-            if ($content !== false) {
+            if ($content !== FALSE) {
                 $xml = Helper::getXmlFileAsString($content);
-                if ($xml !== false) {
+                if ($xml !== FALSE) {
                     /* @var $xml \SimpleXMLElement */
                     $xml->registerXPathNamespace('mets', 'http://www.loc.gov/METS/');
                     $xpathResult = $xml->xpath('//mets:mets');
-                    $documentFormat = !empty($xpathResult) ? 'METS' : null;
+                    $documentFormat = !empty($xpathResult) ? 'METS' : NULL;
                 } else {
                     // Try to load file as IIIF resource instead.
-                    $contentAsJsonArray = json_decode($content, true);
-                    if ($contentAsJsonArray !== null) {
+                    $contentAsJsonArray = json_decode($content, TRUE);
+                    if ($contentAsJsonArray !== NULL) {
                         IiifHelper::setUrlReader(IiifUrlReader::getInstance());
                         IiifHelper::setMaxThumbnailHeight($extConf['iiif']['thumbnailHeight']);
                         IiifHelper::setMaxThumbnailWidth($extConf['iiif']['thumbnailWidth']);
@@ -583,7 +583,7 @@ 
             $instance = new IiifManifest($pid, $location, $iiif);
         }
 
-        if ($instance !== null) {
+        if ($instance !== NULL) {
             self::setDocumentCache($location, $instance);
         }
 
@@ -624,7 +624,7 @@ 
         } else {
             $physicalPage = 0;
             foreach ($this->physicalStructureInfo as $page) {
-                if (strpos($page['orderlabel'], $logicalPage) !== false) {
+                if (strpos($page['orderlabel'], $logicalPage) !== FALSE) {
                     $this->lastSearchedPhysicalPage['logicalPage'] = $logicalPage;
                     $this->lastSearchedPhysicalPage['physicalPage'] = $physicalPage;
                     return $physicalPage;
@@ -661,7 +661,7 @@ 
                 if (!empty($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext])) {
                     // Get full text file.
                     $fileContent = GeneralUtility::getUrl($this->getFileLocation($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext]));
-                    if ($fileContent !== false) {
+                    if ($fileContent !== FALSE) {
                         $textFormat = $this->getTextFormat($fileContent);
                     } else {
                         $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
@@ -733,7 +733,7 @@ 
     {
         $xml = Helper::getXmlFileAsString($fileContent);
 
-        if ($xml !== false) {
+        if ($xml !== FALSE) {
             // Get the root element's name as text format.
             return strtoupper($xml->getName());
         } else {
@@ -753,7 +753,7 @@ 
      *
      * @return string The title of the document itself or a parent document
      */
-    public static function getTitle(int $uid, bool $recursive = false): string
+    public static function getTitle(int $uid, bool $recursive = FALSE): string
     {
         $title = '';
         // Sanitize input.
@@ -787,7 +787,7 @@ 
                     && (int) $partof
                     && $partof != $uid
                 ) {
-                    $title = self::getTitle($partof, true);
+                    $title = self::getTitle($partof, TRUE);
                 }
             } else {
                 Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING);
@@ -845,12 +845,12 @@ 
                 return $depth;
             } elseif (array_key_exists('children', $element)) {
                 $foundInChildren = $this->getTreeDepth($element['children'], $depth + 1, $logId);
-                if ($foundInChildren !== false) {
+                if ($foundInChildren !== FALSE) {
                     return $foundInChildren;
                 }
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -885,7 +885,7 @@ 
         } else {
             $this->logger->error('Invalid file location "' . $location . '" for document loading');
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -923,7 +923,7 @@ 
                     'class' => $resArray['class']
                 ];
             }
-            $this->formatsLoaded = true;
+            $this->formatsLoaded = TRUE;
         }
     }
 
@@ -1044,7 +1044,7 @@ 
         ) {
             $this->prepareMetadataArray($cPid);
             $this->metadataArray[0] = $cPid;
-            $this->metadataArrayLoaded = true;
+            $this->metadataArrayLoaded = TRUE;
         }
         return $this->metadataArray;
     }
@@ -1143,7 +1143,7 @@ 
                 $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]);
                 $this->rootId = $parent->rootId;
             }
-            $this->rootIdLoaded = true;
+            $this->rootIdLoaded = TRUE;
         }
         return $this->rootId;
     }
@@ -1160,8 +1160,8 @@ 
         // Is there no logical structure array yet?
         if (!$this->tableOfContentsLoaded) {
             // Get all logical structures.
-            $this->getLogicalStructure('', true);
-            $this->tableOfContentsLoaded = true;
+            $this->getLogicalStructure('', TRUE);
+            $this->tableOfContentsLoaded = TRUE;
         }
         return $this->tableOfContents;
     }
@@ -1218,7 +1218,7 @@ 
             || !method_exists($this, $method)
         ) {
             $this->logger->warning('There is no getter function for property "' . $var . '"');
-            return null;
+            return NULL;
         } else {
             return $this->$method();
         }

Classes/Command/ReindexCommand.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
  *
  * @access public
  */
-class ReindexCommand extends BaseCommand
-{
+class ReindexCommand extends BaseCommand {
     /**
      * Configure the command by defining the name, options and arguments
      *

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

@@ -46,7 +46,7 @@ 
             ->setHelp('')
             ->addOption(
                 'dry-run',
-                null,
+                NULL,
                 InputOption::VALUE_NONE,
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
             )
@@ -106,7 +106,7 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
 
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());
@@ -151,7 +151,7 @@ 
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
             }
         } else {
-            $this->owner = null;
+            $this->owner = NULL;
         }
 
         if (!empty($input->getOption('all'))) {
@@ -174,7 +174,7 @@ 
             !empty($input->getOption('coll'))
             && !is_array($input->getOption('coll'))
         ) {
-            $collections = GeneralUtility::intExplode(',', $input->getOption('coll'), true);
+            $collections = GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE);
             // "coll" may be a single integer or a comma-separated list of integers.
             if (empty(array_filter($collections))) {
                 $io->error('ERROR: Parameter --coll|-c is not a valid comma-separated list of collection UIDs.');
@@ -198,9 +198,9 @@ 
         }
 
         foreach ($documents as $id => $document) {
-            $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
 
-            if ($doc === null) {
+            if ($doc === NULL) {
                 $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
                 continue;
             }

Spacing +9 added lines, -9 removed lines

@@ -114,7 +114,7 @@ 
         $this->initializeRepositories((int) $input->getOption('pid'));
 
         if ($this->storagePid == 0) {
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
             return BaseCommand::FAILURE;
         }
 
@@ -129,13 +129,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $outputSolrCores = [];
                 foreach ($allSolrCores as $indexName => $uid) {
-                    $outputSolrCores[] = $uid . ' : ' . $indexName;
+                    $outputSolrCores[] = $uid.' : '.$indexName;
                 }
                 if (empty($outputSolrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
                     return BaseCommand::FAILURE;
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n");
                     return BaseCommand::FAILURE;
                 }
             }
@@ -165,7 +165,7 @@ 
                     ->setLimit((int) $input->getOption('index-limit'))
                     ->setOffset((int) $input->getOption('index-begin'))
                     ->execute();
-                $io->writeln($input->getOption('index-limit') . ' documents starting from ' . $input->getOption('index-begin') . ' will be indexed.');
+                $io->writeln($input->getOption('index-limit').' documents starting from '.$input->getOption('index-begin').' will be indexed.');
             } else {
                 // Get all documents.
                 $documents = $this->documentRepository->findAll();
@@ -187,7 +187,7 @@ 
             ) {
                 $documents = $this->documentRepository->findAllByCollectionsLimited($collections, (int) $input->getOption('index-limit'), (int) $input->getOption('index-begin'));
 
-                $io->writeln($input->getOption('index-limit') . ' documents starting from ' . $input->getOption('index-begin') . ' will be indexed.');
+                $io->writeln($input->getOption('index-limit').' documents starting from '.$input->getOption('index-begin').' will be indexed.');
             } else {
                 // Get all documents of given collections.
                 $documents = $this->documentRepository->findAllByCollectionsLimited($collections, 0);
@@ -201,15 +201,15 @@ 
             $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
 
             if ($doc === null) {
-                $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
+                $io->warning('WARNING: Document "'.$document->getLocation().'" could not be loaded. Skip to next document.');
                 continue;
             }
 
             if ($dryRun) {
-                $io->writeln('DRY RUN: Would index ' . ($id + 1) . '/' . count($documents) . '  with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
+                $io->writeln('DRY RUN: Would index '.($id + 1).'/'.count($documents).'  with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
             } else {
                 if ($io->isVerbose()) {
-                    $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 . '.');
+                    $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.'.');
                 }
                 $document->setCurrentDocument($doc);
                 // save to database

Classes/Command/BaseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -334,7 +334,7 @@ 
      *
      * @return void
      */
-    private function addCollections(Document &$document, array $collections): void
+    private function addCollections(Document & $document, array $collections): void
     {
         foreach ($collections as $collection) {
             $documentCollection = $this->collectionRepository->findOneByIndexName($collection);
@@ -376,11 +376,11 @@ 
 
         for ($i = 0; $i < $count; $i++) {
             // Build the next part to add
-            $nextPart = ($i === 0 ? '' : $delimiter) . $metadataAuthor[$i];
+            $nextPart = ($i === 0 ? '' : $delimiter).$metadataAuthor[$i];
             // Check if adding this part and ellipsis in future would exceed the character limit
-            if (strlen($authors . $nextPart . $delimiter . $ellipsis) > 255) {
+            if (strlen($authors.$nextPart.$delimiter.$ellipsis) > 255) {
                 // Add ellipsis and stop adding more authors
-                $authors .= $delimiter . $ellipsis;
+                $authors .= $delimiter.$ellipsis;
                 break;
             }
             // Add the part to the main string

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
  *
  * @access public
  */
-class BaseCommand extends Command
-{
+class BaseCommand extends Command {
     /**
      * @access protected
      * @var CollectionRepository

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

@@ -201,8 +201,8 @@ 
     protected function saveToDatabase(Document $document): bool
     {
         $doc = $document->getCurrentDocument();
-        if ($doc === null) {
-            return false;
+        if ($doc === NULL) {
+            return FALSE;
         }
 
         $doc->cPid = $this->storagePid;
@@ -258,7 +258,7 @@ 
                 $document->setPartof($this->getParentDocumentUidForSaving($document));
             }
 
-            if ($document->getUid() === null) {
+            if ($document->getUid() === NULL) {
                 // new document
                 $this->documentRepository->add($document);
             } else {
@@ -268,10 +268,10 @@ 
 
             $this->persistenceManager->persistAll();
 
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -288,14 +288,14 @@ 
     {
         $doc = $document->getCurrentDocument();
 
-        if ($doc !== null && !empty($doc->parentHref)) {
+        if ($doc !== NULL && !empty($doc->parentHref)) {
             // find document object by record_id of parent
             $parent = AbstractDocument::getInstance($doc->parentHref, ['storagePid' => $this->storagePid]);
 
             if ($parent->recordId) {
                 $parentDocument = $this->documentRepository->findOneByRecordId($parent->recordId);
 
-                if ($parentDocument === null) {
+                if ($parentDocument === NULL) {
                     // create new Document object
                     $parentDocument = GeneralUtility::makeInstance(Document::class);
                 }
@@ -307,7 +307,7 @@ 
 
                 $success = $this->saveToDatabase($parentDocument);
 
-                if ($success === true) {
+                if ($success === TRUE) {
                     // add to index
                     Indexer::add($parentDocument, $this->documentRepository);
                     return $parentDocument->getUid();

Classes/Command/HarvestCommand.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
  *
  * @access public
  */
-class HarvestCommand extends BaseCommand
-{
+class HarvestCommand extends BaseCommand {
     /**
      * Configure the command by defining the name, options and arguments
      *

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

@@ -49,7 +49,7 @@ 
             ->setHelp('')
             ->addOption(
                 'dry-run',
-                null,
+                NULL,
                 InputOption::VALUE_NONE,
                 'If this option is set, the files will not actually be processed but the location URIs are shown.'
             )
@@ -73,19 +73,19 @@ 
             )
             ->addOption(
                 'from',
-                null,
+                NULL,
                 InputOption::VALUE_OPTIONAL,
                 'Datestamp (YYYY-MM-DD) to begin harvesting from.'
             )
             ->addOption(
                 'until',
-                null,
+                NULL,
                 InputOption::VALUE_OPTIONAL,
                 'Datestamp (YYYY-MM-DD) to end harvesting on.'
             )
             ->addOption(
                 'set',
-                null,
+                NULL,
                 InputOption::VALUE_OPTIONAL,
                 'Name of the set to limit harvesting to.'
             );
@@ -103,7 +103,7 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
 
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());
@@ -171,7 +171,7 @@ 
         ) {
             $from = new \DateTime($input->getOption('from'));
         } else {
-            $from = null;
+            $from = NULL;
         }
 
         if (
@@ -180,10 +180,10 @@ 
         ) {
             $until = new \DateTime($input->getOption('until'));
         } else {
-            $until = null;
+            $until = NULL;
         }
 
-        $set = null;
+        $set = NULL;
         if (
             !is_array($input->getOption('set'))
             && !empty($input->getOption('set'))
@@ -225,10 +225,10 @@ 
             ];
             $docLocation = $baseLocation . http_build_query($params);
             // ...index the document...
-            $document = null;
-            $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
+            $document = NULL;
+            $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], TRUE);
 
-            if ($doc === null) {
+            if ($doc === NULL) {
                 $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
                 continue;
             }
@@ -237,7 +237,7 @@ 
                 $document = $this->documentRepository->findOneByRecordId($doc->recordId);
             }
 
-            if ($document === null) {
+            if ($document === NULL) {
                 // create new Document object
                 $document = GeneralUtility::makeInstance(Document::class);
             }

Spacing +12 added lines, -12 removed lines

@@ -111,7 +111,7 @@ 
         $this->initializeRepositories((int) $input->getOption('pid'));
 
         if ($this->storagePid == 0) {
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
             return BaseCommand::FAILURE;
         }
 
@@ -129,13 +129,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $outputSolrCores = [];
                 foreach ($allSolrCores as $indexName => $uid) {
-                    $outputSolrCores[] = $uid . ' : ' . $indexName;
+                    $outputSolrCores[] = $uid.' : '.$indexName;
                 }
                 if (empty($outputSolrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
                     return BaseCommand::FAILURE;
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n");
                     return BaseCommand::FAILURE;
                 }
             }
@@ -155,7 +155,7 @@ 
             return BaseCommand::FAILURE;
         }
         if (!GeneralUtility::isValidUrl($baseUrl)) {
-            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("' . $input->getOption('lib') . '").');
+            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("'.$input->getOption('lib').'").');
             return BaseCommand::FAILURE;
         } else {
             try {
@@ -197,7 +197,7 @@ 
                 }
             }
             if (empty($set)) {
-                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("' . $input->getOption('set') . '").');
+                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("'.$input->getOption('set').'").');
                 return BaseCommand::FAILURE;
             }
         }
@@ -215,7 +215,7 @@ 
         }
 
         // Process all identifiers.
-        $baseLocation = $baseUrl . (parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
+        $baseLocation = $baseUrl.(parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
         foreach ($identifiers as $identifier) {
             // Build OAI GetRecord URL...
             $params = [
@@ -223,13 +223,13 @@ 
                 'metadataPrefix' => 'mets',
                 'identifier' => (string) $identifier->identifier
             ];
-            $docLocation = $baseLocation . http_build_query($params);
+            $docLocation = $baseLocation.http_build_query($params);
             // ...index the document...
             $document = null;
             $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
 
             if ($doc === null) {
-                $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
+                $io->warning('WARNING: Document "'.$docLocation.'" could not be loaded. Skip to next document.');
                 continue;
             }
 
@@ -246,10 +246,10 @@ 
             $document->setSolrcore($solrCoreUid);
 
             if ($dryRun) {
-                $io->writeln('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
+                $io->writeln('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
             } else {
                 if ($io->isVerbose()) {
-                    $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
+                    $io->writeln(date('Y-m-d H:i:s').' Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
                 }
                 $document->setCurrentDocument($doc);
                 // save to database
@@ -276,6 +276,6 @@ 
      */
     protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io): void
     {
-        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n    " . $exception->getMessage());
+        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:'."\n    ".$exception->getMessage());
     }
 }

Classes/Command/IndexCommand.php

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
  *
  * @access public
  */
-class IndexCommand extends BaseCommand
-{
+class IndexCommand extends BaseCommand {
 
     /**
      * Configure the command by defining the name, options and arguments

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

@@ -48,7 +48,7 @@ 
             ->setHelp('')
             ->addOption(
                 'dry-run',
-                null,
+                NULL,
                 InputOption::VALUE_NONE,
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
             )
@@ -90,7 +90,7 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
 
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());
@@ -147,31 +147,31 @@ 
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
             }
         } else {
-            $this->owner = null;
+            $this->owner = NULL;
         }
 
-        $document = null;
-        $doc = null;
+        $document = NULL;
+        $doc = NULL;
 
         // Try to find existing document in database
         if (MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))) {
 
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
 
-            if ($document === null) {
+            if ($document === NULL) {
                 $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
                 exit(1);
             } else {
-                $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
+                $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
             }
 
         } else if (GeneralUtility::isValidUrl($input->getOption('doc'))) {
-            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], TRUE);
 
             $document = $this->getDocumentFromUrl($doc, $input->getOption('doc'));
         }
 
-        if ($doc === null) {
+        if ($doc === NULL) {
             $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
             return BaseCommand::FAILURE;
         }
@@ -208,7 +208,7 @@ 
      */
     private function getDocumentFromUrl($doc, string $url): Document
     {
-        $document = null;
+        $document = NULL;
 
         if ($doc->recordId) {
             $document = $this->documentRepository->findOneByRecordId($doc->recordId);
@@ -216,7 +216,7 @@ 
             $document = $this->documentRepository->findOneByLocation($url);
         }
 
-        if ($document === null) {
+        if ($document === NULL) {
             // create new Document object
             $document = GeneralUtility::makeInstance(Document::class);
         }

Spacing +12 added lines, -12 removed lines

@@ -98,7 +98,7 @@ 
         $this->initializeRepositories((int) $input->getOption('pid'));
 
         if ($this->storagePid == 0) {
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
             return BaseCommand::FAILURE;
         }
 
@@ -113,13 +113,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $outputSolrCores = [];
                 foreach ($allSolrCores as $indexName => $uid) {
-                    $outputSolrCores[] = $uid . ' : ' . $indexName;
+                    $outputSolrCores[] = $uid.' : '.$indexName;
                 }
                 if (empty($outputSolrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
                     return BaseCommand::FAILURE;
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n");
                     return BaseCommand::FAILURE;
                 }
             }
@@ -159,7 +159,7 @@ 
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
 
             if ($document === null) {
-                $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
+                $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .');
                 exit(1);
             } else {
                 $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
@@ -172,31 +172,31 @@ 
         }
 
         if ($doc === null) {
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
             return BaseCommand::FAILURE;
         }
 
         $document->setSolrcore($solrCoreUid);
 
         if ($dryRun) {
-            $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
+            $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
             $io->success('All done!');
             return BaseCommand::SUCCESS;
         } else {
             $document->setCurrentDocument($doc);
 
             if ($io->isVerbose()) {
-                $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . '.');
+                $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.'.');
             }
             $isSaved = $this->saveToDatabase($document);
 
             if ($isSaved) {
                 if ($io->isVerbose()) {
-                    $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on Solr core ' . $solrCoreUid . '.');
+                    $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on Solr core '.$solrCoreUid.'.');
                 }
                 $isSaved = Indexer::add($document, $this->documentRepository);
             } else {
-                $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.');
+                $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.');
                 return BaseCommand::FAILURE;
             }
 
@@ -205,8 +205,8 @@ 
                 return BaseCommand::SUCCESS;
             }
 
-            $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.');
-            $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.');
+            $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.');
+            $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.');
             return BaseCommand::FAILURE;
         }
     }

Classes/Domain/Repository/StructureRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,7 +22,6 @@
  *
  * @access public
  */
-class StructureRepository extends Repository
-{
+class StructureRepository extends Repository {
 
 }

Classes/Domain/Repository/FormatRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,7 +22,6 @@
  *
  * @access public
  */
-class FormatRepository extends Repository
-{
+class FormatRepository extends Repository {
 
 }

Classes/Domain/Repository/TokenRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class TokenRepository extends Repository
-{
+class TokenRepository extends Repository {
     /**
      * Delete all expired token
      *

Classes/Domain/Repository/SolrCoreRepository.php

Braces +1 added lines, -2 removed lines

@@ -22,7 +22,6 @@
  *
  * @access public
  */
-class SolrCoreRepository extends Repository
-{
+class SolrCoreRepository extends Repository {
 
 }