[BUGFIX] Do not index translations on default language fallbackType: free

Classes/Access/RootlineElementFormatException.php

@@ -22,6 +22,4 @@
  *
  * @author Ingo Renner <[email protected]>
  */
-class RootlineElementFormatException extends InvalidArgumentException
-{
-}
+class RootlineElementFormatException extends InvalidArgumentException {}

Classes/Backend/SettingsPreviewOnPlugins.php

@@ -38,8 +38,7 @@ class SettingsPreviewOnPlugins
 
     public function __construct(
         protected FlexFormService $flexFormService
-    ) {
-    }
+    ) {}
 
     public function __invoke(PageContentPreviewRenderingEvent $event): void
     {

Classes/Domain/Index/Queue/RecordMonitor/Exception/RootPageRecordNotFoundException.php

@@ -20,6 +20,4 @@
 /**
  * Exception that is thrown if the record of the root page couldn't be found
  */
-class RootPageRecordNotFoundException extends Exception
-{
-}
+class RootPageRecordNotFoundException extends Exception {}

Classes/Domain/Index/Queue/UpdateHandler/EventListener/Events/DelayedProcessingFinishedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Delayed processing finished event
  */
-class DelayedProcessingFinishedEvent extends AbstractProcessingFinishedEvent
-{
-}
+class DelayedProcessingFinishedEvent extends AbstractProcessingFinishedEvent {}

Classes/Domain/Index/Queue/UpdateHandler/EventListener/Events/DelayedProcessingQueuingFinishedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Delayed processing queuing finished event
  */
-class DelayedProcessingQueuingFinishedEvent extends AbstractProcessingFinishedEvent
-{
-}
+class DelayedProcessingQueuingFinishedEvent extends AbstractProcessingFinishedEvent {}

Classes/Domain/Index/Queue/UpdateHandler/EventListener/Events/ProcessingFinishedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Processing finished event
  */
-class ProcessingFinishedEvent extends AbstractProcessingFinishedEvent
-{
-}
+class ProcessingFinishedEvent extends AbstractProcessingFinishedEvent {}

Classes/Domain/Index/Queue/UpdateHandler/Events/RecordDeletedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Event fired if a record is deleted
  */
-class RecordDeletedEvent extends AbstractDataUpdateEvent
-{
-}
+class RecordDeletedEvent extends AbstractDataUpdateEvent {}

Classes/Domain/Index/Queue/UpdateHandler/Events/RecordGarbageCheckEvent.php

@@ -20,6 +20,4 @@
 /**
  * Event fired if a record garbage check is triggered
  */
-class RecordGarbageCheckEvent extends AbstractDataUpdateEvent
-{
-}
+class RecordGarbageCheckEvent extends AbstractDataUpdateEvent {}

Classes/Domain/Index/Queue/UpdateHandler/Events/RecordMovedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Event fired if a record is moved
  */
-class RecordMovedEvent extends AbstractDataUpdateEvent
-{
-}
+class RecordMovedEvent extends AbstractDataUpdateEvent {}

Classes/Domain/Index/Queue/UpdateHandler/Events/RecordUpdatedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Event fired if a record is created or updated
  */
-class RecordUpdatedEvent extends AbstractDataUpdateEvent
-{
-}
+class RecordUpdatedEvent extends AbstractDataUpdateEvent {}

Classes/Domain/Index/Queue/UpdateHandler/Events/VersionSwappedEvent.php

@@ -20,6 +20,4 @@
 /**
  * Event fired if a version is swapped
  */
-class VersionSwappedEvent extends AbstractDataUpdateEvent
-{
-}
+class VersionSwappedEvent extends AbstractDataUpdateEvent {}

Classes/Domain/Search/ApacheSolrDocument/Builder.php

@@ -39,8 +39,7 @@ class Builder
 {
     public function __construct(
         protected readonly IdBuilder $variantIdBuilder
-    ) {
-    }
+    ) {}
 
     /**
      * This method can be used to build a Document from a TYPO3 page.

Classes/Domain/Search/Query/SearchQuery.php

@@ -17,6 +17,4 @@
 
 namespace ApacheSolrForTypo3\Solr\Domain\Search\Query;
 
-class SearchQuery extends Query
-{
-}
+class SearchQuery extends Query {}

Classes/Domain/Search/ResultSet/Facets/AbstractFacet.php

@@ -41,8 +41,7 @@ public function __construct(
         protected string $field,
         protected string $label = '',
         protected array $facetConfiguration = []
-    ) {
-    }
+    ) {}
 
     /**
      * Returns facet name

Classes/Domain/Search/ResultSet/Facets/AbstractFacetItem.php

@@ -31,8 +31,7 @@ public function __construct(
         protected int $documentCount = 0,
         protected bool $selected = false,
         protected array $metrics = []
-    ) {
-    }
+    ) {}
 
     public function getDocumentCount(): int
     {

Classes/Domain/Search/ResultSet/Facets/InvalidFacetPackageException.php

@@ -17,6 +17,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidFacetPackageException extends Exception
-{
-}
+class InvalidFacetPackageException extends Exception {}

Classes/Domain/Search/ResultSet/Facets/InvalidFacetParserException.php

@@ -17,6 +17,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidFacetParserException extends Exception
-{
-}
+class InvalidFacetParserException extends Exception {}

Classes/Domain/Search/ResultSet/Facets/InvalidQueryBuilderException.php

@@ -17,6 +17,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidQueryBuilderException extends Exception
-{
-}
+class InvalidQueryBuilderException extends Exception {}

Classes/Domain/Search/ResultSet/Facets/InvalidUrlDecoderException.php

@@ -19,6 +19,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidUrlDecoderException extends Exception
-{
-}
+class InvalidUrlDecoderException extends Exception {}

Classes/Domain/Search/ResultSet/Facets/OptionBased/Hierarchy/NodeCollection.php

@@ -25,6 +25,4 @@
  * @author Frans Saris <[email protected]>
  * @author Timo Hund <[email protected]>
  */
-class NodeCollection extends AbstractFacetItemCollection
-{
-}
+class NodeCollection extends AbstractFacetItemCollection {}

Classes/Domain/Search/ResultSet/Facets/RangeBased/NumericRange/NumericRangeCollection.php

@@ -25,6 +25,4 @@
  * @author Frans Saris <[email protected]>
  * @author Timo Hund <[email protected]>
  */
-class NumericRangeCollection extends AbstractFacetItemCollection
-{
-}
+class NumericRangeCollection extends AbstractFacetItemCollection {}

Classes/Domain/Search/ResultSet/Grouping/GroupItemCollection.php

@@ -22,6 +22,4 @@
 /**
  * The GroupItemCollection contains the GroupItem objects.
  */
-class GroupItemCollection extends AbstractCollection
-{
-}
+class GroupItemCollection extends AbstractCollection {}

Classes/Domain/Search/Score/Score.php

@@ -27,8 +27,7 @@ public function __construct(
         protected string $fieldName = '',
         protected float $score = 0.0,
         protected string $searchTerm = '',
-    ) {
-    }
+    ) {}
 
     public function getBoost(): float
     {

Classes/Domain/Site/Exception/InvalidSiteConfigurationCombinationException.php

@@ -19,6 +19,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidSiteConfigurationCombinationException extends Exception
-{
-}
+class InvalidSiteConfigurationCombinationException extends Exception {}

Classes/Domain/Site/Exception/InvalidSiteRootPageException.php

@@ -19,6 +19,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class InvalidSiteRootPageException extends Exception
-{
-}
+class InvalidSiteRootPageException extends Exception {}

Classes/Domain/Site/Exception/UnexpectedTYPO3SiteInitializationException.php

@@ -19,6 +19,4 @@
 
 use ApacheSolrForTypo3\Solr\Exception;
 
-class UnexpectedTYPO3SiteInitializationException extends Exception
-{
-}
+class UnexpectedTYPO3SiteInitializationException extends Exception {}

Classes/Domain/Variants/IdBuilder.php

@@ -37,8 +37,7 @@ class IdBuilder
 {
     public function __construct(
         protected readonly EventDispatcherInterface $eventDispatcher
-    ) {
-    }
+    ) {}
 
     /**
      * This method is used to build a variantId.

Classes/Event/IndexQueue/AfterIndexQueueHasBeenInitializedEvent.php

@@ -35,8 +35,7 @@ public function __construct(
         private readonly string $type,
         private readonly array $indexingConfiguration,
         private bool $isInitialized
-    ) {
-    }
+    ) {}
 
     public function getInitializer(): AbstractInitializer
     {

Classes/Event/IndexQueue/AfterIndexQueueItemHasBeenMarkedForReindexingEvent.php

@@ -31,8 +31,7 @@ public function __construct(
         private readonly int $forcedChangeTime,
         private int $updateCount,
         private ?array $validLanguageUids
-    ) {
-    }
+    ) {}
 
     public function getItemType(): string
     {

Classes/Event/IndexQueue/AfterRecordsForIndexQueueItemsHaveBeenRetrievedEvent.php

@@ -28,8 +28,7 @@ public function __construct(
         private readonly string $table,
         private readonly array $uids,
         private array $records
-    ) {
-    }
+    ) {}
 
     public function getTable(): string
     {

Classes/Event/Indexing/AfterFrontendPageUriForIndexingHasBeenGeneratedEvent.php

@@ -34,8 +34,7 @@ public function __construct(
         protected readonly int $languageId,
         protected readonly string $mountPointParameter,
         protected readonly array $options
-    ) {
-    }
+    ) {}
 
     public function getItem(): Item
     {

Classes/Event/Indexing/AfterPageDocumentIsCreatedForIndexingEvent.php

@@ -40,8 +40,7 @@ public function __construct(
         private readonly SiteLanguage $siteLanguage,
         private readonly array $record,
         private readonly TypoScriptConfiguration $configuration
-    ) {
-    }
+    ) {}
 
     public function getDocument(): Document
     {

Classes/Event/Indexing/BeforeDocumentsAreIndexedEvent.php

@@ -37,8 +37,7 @@ public function __construct(
         private readonly Item $indexQueueItem,
         /**  @var Document[] */
         private array $documents,
-    ) {
-    }
+    ) {}
 
     public function getSite(): Site
     {

Classes/Event/Search/AfterInitialSearchResultSetHasBeenCreatedEvent.php

@@ -35,8 +35,7 @@ public function __construct(
         private readonly SearchRequest $searchRequest,
         private readonly Search $search,
         private readonly TypoScriptConfiguration $typoScriptConfiguration
-    ) {
-    }
+    ) {}
 
     public function getSearchResultSet(): SearchResultSet
     {

Classes/Event/Search/AfterSearchHasBeenExecutedEvent.php

@@ -39,8 +39,7 @@ public function __construct(
         private readonly SearchRequest $searchRequest,
         private readonly Search $search,
         private readonly TypoScriptConfiguration $typoScriptConfiguration
-    ) {
-    }
+    ) {}
 
     public function getSearchResultSet(): SearchResultSet
     {

Classes/Event/Search/AfterSearchQueryHasBeenPreparedEvent.php

@@ -37,8 +37,7 @@ public function __construct(
         private readonly SearchRequest $searchRequest,
         private readonly Search $search,
         private readonly TypoScriptConfiguration $typoScriptConfiguration
-    ) {
-    }
+    ) {}
 
     public function getQuery(): Query
     {

Classes/Event/Variants/AfterVariantIdWasBuiltEvent.php

@@ -36,8 +36,7 @@ public function __construct(
         private readonly array $itemRecord,
         private readonly Site $site,
         private readonly Document $document
-    ) {
-    }
+    ) {}
 
     public function getVariantId(): string
     {

Classes/Exception.php

@@ -20,6 +20,4 @@
 /**
  * Generic Apache Solr for TYPO3 exception
  */
-class Exception extends \Exception
-{
-}
+class Exception extends \Exception {}

Classes/Exception/InvalidArgumentException.php

@@ -22,6 +22,4 @@
 /**
  * Exception that is thrown if a given argument is invalid.
  */
-class InvalidArgumentException extends Exception
-{
-}
+class InvalidArgumentException extends Exception {}

Classes/FrontendEnvironment/Exception/Exception.php

@@ -21,6 +21,4 @@
  * Exception that is thrown on initialization of EXT:solr FrontendEnvironment.
  * This exception should be used for any errors on indexing .
  */
-class Exception extends ExtSolrException
-{
-}
+class Exception extends ExtSolrException {}

Classes/IndexQueue/Exception/DocumentPreparationException.php

@@ -18,6 +18,4 @@
 /**
  * Exception that is thrown on TYPO3 side in indexing process.
  */
-class DocumentPreparationException extends IndexingException
-{
-}
+class DocumentPreparationException extends IndexingException {}

Classes/IndexQueue/Exception/IllegalStateException.php

@@ -20,6 +20,4 @@
 /**
  * Exception that is thrown on indexing process and any potentially unusual state.
  */
-class IllegalStateException extends Exception
-{
-}
+class IllegalStateException extends Exception {}

Classes/IndexQueue/Exception/IndexingException.php

@@ -21,6 +21,4 @@
  * Exception that is thrown on indexing process. Does not matter on which side, TYPO3 or Apache.
  * This exception should be used for any errors on indexing process.
  */
-class IndexingException extends Exception
-{
-}
+class IndexingException extends Exception {}

Classes/IndexQueue/Indexer.php

@@ -239,6 +239,14 @@ protected function getItemRecordOverlayed(Item $item, int $language): ?array
         ) {
             return null;
         }
+        // skip translated records for default language within "free content mode"-languages
+        if ($language === 0
+            && isset($languageField)
+            && (int)($itemRecord[$languageField] ?? null) !== $language
+            && $this->isLanguageInAFreeContentMode($item, (int)($itemRecord[$languageField] ?? null))
+        ) {
+            return null;
+        }
 
         $pidToUse = $this->getPageIdOfItem($item);