Merge branch 'release/6.0.21'

TYPO3GmbH · Oct 11, 2024 · d35a109 · d35a109
2 parents 1935815 + 9f13617
commit d35a109
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/legacy_hook/src/DocumentationLinker.php b/legacy_hook/src/DocumentationLinker.php
@@ -102,6 +102,8 @@
  */
 final readonly class DocumentationLinker
 {
+    private const MAIN_IDENTIFIER = 'main';
+
     private FilesystemAdapter $cache;
     private int $cacheTime;
 
@@ -133,10 +135,16 @@ public function redirectToLink(): Response
                 $matches)
             ) {
                 [, $repository, $index] = $matches;
-                $version = str_replace('@', '', $matches[3] ?? '') ?: 'main';
+                $version = str_replace('@', '', $matches[3] ?? '') ?: self::MAIN_IDENTIFIER;
                 $entrypoint = $this->resolveEntryPoint($repository, $version);
                 $objectsContents = $this->getObjectsFile($entrypoint);
 
+                if ($objectsContents === '' && $version !== self::MAIN_IDENTIFIER) {
+                    // soft-fail to resolve a maybe not-yet released version to main.
+                    $entrypoint = $this->resolveEntryPoint($repository, self::MAIN_IDENTIFIER);
+                    $objectsContents = $this->getObjectsFile($entrypoint);
+                }
+
                 if ($objectsContents === '') {
                     return new ResponseDescriber(404, [], 'Invalid shortcode, no objects.inv.json found.');
                 }
@@ -194,7 +202,7 @@ private function parseInventoryForIndex(string $index, array $json): string
                         // std:confval + pagelink.html#some-entry
                         // to:
                         // pagelink.html#confval-some-entry
-                        $link = str_replace('#', '#-' . $docNodeTypeParts[1], $indexMetaData[2]);
+                        $link = str_replace('#', '#' . $docNodeTypeParts[1] . '-', $indexMetaData[2]);
                     }
                 }
             }