Merge branch '5.0.x' into fix-dlf-search-in-document-loading-clearing

Author: sebastian-meyer

Classes/Command/BaseCommand.php

@@ -230,29 +230,29 @@ protected function saveToDatabase(Document $document): bool
         }
 
         // set identifiers
-        $document->setProdId($metadata['prod_id'][0] ? : '');
-        $document->setOpacId($metadata['opac_id'][0] ? : '');
-        $document->setUnionId($metadata['union_id'][0] ? : '');
+        $document->setProdId($metadata['prod_id'][0] ?? '');
+        $document->setOpacId($metadata['opac_id'][0] ?? '');
+        $document->setUnionId($metadata['union_id'][0] ?? '');
 
-        $document->setRecordId($metadata['record_id'][0] ? : ''); // (?) $doc->recordId
-        $document->setUrn($metadata['urn'][0] ? : '');
-        $document->setPurl($metadata['purl'][0] ? : '');
-        $document->setDocumentFormat($metadata['document_format'][0] ? : '');
+        $document->setRecordId($metadata['record_id'][0] ?? ''); // (?) $doc->recordId
+        $document->setUrn($metadata['urn'][0] ?? '');
+        $document->setPurl($metadata['purl'][0] ?? '');
+        $document->setDocumentFormat($metadata['document_format'][0] ?? '');
 
         // set access
-        $document->setLicense($metadata['license'][0] ? : '');
-        $document->setTerms($metadata['terms'][0] ? : '');
-        $document->setRestrictions($metadata['restrictions'][0] ? : '');
-        $document->setOutOfPrint($metadata['out_of_print'][0] ? : '');
-        $document->setRightsInfo($metadata['rights_info'][0] ? : '');
+        $document->setLicense($metadata['license'][0] ?? '');
+        $document->setTerms($metadata['terms'][0] ?? '');
+        $document->setRestrictions($metadata['restrictions'][0] ?? '');
+        $document->setOutOfPrint($metadata['out_of_print'][0] ?? '');
+        $document->setRightsInfo($metadata['rights_info'][0] ?? '');
         $document->setStatus(0);
 
-        $this->setOwner($metadata['owner'][0]);
+        $this->setOwner($metadata['owner'][0] ?? '');
         $document->setOwner($this->owner);
 
         // set volume data
-        $document->setVolume($metadata['volume'][0] ? : '');
-        $document->setVolumeSorting($metadata['volume_sorting'][0] ? : $metadata['mets_order'][0] ? : '');
+        $document->setVolume($metadata['volume'][0] ?? '');
+        $document->setVolumeSorting($metadata['volume_sorting'][0] ?? $metadata['mets_order'][0] ?? '');
 
         // Get UID of parent document.
         if ($document->getDocumentFormat() === 'METS') {
@@ -290,7 +290,7 @@ protected function getParentDocumentUidForSaving(Document $document): int
             // find document object by record_id of parent
             $parent = AbstractDocument::getInstance($doc->parentHref, ['storagePid' => $this->storagePid]);
 
-            if ($parent->recordId) {
+            if ($parent && $parent->recordId) {
                 $parentDocument = $this->documentRepository->findOneByRecordId($parent->recordId);
 
                 if ($parentDocument === null) {

Classes/Command/IndexCommand.php

@@ -210,7 +210,7 @@ private function getDocumentFromUrl($doc, string $url): Document
     {
         $document = null;
 
-        if ($doc->recordId) {
+        if ($doc and $doc->recordId) {
             $document = $this->documentRepository->findOneByRecordId($doc->recordId);
         } else {
             $document = $this->documentRepository->findOneByLocation($url);

Classes/Common/MetsDocument.php

@@ -435,16 +435,18 @@ private function getThumbnail(string $id = '')
 
         $thumbnail = null;
 
-        while ($fileGrpThumb = array_shift($fileGrpsThumb)) {
-            if (empty($id)) {
-                $thumbnail = $this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb] ?? null;
-            } else {
-                $parentId = $this->smLinks['l2p'][$id][0] ?? null;
-                $thumbnail = $this->physicalStructureInfo[$parentId]['files'][$fileGrpThumb] ?? null;
-            }
+        if (!empty($this->physicalStructure)) {
+            while ($fileGrpThumb = array_shift($fileGrpsThumb)) {
+                if (empty($id)) {
+                    $thumbnail = $this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb] ?? null;
+                } else {
+                    $parentId = $this->smLinks['l2p'][$id][0] ?? null;
+                    $thumbnail = $this->physicalStructureInfo[$parentId]['files'][$fileGrpThumb] ?? null;
+                }
 
-            if (!empty($thumbnail)) {
-                break;
+                if (!empty($thumbnail)) {
+                    break;
+                }
             }
         }
         return $thumbnail;
@@ -1416,7 +1418,10 @@ protected function magicGetThumbnail(bool $forceReload = false): string
                     ) {
                         $this->thumbnail = $this->getFileLocation($this->physicalStructureInfo[$this->smLinks['l2p'][$strctId][0]]['files'][$fileGrpThumb]);
                         break;
-                    } elseif (!empty($this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb])) {
+                    } elseif (
+                        !empty($this->physicalStructure)
+                        && !empty($this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb])
+                    ) {
                         $this->thumbnail = $this->getFileLocation($this->physicalStructureInfo[$this->physicalStructure[1]]['files'][$fileGrpThumb]);
                         break;
                     }

Classes/Controller/MetadataController.php

@@ -464,7 +464,7 @@ private function getMetadata(): array
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
             $ids = [];
-            $page = $this->currentDocument->physicalStructure[$this->requestData['page']];
+            $page = $this->currentDocument->physicalStructure[$this->requestData['page']] ?? [];
             if (!empty($page) && !empty($this->currentDocument->smLinks['p2l'][$page])) {
                 foreach ($this->currentDocument->smLinks['p2l'][$page] as $logId) {
                     $count = $this->currentDocument->getStructureDepth($logId);

Classes/Controller/OaiPmhController.php

@@ -273,7 +273,7 @@ public function mainAction()
         // Delete expired resumption tokens.
         $this->deleteExpiredTokens();
 
-        switch ($this->parameters['verb']) {
+        switch ($this->parameters['verb'] ?? null) {
             case 'GetRecord':
                 $this->verbGetRecord();
                 break;

Classes/Domain/Repository/CollectionRepository.php

@@ -97,11 +97,11 @@ public function findCollectionsBySettings(array $settings = []): QueryResultInte
 
         $constraints = [];
 
-        if ($settings['collections']) {
+        if ($settings['collections'] ?? false) {
             $constraints[] = $query->in('uid', GeneralUtility::intExplode(',', $settings['collections']));
         }
 
-        if ($settings['index_name']) {
+        if ($settings['index_name'] ?? false) {
             $constraints[] = $query->in('index_name', $settings['index_name']);
         }