Merge branch 'master' into fix-metadata

Classes/Common/Solr/SolrSearch.php

@@ -809,7 +809,7 @@ private function getSort() : array
             'score' => 'desc',
             'year_sorting' => 'asc',
             'title_sorting' => 'asc',
-            'volume' => 'asc'
+            'volume_sorting' => 'asc'
         ];
     }
 
@@ -860,7 +860,7 @@ private function getDocument(Document $record, array $highlighting, array $field
      */
     private function translateLanguageCode(&$doc): void
     {
-        if (array_key_exists('language', $doc['metadata'])) {
+        if (is_array($doc['metadata']) && array_key_exists('language', $doc['metadata'])) {
             foreach($doc['metadata']['language'] as $indexName => $language) {
                 $doc['metadata']['language'][$indexName] = Helper::getLanguageName($language);
             }

Classes/Controller/AbstractController.php

@@ -19,6 +19,7 @@
 use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Pagination\PaginationInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
@@ -111,6 +112,8 @@ protected function initialize(): void
         // Get extension configuration.
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
 
+        $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
+
         $this->viewData = [
             'pageUid' => $this->pageUid,
             'uniqueId' => uniqid(),
@@ -129,6 +132,9 @@ protected function initialize(): void
      */
     protected function loadDocument(int $documentId = 0): void
     {
+        // Sanitize FlexForm settings to avoid later casting.
+        $this->sanitizeSettings();
+
         // Get document ID from request data if not passed as parameter.
         if ($documentId === 0 && !empty($this->requestData['id'])) {
             $documentId = $this->requestData['id'];
@@ -317,7 +323,7 @@ protected function sanitizeSettings(): void
      */
     protected function setDefaultIntSetting(string $setting, int $value): void
     {
-        if (empty($this->settings[$setting])) {
+        if (!array_key_exists($setting, $this->settings) || empty($this->settings[$setting])) {
             $this->settings[$setting] = $value;
             $this->logger->warning('Setting "' . $setting . '" not set, using default value "' . $value . '". Probably FlexForm for controller "' . get_class($this) . '" is not read.');
         } else {

Classes/Controller/OaiPmhController.php

@@ -785,11 +785,13 @@ private function checkGranularity(): void
      */
     protected function generateOutputForDocumentList(array $documentListSet)
     {
-        $documentsToProcess = array_splice($documentListSet['elements'], 0, $this->settings['limit']);
-        if (empty($documentsToProcess)) {
+        // check whether any result elements are available
+        if (empty($documentListSet) || empty($documentListSet['elements'])) {
             $this->error = 'noRecordsMatch';
             return [];
         }
+        // consume result elements from list to implement pagination logic of resumptionToken
+        $documentsToProcess = array_splice($documentListSet['elements'], 0, $this->settings['limit']);
         $verb = $this->parameters['verb'];
 
         $documents = $this->documentRepository->getOaiDocumentList($documentsToProcess);

Classes/Middleware/Embedded3dViewer.php

@@ -16,11 +16,13 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Configuration\Loader\YamlFileLoader;
 use TYPO3\CMS\Core\Exception;
 use TYPO3\CMS\Core\Http\HtmlResponse;
+use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\StorageRepository;
@@ -35,7 +37,7 @@
  * @subpackage dlf
  * @access public
  */
-class Embedded3dViewer implements MiddlewareInterface
+class Embedded3dViewer implements LoggerAwareInterface, MiddlewareInterface
 {
     use LoggerAwareTrait;
 
@@ -63,6 +65,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $response;
         }
 
+        $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
+
         if (empty($parameters['model'])) {
             return $this->warningResponse('Model url is missing.', $request);
         }