diff --git a/typo3/sysext/core/Tests/Functional/Routing/Aspect/Fixtures/AspectScenario.yaml b/typo3/sysext/core/Tests/Functional/Routing/Aspect/Fixtures/AspectScenario.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..300302c579dbc6c0a29ea8bd422af472a35b4f88
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Routing/Aspect/Fixtures/AspectScenario.yaml
@@ -0,0 +1,50 @@
+entitySettings:
+ '*':
+ nodeColumnName: 'pid'
+ columnNames: {id: 'uid', language: 'sys_language_uid'}
+ defaultValues: {pid: 0}
+ page:
+ isNode: true
+ tableName: 'pages'
+ parentColumnName: 'pid'
+ languageColumnNames: ['l10n_parent', 'l10n_source']
+ columnNames: {type: 'doktype', root: 'is_siteroot'}
+ defaultValues: {hidden: 0, doktype: 0}
+ valueInstructions:
+ shortcut:
+ first: {shortcut: 0, shortcut_mode: 1}
+ content:
+ tableName: 'tt_content'
+ languageColumnNames: ['l18n_parent', 'l10n_source']
+ columnNames: {title: 'header', type: 'CType'}
+ defaultValues: {CType: 'text'}
+ language:
+ tableName: 'sys_language'
+ columnNames: {code: 'language_isocode'}
+
+entities:
+ language:
+ - self: {id: 1, title: 'French', code: 'fr'}
+ - self: {id: 2, title: 'Franco-Canadian', code: 'fr'}
+ - self: {id: 3, title: 'Spanish', code: 'es'}
+ page:
+ - self: {id: 1000, title: 'ACME Inc', root: true, slug: '/'}
+ entities:
+ content:
+ - self: {id: 3010, title: '30xx-slug', language: 0}
+ languageVariants:
+ - self: {id: 3011, title: '30xx-slug-fr', language: 1}
+ languageVariants:
+ - self: {id: 3012, title: '30xx-slug-fr-ca', language: 2}
+ - self: {id: 3013, title: '30xx-slug-es', language: 3}
+ - self: {id: 3020, title: '30xx-slug-fr', language: 0}
+ - self: {id: 3030, title: '30xx-slug-fr-ca', language: 0}
+
+ - self: {id: 4020, title: '40xx-slug-fr', language: 0}
+ - self: {id: 4030, title: '40xx-slug-fr-ca', language: 0}
+ - self: {id: 4040, title: '40xx-slug', language: 0}
+ languageVariants:
+ - self: {id: 4041, title: '40xx-slug-fr', language: 1}
+ languageVariants:
+ - self: {id: 4042, title: '40xx-slug-fr-ca', language: 2}
+ - self: {id: 4043, title: '40xx-slug-es', language: 3}
diff --git a/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8d32b7b7b0a2506392f45e9749b0b5d27fac5fb
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php
@@ -0,0 +1,156 @@
+<?php
+declare(strict_types = 1);
+namespace TYPO3\CMS\Core\Tests\Functional\Routing\Aspect;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Core\Bootstrap;
+use TYPO3\CMS\Core\Http\Uri;
+use TYPO3\CMS\Core\Routing\Aspect\PersistedAliasMapper;
+use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
+use TYPO3\TestingFramework\Core\Functional\Framework\DataHandling\Scenario\DataHandlerFactory;
+use TYPO3\TestingFramework\Core\Functional\Framework\DataHandling\Scenario\DataHandlerWriter;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+class PersistedAliasMapperTest extends FunctionalTestCase
+{
+ private const ASPECT_CONFIGURATION = [
+ 'tableName' => 'tt_content',
+ 'routeFieldName' => 'header',
+ ];
+
+ /**
+ * @var PersistedAliasMapper
+ */
+ private $subject;
+
+ /**
+ * @var SiteLanguage[]
+ */
+ private $languages;
+
+ public static function setUpBeforeClass(): void
+ {
+ parent::setUpBeforeClass();
+ static::initializeDatabaseSnapshot();
+ }
+
+ public static function tearDownAfterClass(): void
+ {
+ static::destroyDatabaseSnapshot();
+ parent::tearDownAfterClass();
+ }
+
+ protected function setUp(): void
+ {
+ parent::setUp();
+ $this->withDatabaseSnapshot(function () {
+ $this->setUpDatabase();
+ });
+
+ $this->languages = [
+ 'es-es' => new SiteLanguage(3, 'es_ES.UTF-8', new Uri('/es-es/'), [
+ 'fallbackType' => 'fallback',
+ 'fallbacks' => [0],
+ 'title' => 'Spanish',
+ ]),
+ 'fr-ca' => new SiteLanguage(2, 'fr_CA.UTF-8', new Uri('/fr-ca/'), [
+ 'fallbackType' => 'fallback',
+ 'fallbacks' => [1, 0],
+ 'title' => 'Franco-Canadian',
+ ]),
+ 'fr-fr' => new SiteLanguage(1, 'fr_FR.UTF-8', new Uri('/fr-fr/'), [
+ 'fallbackType' => 'fallback',
+ 'fallbacks' => [0],
+ 'French',
+ ]),
+ 'default' => new SiteLanguage(0, 'en_US.UTF-8', new Uri('/en-us/'), []),
+ ];
+
+ $this->subject = new PersistedAliasMapper(self::ASPECT_CONFIGURATION);
+ }
+
+ protected function setUpDatabase()
+ {
+ $backendUser = $this->setUpBackendUserFromFixture(1);
+ Bootstrap::initializeLanguageObject();
+
+ $scenarioFile = __DIR__ . '/Fixtures/AspectScenario.yaml';
+ $factory = DataHandlerFactory::fromYamlFile($scenarioFile);
+ $writer = DataHandlerWriter::withBackendUser($backendUser);
+ $writer->invokeFactory($factory);
+ if (!empty($writer->getErrors())) {
+ self::fail(var_export($writer->getErrors(), true));
+ }
+ }
+
+ protected function tearDown(): void
+ {
+ unset($this->subject, $this->languages);
+ parent::tearDown();
+ }
+
+ public function languageAwareRecordsAreResolvedDataProvider(): array
+ {
+ return [
+ 'non-existing, default language' => ['this-value-does-not-exist', 'default', null],
+
+ '30xx-slug, default language' => ['30xx-slug', 'default', '3010'],
+ '30xx-slug, fr-fr language' => ['30xx-slug', 'fr-fr', '3010'],
+ '30xx-slug, fr-ca language' => ['30xx-slug', 'fr-ca', '3010'],
+
+ '30xx-slug-fr-ca, fr-ca language' => ['30xx-slug-fr-ca', 'fr-ca', '3010'],
+ // '30xx-slug-fr-ca' available in default language as well, fallbacks to that one
+ '30xx-slug-fr-ca, fr-fr language' => ['30xx-slug-fr-ca', 'fr-fr', '3010'],
+ // '30xx-slug-fr-ca' available in default language, use it directly
+ '30xx-slug-fr-ca, default language' => ['30xx-slug-fr-ca', 'default', '3010'],
+
+ '30xx-slug-fr, fr-ca language' => ['30xx-slug-fr', 'fr-ca', '3010'],
+ '30xx-slug-fr, fr-fr language' => ['30xx-slug-fr', 'fr-fr', '3010'],
+ // '30xx-slug-fr-ca' available in default language, use it directly
+ '30xx-slug-fr, default language' => ['30xx-slug-fr', 'default', '3010'],
+
+ // basically the same, but being stored in reverse order in database
+ '40xx-slug, default language' => ['40xx-slug', 'default', '4040'],
+ '40xx-slug, fr-fr language' => ['40xx-slug', 'fr-fr', '4040'],
+ '40xx-slug, fr-ca language' => ['40xx-slug', 'fr-ca', '4040'],
+
+ '40xx-slug-fr-ca, fr-ca language' => ['40xx-slug-fr-ca', 'fr-ca', '4030'],
+ // '40xx-slug-fr-ca' available in default language as well, fallbacks to that one
+ '40xx-slug-fr-ca, fr-fr language' => ['40xx-slug-fr-ca', 'fr-fr', '4030'],
+ // '40xx-slug-fr-ca' available in default language, use it directly
+ '40xx-slug-fr-ca, default language' => ['40xx-slug-fr-ca', 'default', '4030'],
+
+ '40xx-slug-fr, fr-ca language' => ['40xx-slug-fr', 'fr-ca', '4020'],
+ '40xx-slug-fr, fr-fr language' => ['40xx-slug-fr', 'fr-fr', '4020'],
+ // '40xx-slug-fr-ca' available in default language, use it directly
+ '40xx-slug-fr, default language' => ['40xx-slug-fr', 'default', '4020'],
+ ];
+ }
+
+ /**
+ * @param string $requestValue
+ * @param string $language
+ * @param string|null $expectation
+ *
+ * @test
+ * @dataProvider languageAwareRecordsAreResolvedDataProvider
+ * @group not-postgres
+ */
+ public function languageAwareRecordsAreResolved(string $requestValue, string $language, ?string $expectation): void
+ {
+ $this->subject->setSiteLanguage($this->languages[$language]);
+ self::assertSame($expectation, $this->subject->resolve($requestValue));
+ }
+}