Merge pull request #291 from hydephp/internal-codebase-improvements

github-actions · github-actions · commit d4e46a331be5 · 2022-07-30T07:03:57.000Z
Internal codebase improvements hydephp/develop@598c15b
diff --git a/resources/views/components/post/image.blade.php b/resources/views/components/post/image.blade.php
@@ -1,5 +1,5 @@
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
-    <img src="{{ $page->image->getLink($currentPage) }}" alt="{{ $page->image->description ?? '' }}" title="{{ $page->image->title ?? '' }}" itemprop="image" class="mb-0"> 
+    <img src="{{ $page->image->getLink() }}" alt="{{ $page->image->description ?? '' }}" title="{{ $page->image->title ?? '' }}" itemprop="image" class="mb-0"> 
     <figcaption aria-label="Image caption" itemprop="caption"> 
         {!! $page->image->getFluentAttribution() !!} 
     </figcaption> 
diff --git a/resources/views/layouts/docs.blade.php b/resources/views/layouts/docs.blade.php
@@ -71,7 +71,7 @@ class="p-4 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-[cal
 		</nav>
 		<footer id="sidebar-footer" class="h-16 absolute p-4 w-full bottom-0 left-0 text-center leading-8">
 			<p>
-				<a href="{{ Hyde::relativeLink('index.html', $currentPage) }}">Back to home page</a>
+				<a href="{{ Hyde::relativeLink('index.html') }}">Back to home page</a>
 			</p>
 		</footer>
 	</aside>
diff --git a/src/Hyde.php b/src/Hyde.php
@@ -24,11 +24,11 @@
  * @method static string path(string $path = '')
  * @method static \Hyde\Framework\Helpers\Features features()
  * @method static bool hasFeature(string $feature)
- * @method static string relativeLink(string $destination, null|string $current = null)
+ * @method static string relativeLink(string $destination)
  * @method static string getMarkdownPostPath(string $path = '')
  * @method static bool|int copy(string $from, string $to, bool $force = false)
  * @method static string getModelSourcePath(string $model, string $path = '')
- * @method static string image(string $name, string $current = null)
+ * @method static string image(string $name)
  * @method static void macro(string $name, callable|object $macro)
  * @method static \Hyde\Framework\Contracts\RouteContract|null currentRoute()
  * @method static string currentPage()
diff --git a/src/HydeKernel.php b/src/HydeKernel.php
@@ -37,7 +37,7 @@ public function __construct(?string $basePath = null)
         $this->setBasePath($basePath ?? getcwd());
     }
 
-    public static function getInstance(): static
+    public static function getInstance(): HydeKernelContract
     {
         return app(HydeKernelContract::class);
     }
@@ -101,12 +101,12 @@ public function makeTitle(string $slug): string
     public function path(string $path = ''): string
     {
         if (empty($path)) {
-            return static::getBasePath();
+            return $this->getBasePath();
         }
 
         $path = unslash($path);
 
-        return static::getBasePath().DIRECTORY_SEPARATOR.$path;
+        return $this->getBasePath().DIRECTORY_SEPARATOR.$path;
     }
 
     /**
@@ -146,30 +146,23 @@ public function pageLink(string $destination): string
     /**
      * Inject the proper number of `../` before the links in Blade templates.
      *
-     * Since v0.50.x you no longer have to supply a current page as it will be automatically retrieved from the View.
-     *
      * @param  string  $destination  relative to output directory on compiled site
-     * @param  string|null  $current  the current URI path relative to the site root
      * @return string
      *
      * @see \Hyde\Framework\Testing\Unit\FileHelperRelativeLinkTest
      */
-    public function relativeLink(string $destination, ?string $current = null): string
+    public function relativeLink(string $destination): string
     {
         if (str_starts_with($destination, '../')) {
             return $destination;
         }
 
-        if ($current === null) {
-            $current = static::currentPage();
-        }
-
-        $nestCount = substr_count($current, '/');
+        $nestCount = substr_count($this->currentPage(), '/');
         $route = '';
         if ($nestCount > 0) {
             $route .= str_repeat('../', $nestCount);
         }
-        $route .= static::pageLink($destination);
+        $route .= $this->pageLink($destination);
 
         return str_replace('//', '/', $route);
     }
