Merge branch 'master' into 2.x-dev

hydephp · Jul 28, 2024 · 51aaf2b · 51aaf2b
2 parents 209a3f1 + 590b1bc
commit 51aaf2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 65 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,6 @@
         "laravel-mix": "^6.0.49",
         "postcss": "^8.4.40",
         "prettier": "3.3.3",
-        "tailwindcss": "^3.4.6"
+        "tailwindcss": "^3.4.7"
     }
 }
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
@@ -4,19 +4,8 @@
 
 namespace Hyde;
 
-use Hyde\Enums\Feature;
-use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
-use Illuminate\Support\Collection;
-use Hyde\Foundation\Kernel\FileCollection;
-use Hyde\Foundation\Kernel\Filesystem;
-use Hyde\Foundation\Kernel\PageCollection;
-use Hyde\Foundation\Kernel\RouteCollection;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Pages\Concerns\HydePage;
-use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\Facade;
-use Illuminate\Support\HtmlString;
 use JetBrains\PhpStorm\Pure;
 
 /**
@@ -28,51 +17,7 @@
  * @copyright 2022 Caen De Silva
  * @license MIT License
  *
- * @method static string path(string $path = '')
- * @method static string vendorPath(string $path = '', string $package = 'framework')
- * @method static string pathToAbsolute(string $path)
- * @method static string pathToRelative(string $path)
- * @method static string sitePath(string $path = '')
- * @method static string mediaPath(string $path = '')
- * @method static string siteMediaPath(string $path = '')
- * @method static string formatLink(string $destination)
- * @method static string relativeLink(string $destination)
- * @method static string mediaLink(string $destination, bool $validate = false)
- * @method static string asset(string $name, bool $preferQualifiedUrl = false)
- * @method static string url(string $path = '')
- * @method static Route|null route(string $key)
- * @method static string makeTitle(string $value)
- * @method static string normalizeNewlines(string $string)
- * @method static string stripNewlines(string $string)
- * @method static string trimSlashes(string $string)
- * @method static HtmlString markdown(string $text, bool $stripIndentation = false)
- * @method static string currentPage()
- * @method static string currentRouteKey()
- * @method static string getBasePath()
- * @method static string getSourceRoot()
- * @method static string getOutputDirectory()
- * @method static string getMediaDirectory()
- * @method static string getMediaOutputDirectory()
- * @method static Features features()
- * @method static Collection<string, PostAuthor> authors()
- * @method static FileCollection files()
- * @method static PageCollection pages()
- * @method static RouteCollection routes()
- * @method static Route|null currentRoute()
- * @method static HydeKernel getInstance()
- * @method static Filesystem filesystem()
- * @method static array getRegisteredExtensions()
- * @method static bool hasFeature(Feature $feature)
- * @method static bool hasSiteUrl()
- * @method static void setInstance(HydeKernel $instance)
- * @method static void setBasePath(string $basePath)
- * @method static void setOutputDirectory(string $outputDirectory)
- * @method static void setMediaDirectory(string $mediaDirectory)
- * @method static void setSourceRoot(string $sourceRoot)
- * @method static void shareViewData(HydePage $page)
- * @method static array toArray()
- * @method static bool isBooted()
- * @method static void boot()
+ * @mixin \Hyde\Foundation\HydeKernel
  *
  * @see \Hyde\Foundation\Concerns\ForwardsFilesystem
  * @see \Hyde\Foundation\Concerns\ForwardsHyperlinks

diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
@@ -30,7 +30,7 @@ function asset(string $name, bool $preferQualifiedUrl = false): string
 
         if (! function_exists('route')) {
             /**
-             * Get a page route by its key.
+             * Get a page route instance by its key. Casting it to a string will return a relative link to the page.
              */
             function route(string $key): ?Hyde\Support\Models\Route
             {