Merge pull request #606 from phpDocumentor/task/remove-relativeURL

!!![TASK] Remove UrlGeneratorInterface::relativeURL

Author: jaapio

packages/guides-restructured-text/src/RestructuredText/Directives/FigureDirective.php

@@ -10,7 +10,6 @@
 use phpDocumentor\Guides\Nodes\Node;
 use phpDocumentor\Guides\RestructuredText\Parser\Directive;
 use phpDocumentor\Guides\RestructuredText\Parser\Productions\Rule;
-use phpDocumentor\Guides\UrlGeneratorInterface;
 
 /**
  * Renders an image, example :
@@ -23,7 +22,7 @@
  */
 class FigureDirective extends SubDirective
 {
-    public function __construct(protected Rule $startingRule, private readonly UrlGeneratorInterface $urlGenerator)
+    public function __construct(protected Rule $startingRule)
     {
         parent::__construct($startingRule);
     }
@@ -41,7 +40,7 @@ protected function processSub(
         CollectionNode $collectionNode,
         Directive $directive,
     ): Node|null {
-        $image = new ImageNode($this->urlGenerator->relativeUrl($directive->getData()));
+        $image = new ImageNode($directive->getData());
         $scalarOptions = $this->optionsToArray($directive->getOptions());
         $image = $image->withOptions([
             'width' => $scalarOptions['width'] ?? null,

packages/guides/src/ParserContext.php

@@ -70,19 +70,14 @@ public function getLinks(): array
         return $this->links;
     }
 
-    private function relativeUrl(string $url): string
-    {
-        return $this->urlGenerator->relativeUrl($url);
-    }
-
     public function absoluteRelativePath(string $url): string
     {
         $uri = Uri::createFromString($url);
         if (UriInfo::isAbsolutePath($uri)) {
             return $this->currentDirectory . '/' . ltrim($url, '/');
         }
 
-        return $this->currentDirectory . '/' . $this->getDirName() . '/' . $this->relativeUrl($url);
+        return $this->currentDirectory . '/' . $this->getDirName() . '/' . ltrim($url, '/');
     }
 
     public function getDirName(): string

packages/guides/src/RenderContext.php

@@ -85,19 +85,11 @@ public function getVariable(string $variable, mixed $default = null): mixed
         return $this->document->getVariable($variable, $default);
     }
 
-    public function getLink(string $name, bool $relative = true): string
+    public function getLink(string $name): string
     {
         $link = $this->document->getLink($name);
 
-        if ($link !== null) {
-            if ($relative) {
-                return $this->urlGenerator->relativeUrl($link);
-            }
-
-            return $link;
-        }
-
-        return '';
+        return $link ?? '';
     }
 
     public function canonicalUrl(string $url): string

packages/guides/src/UrlGenerator.php

@@ -43,24 +43,6 @@ public function absoluteUrl(string $basePath, string $url): string
         return '/' . trim($basePath, '/') . '/' . $url;
     }
 
-    /**
-     * Resolves a relative URL.
-     */
-    public function relativeUrl(string $url): string
-    {
-        $uri = UriFactory::createUri($url);
-
-        if (UriInfo::isAbsolutePath($uri)) {
-            return $url;
-        }
-
-        if (UriInfo::isRelativePath($uri)) {
-            return $url;
-        }
-
-        return ltrim($url, '/');
-    }
-
     /**
      * Returns the Path used in the Metas to find this file.
      *

packages/guides/src/UrlGeneratorInterface.php

@@ -14,11 +14,6 @@ interface UrlGeneratorInterface
      */
     public function absoluteUrl(string $basePath, string $url): string;
 
-    /**
-     * Resolves a relative URL.
-     */
-    public function relativeUrl(string $url): string;
-
     /**
      * Returns the Path used in the Metas to find this file.
      *