[TASK] Replace generateOutputUrlFromDocumentPath behaviour mostly with behaviour of canonical URL

Author: linawolf

packages/guides/src/RenderContext.php

@@ -32,7 +32,7 @@ class RenderContext
     private array $allDocuments;
 
     private function __construct(
-        string $outputFolder,
+        private readonly string $outputFolder,
         private readonly string $currentFileName,
         private readonly FilesystemInterface $origin,
         private readonly FilesystemInterface $destination,
@@ -103,7 +103,7 @@ public function relativeDocUrl(string $linkedDocument, string|null $anchor = nul
 
         return $this->urlGenerator->generateOutputUrlFromDocumentPath(
             $this->getDirName(),
-            $this->destinationPath,
+            $this->outputFolder,
             $linkedDocument,
             $this->outputFormat,
             $anchor,

packages/guides/src/UrlGenerator.php

@@ -13,13 +13,13 @@
 
 namespace phpDocumentor\Guides;
 
-use League\Uri\Uri;
 use League\Uri\UriInfo;
 
 use function array_pop;
 use function explode;
 use function implode;
 use function ltrim;
+use function rtrim;
 use function trim;
 
 final class UrlGenerator implements UrlGeneratorInterface
@@ -93,16 +93,16 @@ public function generateOutputUrlFromDocumentPath(
         string $outputFormat,
         string|null $anchor = null,
     ): string {
-        $fileUrl = $this->createFileUrl($linkedDocument, $outputFormat, $anchor);
-        if (UriInfo::isAbsolutePath(Uri::createFromString($linkedDocument))) {
-            return $destinationPath . $fileUrl;
-        }
+        $canonicalUrl = $this->canonicalUrl(
+            $currentDirectory,
+            $linkedDocument,
+        );
 
-        $baseUrl = ltrim($this->absoluteUrl($destinationPath, $currentDirectory), '/');
+        $fileUrl = $this->createFileUrl($canonicalUrl, $outputFormat, $anchor);
+        if ($destinationPath === '') {
+            return $fileUrl;
+        }
 
-        return $this->canonicalUrl(
-            $baseUrl,
-            $fileUrl,
-        );
+        return rtrim($destinationPath, '/') . '/' . $fileUrl;
     }
 }

packages/guides/tests/unit/UrlGeneratorTest.php

@@ -197,6 +197,24 @@ public static function documentPathProvider(): array
                 'linkedDocument' => '../../references/installing',
                 'result' => 'guide/references/installing.txt',
             ],
+            'Empty destination' => [
+                'currentDirectory' => 'getting-started/something',
+                'destinationPath' => '',
+                'linkedDocument' => '../../references/installing',
+                'result' => 'references/installing.txt',
+            ],
+            'Destination is empty absolute path' => [
+                'currentDirectory' => 'getting-started/something',
+                'destinationPath' => '/',
+                'linkedDocument' => '../../references/installing',
+                'result' => '/references/installing.txt',
+            ],
+            'Destination is absolute' => [
+                'currentDirectory' => 'getting-started/something',
+                'destinationPath' => '/guide/',
+                'linkedDocument' => '../../references/installing',
+                'result' => '/guide/references/installing.txt',
+            ],
         ];
     }
 }