[BUGFIX] Support custom identifiers for PageType enhancer

Author: eliashaeussler

Classes/Sitemap/Provider/PageTypeProvider.php

@@ -34,6 +34,11 @@
  */
 final class PageTypeProvider implements Provider
 {
+    /**
+     * @see https://github.com/TYPO3/typo3/blob/v12.4.0/typo3/sysext/core/Configuration/DefaultConfiguration.php#L118
+     */
+    private const EXPECTED_ENHANCER_TYPE = 'PageType';
+
     /**
      * @see https://github.com/TYPO3/typo3/blob/v12.4.0/typo3/sysext/seo/Configuration/TypoScript/XmlSitemap/setup.typoscript#L3
      */
@@ -48,10 +53,11 @@ public function get(
             return [];
         }
 
-        $pageTypeMap = $site->getConfiguration()['routeEnhancers']['PageTypeSuffix']['map'] ?? null;
+        // Look up page type map
+        $pageTypeMap = $this->fetchPageTypeMapFromSiteConfiguration($site);
 
         // Early return if no page type map is configured
-        if (!\is_array($pageTypeMap) || !\in_array(self::EXPECTED_PAGE_TYPE, $pageTypeMap, true)) {
+        if (!\in_array(self::EXPECTED_PAGE_TYPE, $pageTypeMap, true)) {
             return [];
         }
 
@@ -71,4 +77,29 @@ public static function getPriority(): int
     {
         return 300;
     }
+
+    /**
+     * @return array<string, int>
+     */
+    private function fetchPageTypeMapFromSiteConfiguration(Core\Site\Entity\Site $site): array
+    {
+        $routeEnhancers = $site->getConfiguration()['routeEnhancers'] ?? [];
+        $pageTypeMap = null;
+
+        foreach ($routeEnhancers as $routeEnhancer) {
+            $type = $routeEnhancer['type'] ?? null;
+
+            if ($type === self::EXPECTED_ENHANCER_TYPE) {
+                $pageTypeMap = $routeEnhancer['map'] ?? null;
+
+                break;
+            }
+        }
+
+        if (!\is_array($pageTypeMap)) {
+            return [];
+        }
+
+        return $pageTypeMap;
+    }
 }

Tests/Functional/Sitemap/Provider/PageTypeProviderTest.php

@@ -60,7 +60,7 @@ public function getReturnsEmptyArrayIfSeoExtensionIsNotLoaded(): void
     }
 
     #[Framework\Attributes\Test]
-    public function getReturnsEmptyArrayIfPageTypeIsNotConfigured(): void
+    public function getReturnsEmptyArrayIfNoRouteEnhancersAreConfigured(): void
     {
         $this->packageManager->loadedExtensions = ['seo'];
 
@@ -69,6 +69,27 @@ public function getReturnsEmptyArrayIfPageTypeIsNotConfigured(): void
         self::assertSame([], $this->subject->get($site));
     }
 
+    #[Framework\Attributes\Test]
+    public function getReturnsEmptyArrayIfPageTypeIsNotConfigured(): void
+    {
+        $this->packageManager->loadedExtensions = ['seo'];
+
+        $site = new Core\Site\Entity\Site('foo', 1, [
+            'base' => 'https://www.example.com/',
+            'routeEnhancers' => [
+                'Foo' => [
+                    'type' => 'Simple',
+                    'routePath' => '/foo/{foo_id}',
+                    '_arguments' => [
+                        'foo_id' => 'foo/id',
+                    ],
+                ],
+            ],
+        ]);
+
+        self::assertSame([], $this->subject->get($site));
+    }
+
     #[Framework\Attributes\Test]
     public function getReturnsSitemapWithPageTypeFromSite(): void
     {