[BUGFIX] Less strict return types on resolving values

Resolves #3758
TYPO3-Solr · Oct 10, 2023 · e2b725c · e2b725c
1 parent c20f473
commit e2b725c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Classes/IndexQueue/AbstractIndexer.php b/Classes/IndexQueue/AbstractIndexer.php
@@ -119,7 +119,7 @@ protected function resolveFieldValue(
         string $solrFieldName,
         array $data,
         TypoScriptFrontendController $tsfe
-    ): array|float|int|string|null {
+    ): mixed {
         if (isset($indexingConfiguration[$solrFieldName . '.'])) {
             // configuration found => need to resolve a cObj
 
@@ -276,7 +276,7 @@ protected static function isSerializedResultFromRegisteredHook(array $indexingCo
      * @param string $fieldType The dynamic field's type
      * @return int|float|string|null Returns the value in the correct format for the field type
      */
-    protected function ensureFieldValueType(mixed $value, string $fieldType): int|float|string|null
+    protected function ensureFieldValueType(mixed $value, string $fieldType): mixed
     {
         switch ($fieldType) {
             case 'int':

diff --git a/Classes/IndexQueue/FrontendHelper/PageFieldMappingIndexer.php b/Classes/IndexQueue/FrontendHelper/PageFieldMappingIndexer.php
@@ -102,7 +102,7 @@ protected function getMappedFields(Document $pageDocument, array $pageRecord): a
      * @param string $solrFieldName The Solr field name to resolve the value from the item's record
      * @return string|array The resolved value to be indexed
      */
-    protected function resolveFieldValue(string $solrFieldName, Document $pageDocument, array $pageRecord): array|string
+    protected function resolveFieldValue(string $solrFieldName, Document $pageDocument, array $pageRecord): mixed
     {
         $pageIndexingConfiguration = $this->configuration->getIndexQueueFieldsConfigurationByConfigurationName($this->pageIndexingConfigurationName);