@@ -192,28 +185,23 @@ public function currentRoute(): ?RouteContract
 
     /**
      * Gets a relative web link to the given image stored in the _site/media folder.
-     * Since v0.50.x you no longer have to supply a current page as it will be automatically retrieved from the View.
      */
-    public function image(string $name, string $current = null): string
+    public function image(string $name): string
     {
-        if ($current === null) {
-            $current = static::currentPage();
-        }
-
         if (str_starts_with($name, 'http')) {
             return $name;
         }
 
-        return static::relativeLink('media/'.basename($name), $current);
+        return $this->relativeLink('media/'.basename($name));
     }
 
     /**
      * Return a qualified URI path, if SITE_URL is set in .env, else return false.
      *
-     * @param  string|null  $path  optional relative path suffix. Omit to return base url.
+     * @param  string  $path  optional relative path suffix. Omit to return base url.
      * @return string|false
      */
-    public function uriPath(?string $path = ''): string|false
+    public function uriPath(string $path = ''): string|false
     {
         if (config('site.url', false)) {
             return rtrim(config('site.url'), '/').'/'.(trim($path, '/') ?? '');
@@ -265,22 +253,22 @@ public function getModelSourcePath(string $model, string $path = ''): string
 
     public function getBladePagePath(string $path = ''): string
     {
-        return static::getModelSourcePath(BladePage::class, $path);
+        return $this->getModelSourcePath(BladePage::class, $path);
     }
 
     public function getMarkdownPagePath(string $path = ''): string
     {
-        return static::getModelSourcePath(MarkdownPage::class, $path);
+        return $this->getModelSourcePath(MarkdownPage::class, $path);
     }
 
     public function getMarkdownPostPath(string $path = ''): string
     {
-        return static::getModelSourcePath(MarkdownPost::class, $path);
+        return $this->getModelSourcePath(MarkdownPost::class, $path);
     }
 
     public function getDocumentationPagePath(string $path = ''): string
     {
-        return static::getModelSourcePath(DocumentationPage::class, $path);
+        return $this->getModelSourcePath(DocumentationPage::class, $path);
     }
 
     /**
diff --git a/src/Models/Image.php b/src/Models/Image.php
@@ -101,9 +101,9 @@ public function getSource(): ?string
         return $this->uri ?? $this->path ?? null;
     }
 
-    public function getLink(?string $currentPage = ''): string
+    public function getLink(): string
     {
-        return Hyde::image($this->getSource() ?? '', $currentPage);
+        return Hyde::image($this->getSource() ?? '');
     }
 
     public function getContentLength(): int
diff --git a/src/Views/Components/LinkComponent.php b/src/Views/Components/LinkComponent.php
@@ -3,7 +3,6 @@
 namespace Hyde\Framework\Views\Components;
 
 use Hyde\Framework\Hyde;
-use Illuminate\Support\Facades\View;
 use Illuminate\View\Component;
 
 class LinkComponent extends Component
@@ -12,7 +11,7 @@ class LinkComponent extends Component
 
     public function __construct(string $href)
     {
-        $this->href = Hyde::relativeLink($href, View::shared('currentPage') ?? '');
+        $this->href = Hyde::relativeLink($href);
     }
 
     public function render(): \Illuminate\Contracts\View\View
diff --git a/tests/Feature/ImageModelTest.php b/tests/Feature/ImageModelTest.php
@@ -168,6 +168,7 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()
             'path' => 'image.jpg',
         ]);
 
-        $this->assertEquals('../media/image.jpg', $image->getLink('foo/bar'));
+        $this->mockCurrentPage('foo/bar');
+        $this->assertEquals('../media/image.jpg', $image->getLink());
     }
 }
diff --git a/tests/Feature/RouteTest.php b/tests/Feature/RouteTest.php
@@ -153,7 +153,7 @@ public function test_get_link_returns_correct_path_for_nested_current_page()
     {
         $route = new Route(new MarkdownPage(slug: 'foo'));
         view()->share('currentPage', 'foo/bar');
-        $this->assertEquals(Hyde::relativeLink($route->getOutputFilePath(), 'foo/bar'), $route->getLink());
+        $this->assertEquals(Hyde::relativeLink($route->getOutputFilePath()), $route->getLink());
         $this->assertEquals('../foo.html', $route->getLink());
     }
 
diff --git a/tests/Unit/FileHelperRelativeLinkTest.php b/tests/Unit/FileHelperRelativeLinkTest.php
@@ -19,87 +19,121 @@ public function test_helper_returns_string_as_is_if_current_is_not_set()
 
     public function test_helper_injects_proper_number_of_doubles_slash()
     {
-        $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html', 'foo/bar.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_injects_proper_number_of_doubles_slash_for_deeply_nested_paths()
     {
-        $this->assertEquals('../../../foo.html', Hyde::relativeLink('foo.html', 'foo/bar/baz/qux.html'));
+        $this->mockCurrentPage('foo/bar/baz/qux.html');
+        $this->assertEquals('../../../foo.html', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_handles_destination_without_file_extension()
     {
-        $this->assertEquals('../foo', Hyde::relativeLink('foo', 'foo/bar.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../foo', Hyde::relativeLink('foo'));
     }
 
     public function test_helper_handles_current_without_file_extension()
     {
-        $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html', 'foo/bar'));
+        $this->mockCurrentPage('foo/bar');
+        $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_handles_case_without_any_file_extensions()
     {
-        $this->assertEquals('../foo', Hyde::relativeLink('foo', 'foo/bar'));
+        $this->mockCurrentPage('foo/bar');
+        $this->assertEquals('../foo', Hyde::relativeLink('foo'));
     }
 
     public function test_helper_handles_case_with_mixed_file_extensions()
     {
+        $this->mockCurrentPage('foo/bar.md');
         $this->assertEquals('../foo.md', Hyde::relativeLink('foo.md', 'foo/bar.md'));
+        $this->mockCurrentPage('foo/bar.txt');
         $this->assertEquals('../foo.txt', Hyde::relativeLink('foo.txt', 'foo/bar.txt'));
     }
 
     public function test_helper_handles_different_file_extensions()
     {
-        $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png', 'foo/bar'));
-        $this->assertEquals('../foo.css', Hyde::relativeLink('foo.css', 'foo/bar'));
-        $this->assertEquals('../foo.js', Hyde::relativeLink('foo.js', 'foo/bar'));
+        $this->mockCurrentPage('foo/bar');
+        $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png'));
+        $this->assertEquals('../foo.css', Hyde::relativeLink('foo.css'));
+        $this->assertEquals('../foo.js', Hyde::relativeLink('foo.js'));
     }
 
     public function test_helper_returns_pretty_url_if_enabled_and_destination_is_a_html_file()
     {
         config(['site.pretty_urls' => true]);
-        $this->assertEquals('../foo', Hyde::relativeLink('foo.html', 'foo/bar.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_method_does_not_require_current_path_to_be_html_to_use_pretty_urls()
     {
         config(['site.pretty_urls' => true]);
-        $this->assertEquals('../foo', Hyde::relativeLink('foo.html', 'foo/bar'));
+        $this->mockCurrentPage('foo/bar');
+        $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_returns_does_not_return_pretty_url_if_when_enabled_but_and_destination_is_not_a_html_file()
     {
         config(['site.pretty_urls' => true]);
-        $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png', 'foo/bar.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png'));
     }
 
     public function test_helper_rewrites_index_when_using_pretty_urls()
     {
         config(['site.pretty_urls' => true]);
-        $this->assertEquals('/', Hyde::relativeLink('index.html', 'foo.html'));
-        $this->assertEquals('../', Hyde::relativeLink('index.html', 'foo/bar.html'));
-        $this->assertEquals('../../', Hyde::relativeLink('index.html', 'foo/bar/baz.html'));
+        $this->mockCurrentPage('foo.html');
+        $this->assertEquals('/', Hyde::relativeLink('index.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../', Hyde::relativeLink('index.html'));
+        $this->mockCurrentPage('foo/bar/baz.html');
+        $this->assertEquals('../../', Hyde::relativeLink('index.html'));
     }
 
     public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()
     {
         config(['site.pretty_urls' => false]);
-        $this->assertEquals('index.html', Hyde::relativeLink('index.html', 'foo.html'));
-        $this->assertEquals('../index.html', Hyde::relativeLink('index.html', 'foo/bar.html'));
-        $this->assertEquals('../../index.html', Hyde::relativeLink('index.html', 'foo/bar/baz.html'));
+        $this->mockCurrentPage('foo.html');
+        $this->assertEquals('index.html', Hyde::relativeLink('index.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../index.html', Hyde::relativeLink('index.html'));
+        $this->mockCurrentPage('foo/bar/baz.html');
+        $this->assertEquals('../../index.html', Hyde::relativeLink('index.html'));
     }
 
     public function test_helper_rewrites_documentation_page_index_when_using_pretty_urls()
     {
         config(['site.pretty_urls' => true]);
-        $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html', 'foo.html'));
-        $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html', 'docs.html'));
-        $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html', 'foo/bar.html'));
-        $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html', 'docs/foo.html'));
+        $this->mockCurrentPage('foo.html');
+        $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('docs.html');
+        $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('docs/foo.html');
+        $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html'));
+    }
+
+    public function test_helper_does_not_rewrite_documentation_page_index_when_not_using_pretty_urls()
+    {
+        config(['site.pretty_urls' => false]);
+        $this->mockCurrentPage('foo.html');
+        $this->assertEquals('docs/index.html', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('docs.html');
+        $this->assertEquals('docs/index.html', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('foo/bar.html');
+        $this->assertEquals('../docs/index.html', Hyde::relativeLink('docs/index.html'));
+        $this->mockCurrentPage('docs/foo.html');
+        $this->assertEquals('../docs/index.html', Hyde::relativeLink('docs/index.html'));
     }
 
     public function test_helper_does_not_rewrite_already_processed_links()
     {
-        $this->assertEquals('../foo', Hyde::relativeLink('../foo', 'foo/bar.html'));
+        $this->assertEquals('../foo', Hyde::relativeLink('../foo'));
     }
 }
diff --git a/tests/Unit/FileHelpersImageTest.php b/tests/Unit/FileHelpersImageTest.php
@@ -34,7 +34,8 @@ public function test_image_helper_resolves_paths_for_nested_pages()
         ];
 
         foreach ($tests as $input => $expected) {
-            $this->assertEquals(Hyde::image($input, 'foo/bar'), $expected);
+            $this->mockCurrentPage('foo/bar');
+            $this->assertEquals(Hyde::image($input), $expected);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(?string $basePath = null)`
`37`	`37`	`$this->setBasePath($basePath ?? getcwd());`
`38`	`38`	`}`
`39`	`39`
`40`		`- public static function getInstance(): static`
	`40`	`+ public static function getInstance(): HydeKernelContract`
`41`	`41`	`{`
`42`	`42`	`return app(HydeKernelContract::class);`
`43`	`43`	`}`
`@@ -101,12 +101,12 @@ public function makeTitle(string $slug): string`
`101`	`101`	`public function path(string $path = ''): string`
`102`	`102`	`{`
`103`	`103`	`if (empty($path)) {`
`104`		`- return static::getBasePath();`
	`104`	`+ return $this->getBasePath();`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`$path = unslash($path);`
`108`	`108`
`109`		`- return static::getBasePath().DIRECTORY_SEPARATOR.$path;`
	`109`	`+ return $this->getBasePath().DIRECTORY_SEPARATOR.$path;`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
`@@ -146,30 +146,23 @@ public function pageLink(string $destination): string`
`146`	`146`	`/**`
`147`	`147`	* Inject the proper number of `../` before the links in Blade templates.
`148`	`148`	`*`
`149`		`- * Since v0.50.x you no longer have to supply a current page as it will be automatically retrieved from the View.`
`150`		`- *`
`151`	`149`	`* @param string $destination relative to output directory on compiled site`
`152`		`- * @param string\|null $current the current URI path relative to the site root`
`153`	`150`	`* @return string`
`154`	`151`	`*`
`155`	`152`	`* @see \Hyde\Framework\Testing\Unit\FileHelperRelativeLinkTest`
`156`	`153`	`*/`
`157`		`- public function relativeLink(string $destination, ?string $current = null): string`
	`154`	`+ public function relativeLink(string $destination): string`
`158`	`155`	`{`
`159`	`156`	`if (str_starts_with($destination, '../')) {`
`160`	`157`	`return $destination;`
`161`	`158`	`}`
`162`	`159`
`163`		`- if ($current === null) {`
`164`		`- $current = static::currentPage();`
`165`		`- }`
`166`		`-`
`167`		`- $nestCount = substr_count($current, '/');`
	`160`	`+ $nestCount = substr_count($this->currentPage(), '/');`
`168`	`161`	`$route = '';`
`169`	`162`	`if ($nestCount > 0) {`
`170`	`163`	`$route .= str_repeat('../', $nestCount);`
`171`	`164`	`}`
`172`		`- $route .= static::pageLink($destination);`
	`165`	`+ $route .= $this->pageLink($destination);`
`173`	`166`
`174`	`167`	`return str_replace('//', '/', $route);`
`175`	`168`	`}`
`@@ -192,28 +185,23 @@ public function currentRoute(): ?RouteContract`
`192`	`185`
`193`	`186`	`/**`
`194`	`187`	`* Gets a relative web link to the given image stored in the _site/media folder.`
`195`		`- * Since v0.50.x you no longer have to supply a current page as it will be automatically retrieved from the View.`
`196`	`188`	`*/`
`197`		`- public function image(string $name, string $current = null): string`
	`189`	`+ public function image(string $name): string`
`198`	`190`	`{`
`199`		`- if ($current === null) {`
`200`		`- $current = static::currentPage();`
`201`		`- }`
`202`		`-`
`203`	`191`	`if (str_starts_with($name, 'http')) {`
`204`	`192`	`return $name;`
`205`	`193`	`}`
`206`	`194`
`207`		`- return static::relativeLink('media/'.basename($name), $current);`
	`195`	`+ return $this->relativeLink('media/'.basename($name));`
`208`	`196`	`}`
`209`	`197`
`210`	`198`	`/**`
`211`	`199`	`* Return a qualified URI path, if SITE_URL is set in .env, else return false.`
`212`	`200`	`*`
`213`		`- * @param string\|null $path optional relative path suffix. Omit to return base url.`
	`201`	`+ * @param string $path optional relative path suffix. Omit to return base url.`
`214`	`202`	`* @return string\|false`
`215`	`203`	`*/`
`216`		`- public function uriPath(?string $path = ''): string\|false`
	`204`	`+ public function uriPath(string $path = ''): string\|false`
`217`	`205`	`{`
`218`	`206`	`if (config('site.url', false)) {`
`219`	`207`	`return rtrim(config('site.url'), '/').'/'.(trim($path, '/') ?? '');`
`@@ -265,22 +253,22 @@ public function getModelSourcePath(string $model, string $path = ''): string`
`265`	`253`
`266`	`254`	`public function getBladePagePath(string $path = ''): string`
`267`	`255`	`{`
`268`		`- return static::getModelSourcePath(BladePage::class, $path);`
	`256`	`+ return $this->getModelSourcePath(BladePage::class, $path);`
`269`	`257`	`}`
`270`	`258`
`271`	`259`	`public function getMarkdownPagePath(string $path = ''): string`
`272`	`260`	`{`
`273`		`- return static::getModelSourcePath(MarkdownPage::class, $path);`
	`261`	`+ return $this->getModelSourcePath(MarkdownPage::class, $path);`
`274`	`262`	`}`
`275`	`263`
`276`	`264`	`public function getMarkdownPostPath(string $path = ''): string`
`277`	`265`	`{`
`278`		`- return static::getModelSourcePath(MarkdownPost::class, $path);`
	`266`	`+ return $this->getModelSourcePath(MarkdownPost::class, $path);`
`279`	`267`	`}`
`280`	`268`
`281`	`269`	`public function getDocumentationPagePath(string $path = ''): string`
`282`	`270`	`{`
`283`		`- return static::getModelSourcePath(DocumentationPage::class, $path);`
	`271`	`+ return $this->getModelSourcePath(DocumentationPage::class, $path);`
`284`	`272`	`}`
`285`	`273`
`286`	`274`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ public function getSource(): ?string`
`101`	`101`	`return $this->uri ?? $this->path ?? null;`
`102`	`102`	`}`
`103`	`103`
`104`		`- public function getLink(?string $currentPage = ''): string`
	`104`	`+ public function getLink(): string`
`105`	`105`	`{`
`106`		`- return Hyde::image($this->getSource() ?? '', $currentPage);`
	`106`	`+ return Hyde::image($this->getSource() ?? '');`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public function getContentLength(): int`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Hyde\Framework\Views\Components;`
`4`	`4`
`5`	`5`	`use Hyde\Framework\Hyde;`
`6`		`-use Illuminate\Support\Facades\View;`
`7`	`6`	`use Illuminate\View\Component;`
`8`	`7`
`9`	`8`	`class LinkComponent extends Component`
`@@ -12,7 +11,7 @@ class LinkComponent extends Component`
`12`	`11`
`13`	`12`	`public function __construct(string $href)`
`14`	`13`	`{`
`15`		`- $this->href = Hyde::relativeLink($href, View::shared('currentPage') ?? '');`
	`14`	`+ $this->href = Hyde::relativeLink($href);`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`public function render(): \Illuminate\Contracts\View\View`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()`
`168`	`168`	`'path' => 'image.jpg',`
`169`	`169`	`]);`
`170`	`170`
`171`		`- $this->assertEquals('../media/image.jpg', $image->getLink('foo/bar'));`
	`171`	`+ $this->mockCurrentPage('foo/bar');`
	`172`	`+ $this->assertEquals('../media/image.jpg', $image->getLink());`
`172`	`173`	`}`
`173`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function test_get_link_returns_correct_path_for_nested_current_page()`
`153`	`153`	`{`
`154`	`154`	`$route = new Route(new MarkdownPage(slug: 'foo'));`
`155`	`155`	`view()->share('currentPage', 'foo/bar');`
`156`		`- $this->assertEquals(Hyde::relativeLink($route->getOutputFilePath(), 'foo/bar'), $route->getLink());`
	`156`	`+ $this->assertEquals(Hyde::relativeLink($route->getOutputFilePath()), $route->getLink());`
`157`	`157`	`$this->assertEquals('../foo.html', $route->getLink());`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -19,87 +19,121 @@ public function test_helper_returns_string_as_is_if_current_is_not_set()`
`19`	`19`
`20`	`20`	`public function test_helper_injects_proper_number_of_doubles_slash()`
`21`	`21`	`{`
`22`		`- $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html', 'foo/bar.html'));`
	`22`	`+ $this->mockCurrentPage('foo/bar.html');`
	`23`	`+ $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html'));`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public function test_helper_injects_proper_number_of_doubles_slash_for_deeply_nested_paths()`
`26`	`27`	`{`
`27`		`- $this->assertEquals('../../../foo.html', Hyde::relativeLink('foo.html', 'foo/bar/baz/qux.html'));`
	`28`	`+ $this->mockCurrentPage('foo/bar/baz/qux.html');`
	`29`	`+ $this->assertEquals('../../../foo.html', Hyde::relativeLink('foo.html'));`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public function test_helper_handles_destination_without_file_extension()`
`31`	`33`	`{`
`32`		`- $this->assertEquals('../foo', Hyde::relativeLink('foo', 'foo/bar.html'));`
	`34`	`+ $this->mockCurrentPage('foo/bar.html');`
	`35`	`+ $this->assertEquals('../foo', Hyde::relativeLink('foo'));`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`public function test_helper_handles_current_without_file_extension()`
`36`	`39`	`{`
`37`		`- $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html', 'foo/bar'));`
	`40`	`+ $this->mockCurrentPage('foo/bar');`
	`41`	`+ $this->assertEquals('../foo.html', Hyde::relativeLink('foo.html'));`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`public function test_helper_handles_case_without_any_file_extensions()`
`41`	`45`	`{`
`42`		`- $this->assertEquals('../foo', Hyde::relativeLink('foo', 'foo/bar'));`
	`46`	`+ $this->mockCurrentPage('foo/bar');`
	`47`	`+ $this->assertEquals('../foo', Hyde::relativeLink('foo'));`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`public function test_helper_handles_case_with_mixed_file_extensions()`
`46`	`51`	`{`
	`52`	`+ $this->mockCurrentPage('foo/bar.md');`
`47`	`53`	`$this->assertEquals('../foo.md', Hyde::relativeLink('foo.md', 'foo/bar.md'));`
	`54`	`+ $this->mockCurrentPage('foo/bar.txt');`
`48`	`55`	`$this->assertEquals('../foo.txt', Hyde::relativeLink('foo.txt', 'foo/bar.txt'));`
`49`	`56`	`}`
`50`	`57`
`51`	`58`	`public function test_helper_handles_different_file_extensions()`
`52`	`59`	`{`
`53`		`- $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png', 'foo/bar'));`
`54`		`- $this->assertEquals('../foo.css', Hyde::relativeLink('foo.css', 'foo/bar'));`
`55`		`- $this->assertEquals('../foo.js', Hyde::relativeLink('foo.js', 'foo/bar'));`
	`60`	`+ $this->mockCurrentPage('foo/bar');`
	`61`	`+ $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png'));`
	`62`	`+ $this->assertEquals('../foo.css', Hyde::relativeLink('foo.css'));`
	`63`	`+ $this->assertEquals('../foo.js', Hyde::relativeLink('foo.js'));`
`56`	`64`	`}`
`57`	`65`
`58`	`66`	`public function test_helper_returns_pretty_url_if_enabled_and_destination_is_a_html_file()`
`59`	`67`	`{`
`60`	`68`	`config(['site.pretty_urls' => true]);`
`61`		`- $this->assertEquals('../foo', Hyde::relativeLink('foo.html', 'foo/bar.html'));`
	`69`	`+ $this->mockCurrentPage('foo/bar.html');`
	`70`	`+ $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));`
`62`	`71`	`}`
`63`	`72`
`64`	`73`	`public function test_helper_method_does_not_require_current_path_to_be_html_to_use_pretty_urls()`
`65`	`74`	`{`
`66`	`75`	`config(['site.pretty_urls' => true]);`
`67`		`- $this->assertEquals('../foo', Hyde::relativeLink('foo.html', 'foo/bar'));`
	`76`	`+ $this->mockCurrentPage('foo/bar');`
	`77`	`+ $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));`
`68`	`78`	`}`
`69`	`79`
`70`	`80`	`public function test_helper_returns_does_not_return_pretty_url_if_when_enabled_but_and_destination_is_not_a_html_file()`
`71`	`81`	`{`
`72`	`82`	`config(['site.pretty_urls' => true]);`
`73`		`- $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png', 'foo/bar.html'));`
	`83`	`+ $this->mockCurrentPage('foo/bar.html');`
	`84`	`+ $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png'));`
`74`	`85`	`}`
`75`	`86`
`76`	`87`	`public function test_helper_rewrites_index_when_using_pretty_urls()`
`77`	`88`	`{`
`78`	`89`	`config(['site.pretty_urls' => true]);`
`79`		`- $this->assertEquals('/', Hyde::relativeLink('index.html', 'foo.html'));`
`80`		`- $this->assertEquals('../', Hyde::relativeLink('index.html', 'foo/bar.html'));`
`81`		`- $this->assertEquals('../../', Hyde::relativeLink('index.html', 'foo/bar/baz.html'));`
	`90`	`+ $this->mockCurrentPage('foo.html');`
	`91`	`+ $this->assertEquals('/', Hyde::relativeLink('index.html'));`
	`92`	`+ $this->mockCurrentPage('foo/bar.html');`
	`93`	`+ $this->assertEquals('../', Hyde::relativeLink('index.html'));`
	`94`	`+ $this->mockCurrentPage('foo/bar/baz.html');`
	`95`	`+ $this->assertEquals('../../', Hyde::relativeLink('index.html'));`
`82`	`96`	`}`
`83`	`97`
`84`	`98`	`public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()`
`85`	`99`	`{`
`86`	`100`	`config(['site.pretty_urls' => false]);`
`87`		`- $this->assertEquals('index.html', Hyde::relativeLink('index.html', 'foo.html'));`
`88`		`- $this->assertEquals('../index.html', Hyde::relativeLink('index.html', 'foo/bar.html'));`
`89`		`- $this->assertEquals('../../index.html', Hyde::relativeLink('index.html', 'foo/bar/baz.html'));`
	`101`	`+ $this->mockCurrentPage('foo.html');`
	`102`	`+ $this->assertEquals('index.html', Hyde::relativeLink('index.html'));`
	`103`	`+ $this->mockCurrentPage('foo/bar.html');`
	`104`	`+ $this->assertEquals('../index.html', Hyde::relativeLink('index.html'));`
	`105`	`+ $this->mockCurrentPage('foo/bar/baz.html');`
	`106`	`+ $this->assertEquals('../../index.html', Hyde::relativeLink('index.html'));`
`90`	`107`	`}`
`91`	`108`
`92`	`109`	`public function test_helper_rewrites_documentation_page_index_when_using_pretty_urls()`
`93`	`110`	`{`
`94`	`111`	`config(['site.pretty_urls' => true]);`
`95`		`- $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html', 'foo.html'));`
`96`		`- $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html', 'docs.html'));`
`97`		`- $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html', 'foo/bar.html'));`
`98`		`- $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html', 'docs/foo.html'));`
	`112`	`+ $this->mockCurrentPage('foo.html');`
	`113`	`+ $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html'));`
	`114`	`+ $this->mockCurrentPage('docs.html');`
	`115`	`+ $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html'));`
	`116`	`+ $this->mockCurrentPage('foo/bar.html');`
	`117`	`+ $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html'));`
	`118`	`+ $this->mockCurrentPage('docs/foo.html');`
	`119`	`+ $this->assertEquals('../docs/', Hyde::relativeLink('docs/index.html'));`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ public function test_helper_does_not_rewrite_documentation_page_index_when_not_using_pretty_urls()`
	`123`	`+ {`
	`124`	`+ config(['site.pretty_urls' => false]);`
	`125`	`+ $this->mockCurrentPage('foo.html');`
	`126`	`+ $this->assertEquals('docs/index.html', Hyde::relativeLink('docs/index.html'));`
	`127`	`+ $this->mockCurrentPage('docs.html');`
	`128`	`+ $this->assertEquals('docs/index.html', Hyde::relativeLink('docs/index.html'));`
	`129`	`+ $this->mockCurrentPage('foo/bar.html');`
	`130`	`+ $this->assertEquals('../docs/index.html', Hyde::relativeLink('docs/index.html'));`
	`131`	`+ $this->mockCurrentPage('docs/foo.html');`
	`132`	`+ $this->assertEquals('../docs/index.html', Hyde::relativeLink('docs/index.html'));`
`99`	`133`	`}`
`100`	`134`
`101`	`135`	`public function test_helper_does_not_rewrite_already_processed_links()`
`102`	`136`	`{`
`103`		`- $this->assertEquals('../foo', Hyde::relativeLink('../foo', 'foo/bar.html'));`
	`137`	`+ $this->assertEquals('../foo', Hyde::relativeLink('../foo'));`
`104`	`138`	`}`
`105`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ public function test_image_helper_resolves_paths_for_nested_pages()`
`34`	`34`	`];`
`35`	`35`
`36`	`36`	`foreach ($tests as $input => $expected) {`
`37`		`- $this->assertEquals(Hyde::image($input, 'foo/bar'), $expected);`
	`37`	`+ $this->mockCurrentPage('foo/bar');`
	`38`	`+ $this->assertEquals(Hyde::image($input), $expected);`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`}`