Merge pull request #157 from hydephp/Replace-deprecated-method-usages…

…-with-new-helper Replace deprecated method usages with new output directory helper hydephp/develop@780e4e1
hydephp · Jul 3, 2022 · 49cc57f · 49cc57f
1 parent e1a8e6a
commit 49cc57f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/Actions/GeneratesNavigationMenu.php b/src/Actions/GeneratesNavigationMenu.php
@@ -4,6 +4,7 @@
 
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Hyde;
+use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\CollectionService;
 use Illuminate\Support\Str;
 
@@ -81,8 +82,8 @@ protected function getLinks(): array
                         'title' => 'Docs',
                         'route' => $this->getRelativeRoutePathForSlug(
                             file_exists(Hyde::getDocumentationPagePath('/index.md'))
-                                ? Hyde::getDocumentationOutputDirectory().'/index'
-                                : Hyde::getDocumentationOutputDirectory().'/readme'
+                                ? DocumentationPage::getOutputDirectory().'/index'
+                                : DocumentationPage::getOutputDirectory().'/readme'
                         ),
                         'current' => false,
                         'priority' => config('docs.navigation_link_priority', 1000),

diff --git a/src/Concerns/Internal/FileHelpers.php b/src/Concerns/Internal/FileHelpers.php
@@ -17,8 +17,7 @@ trait FileHelpers
     /**
      * Get the subdirectory compiled documentation files are stored in.
      *
-     * @since 0.39.x (replaces `Hyde::docsDirectory()`)
-     * @deprecated v0.44.x (handled in the page model property `outputDirectory`)
+     * @deprecated v0.44.x Use DocumentationPage::getOutputDirectory() instead
      *
      * @return string
      */
@@ -37,11 +36,11 @@ public static function getDocumentationOutputDirectory(): string
     public static function docsIndexPath(): string|false
     {
         if (file_exists(static::path(DocumentationPage::getSourceDirectory().'/index.md'))) {
-            return trim(static::pageLink(static::getDocumentationOutputDirectory().'/index.html'), '/');
+            return trim(static::pageLink(DocumentationPage::getOutputDirectory().'/index.html'), '/');
         }
 
         if (file_exists(static::path(DocumentationPage::getSourceDirectory().'/readme.md'))) {
-            return trim(static::pageLink(static::getDocumentationOutputDirectory().'/readme.html'), '/');
+            return trim(static::pageLink(DocumentationPage::getOutputDirectory().'/readme.html'), '/');
         }
 
         return false;
@@ -92,8 +91,8 @@ public static function pageLink(string $destination): string
                 if ($destination === 'index.html') {
                     return '/';
                 }
-                if ($destination === static::getDocumentationOutputDirectory().'/index.html') {
-                    return static::getDocumentationOutputDirectory().'/';
+                if ($destination === DocumentationPage::getOutputDirectory().'/index.html') {
+                    return DocumentationPage::getOutputDirectory().'/';
                 }
 
                 return substr($destination, 0, -5);

diff --git a/src/Models/Pages/DocumentationPage.php b/src/Models/Pages/DocumentationPage.php
@@ -4,7 +4,6 @@
 
 use Hyde\Framework\Concerns\HasTableOfContents;
 use Hyde\Framework\Contracts\AbstractMarkdownPage;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Parsers\DocumentationPageParser;
 
 class DocumentationPage extends AbstractMarkdownPage
@@ -34,8 +33,7 @@ public function getOnlineSourcePath(): string|false
     }
 
     /**
-     * @since 0.39.x (replaces `Hyde::docsDirectory()`)
-     * @deprecated v0.44.x (handled in the page model property `outputDirectory`)
+     * @deprecated v0.44.x Use DocumentationPage::getOutputDirectory() instead
      */
     public static function getDocumentationOutputPath(): string
     {

diff --git a/src/Services/SitemapService.php b/src/Services/SitemapService.php
@@ -52,7 +52,7 @@ public function generate(): self
         if (Features::hasDocumentationPages()) {
             $this->addPageModelUrls(
                 DocumentationPage::class,
-                Hyde::getDocumentationOutputDirectory().'/'
+                DocumentationPage::getOutputDirectory().'/'
             );
         }