[BUGFIX] Use correct language capability field in route mapper

Additionally, adjust a couple of source
field usages to properly use the has*()
method and make use of null-safe-operator.

Resolves: #106773
Related: #106722
Releases: main
Change-Id: I9eff9143fdd81a75fcf45fa26e4af830f682981f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/89536
Reviewed-by: Benjamin Franzke <ben@bnf.dev>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benjamin Franzke <ben@bnf.dev>

Author: o-ba

typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php

@@ -177,7 +177,7 @@ protected function collectItems(string $tableName, array $idValues): void
             'language' => $languageCapability->getLanguageField()->getName(),
             'parent' => $languageCapability->getTranslationOriginPointerField()->getName(),
         ];
-        if ($languageCapability->getTranslationSourceField() !== null) {
+        if ($languageCapability->hasTranslationSourceField()) {
             $fieldNames['source'] = $languageCapability->getTranslationSourceField()->getName();
         }
 
@@ -506,11 +506,8 @@ protected function synchronizeReferences(DataMapItem $item, string $fieldName, a
             $fieldNames = [
                 'language' => $languageCapability->getLanguageField()->getName(),
                 'parent' => $languageCapability->getTranslationOriginPointerField()->getName(),
-                'source' => null,
+                'source' =>  $languageCapability->getTranslationSourceField()?->getName(),
             ];
-            if ($languageCapability->getTranslationSourceField() !== null) {
-                $fieldNames['source'] = $languageCapability->getTranslationSourceField()->getName();
-            }
         }
 
         $suggestedAncestorIds = $this->resolveSuggestedInlineRelations(
@@ -907,7 +904,7 @@ protected function fetchDependencies(string $tableName, array $ids): array
             'language' => $languageCapability->getLanguageField()->getName(),
             'parent' => $languageCapability->getTranslationOriginPointerField()->getName(),
         ];
-        if ($languageCapability->getTranslationSourceField() !== null) {
+        if ($languageCapability->hasTranslationSourceField()) {
             $fieldNames['source'] = $languageCapability->getTranslationSourceField()->getName();
         }
 
@@ -992,7 +989,7 @@ protected function fetchDependentIdMap(string $tableName, array $ids, int $desir
                 'language' => $languageCapability->getLanguageField()->getName(),
                 'parent' => $languageCapability->getTranslationOriginPointerField()->getName(),
             ];
-            if ($languageCapability->getTranslationSourceField() !== null) {
+            if ($languageCapability->hasTranslationSourceField()) {
                 $fieldNames['source'] = $languageCapability->getTranslationSourceField()->getName();
             }
         } else {

typo3/sysext/core/Classes/DataHandling/Model/RecordStateFactory.php

@@ -79,8 +79,8 @@ protected function resolveAspectFieldNames(): array
         return [
             'workspace' => 't3ver_wsid',
             'versionParent' => 't3ver_oid',
-            'language' => $languageCapability?->getLanguageField()?->getName(),
-            'languageParent' => $languageCapability?->getTranslationOriginPointerField()?->getName(),
+            'language' => $languageCapability?->getLanguageField()->getName(),
+            'languageParent' => $languageCapability?->getTranslationOriginPointerField()->getName(),
             'languageSource' => $languageCapability?->getTranslationSourceField()?->getName(),
         ];
     }

typo3/sysext/core/Classes/Domain/RecordFactory.php

@@ -215,7 +215,7 @@ protected function extractSystemInformation(TcaSchema $schema, RawRecord $rawRec
             $languageCapability = $schema->getCapability(TcaSchemaCapability::Language);
             $languageField = $languageCapability->getLanguageField()->getName();
             $transOrigPointerField = $languageCapability->getTranslationOriginPointerField()->getName();
-            $translationSourceField = $languageCapability->hasTranslationSourceField() ? $languageCapability->getTranslationSourceField()->getName() : '';
+            $translationSourceField = $languageCapability->getTranslationSourceField()?->getName() ?? '';
             try {
                 $systemProperties['language'] = new LanguageInfo(
                     (int)$rawRecord->get($languageField),

typo3/sysext/core/Classes/Routing/Aspect/PersistedAliasMapper.php

@@ -133,7 +133,7 @@ public function __construct(array $settings)
         $schema = GeneralUtility::makeInstance(TcaSchemaFactory::class)->get($this->tableName);
         if ($schema->isLanguageAware()) {
             $this->languageFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getLanguageField()->getName();
-            $this->languageParentFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getTranslationSourceField()->getName();
+            $this->languageParentFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getTranslationOriginPointerField()->getName();
         } else {
             $this->languageFieldName = null;
             $this->languageParentFieldName = null;

typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php

@@ -136,7 +136,7 @@ public function __construct(array $settings)
         $schema = GeneralUtility::makeInstance(TcaSchemaFactory::class)->get($this->tableName);
         if ($schema->isLanguageAware()) {
             $this->languageFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getLanguageField()->getName();
-            $this->languageParentFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getTranslationSourceField()->getName();
+            $this->languageParentFieldName = $schema->getCapability(TcaSchemaCapability::Language)->getTranslationOriginPointerField()->getName();
         } else {
             $this->languageFieldName = null;
             $this->languageParentFieldName = null;